From 2eddcd9ff3259fc30b6b83a6510b4c31f39d8358 Mon Sep 17 00:00:00 2001 From: Lou Berger Date: Sun, 21 Jan 2018 08:01:32 -0500 Subject: [PATCH] bgp_l3vpn_to_bgp_direct: rename bgp_direct_to_bgp_vpn Rename BGP L3VPN test to have L3VPN at start of test name Also remove unused/pre-ltemplate files Signed-off-by: Lou Berger --- tests/topotests/bgp_direct_to_bgp_vpn/testfinish.py | 2 -- tests/topotests/bgp_direct_to_bgp_vpn/teststart.py | 4 ---- .../__init__.py | 0 .../ce1/bgpd.conf | 0 .../ce1/zebra.conf | 0 .../ce2/bgpd.conf | 0 .../ce2/zebra.conf | 0 .../ce3/bgpd.conf | 0 .../ce3/zebra.conf | 0 .../customize.py | 2 +- .../r1/bgpd.conf | 0 .../r1/ldpd.conf | 0 .../r1/ospfd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/ldpd.conf | 0 .../r2/ospfd.conf | 0 .../r2/zebra.conf | 0 .../r3/bgpd.conf | 0 .../r3/ldpd.conf | 0 .../r3/ospfd.conf | 0 .../r3/zebra.conf | 0 .../r4/bgpd.conf | 0 .../r4/ldpd.conf | 0 .../r4/ospfd.conf | 0 .../r4/zebra.conf | 0 .../scripts/add_routes.py | 0 .../scripts/adjacencies.py | 0 .../scripts/check_routes.py | 0 .../scripts/cleanup_all.py | 0 .../test_bgp_l3vpn_to_bgp_direct.py} | 0 31 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 tests/topotests/bgp_direct_to_bgp_vpn/testfinish.py delete mode 100644 tests/topotests/bgp_direct_to_bgp_vpn/teststart.py rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/__init__.py (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/ce1/bgpd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/ce1/zebra.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/ce2/bgpd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/ce2/zebra.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/ce3/bgpd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/ce3/zebra.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/customize.py (99%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r1/bgpd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r1/ldpd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r1/ospfd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r1/zebra.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r2/bgpd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r2/ldpd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r2/ospfd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r2/zebra.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r3/bgpd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r3/ldpd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r3/ospfd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r3/zebra.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r4/bgpd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r4/ldpd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r4/ospfd.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/r4/zebra.conf (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/scripts/add_routes.py (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/scripts/adjacencies.py (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/scripts/check_routes.py (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn => bgp_l3vpn_to_bgp_direct}/scripts/cleanup_all.py (100%) rename tests/topotests/{bgp_direct_to_bgp_vpn/test_bgp_direct_to_bgp_vpn.py => bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py} (100%) diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/testfinish.py b/tests/topotests/bgp_direct_to_bgp_vpn/testfinish.py deleted file mode 100644 index fe83773462..0000000000 --- a/tests/topotests/bgp_direct_to_bgp_vpn/testfinish.py +++ /dev/null @@ -1,2 +0,0 @@ -from lutil import luInclude -luInclude('scripts/cleanup_all.py') diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/teststart.py b/tests/topotests/bgp_direct_to_bgp_vpn/teststart.py deleted file mode 100644 index 4fd90af901..0000000000 --- a/tests/topotests/bgp_direct_to_bgp_vpn/teststart.py +++ /dev/null @@ -1,4 +0,0 @@ -from lutil import luInclude -luInclude('scripts/adjacencies.py') -luInclude('scripts/add_routes.py') -luInclude('scripts/check_routes.py') diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/__init__.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/__init__.py similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/__init__.py rename to tests/topotests/bgp_l3vpn_to_bgp_direct/__init__.py diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/ce1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/ce1/bgpd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/ce1/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/zebra.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/ce1/zebra.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/zebra.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/ce2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/ce2/bgpd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/ce2/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/zebra.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/ce2/zebra.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/zebra.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/ce3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/ce3/bgpd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/ce3/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/zebra.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/ce3/zebra.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/zebra.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/customize.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/customize.py similarity index 99% rename from tests/topotests/bgp_direct_to_bgp_vpn/customize.py rename to tests/topotests/bgp_l3vpn_to_bgp_direct/customize.py index 8d613b2921..0d5bc0c24f 100644 --- a/tests/topotests/bgp_direct_to_bgp_vpn/customize.py +++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/customize.py @@ -22,7 +22,7 @@ # """ -test_mpls_vpn_topo1.py: Simple FRR/Quagga MPLS VPN Test +customize.py: Simple FRR/Quagga MPLS L3VPN test topology | +----+----+ diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r1/bgpd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r1/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ldpd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r1/ldpd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ldpd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r1/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ospfd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r1/ospfd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ospfd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r1/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/zebra.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r1/zebra.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r1/zebra.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r2/bgpd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r2/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ldpd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r2/ldpd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ldpd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r2/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ospfd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r2/ospfd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ospfd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r2/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/zebra.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r2/zebra.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r2/zebra.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r3/bgpd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r3/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ldpd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r3/ldpd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ldpd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r3/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ospfd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r3/ospfd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ospfd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r3/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/zebra.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r3/zebra.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r3/zebra.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r4/bgpd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r4/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ldpd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r4/ldpd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ldpd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r4/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ospfd.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r4/ospfd.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ospfd.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/r4/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/zebra.conf similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/r4/zebra.conf rename to tests/topotests/bgp_l3vpn_to_bgp_direct/r4/zebra.conf diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/scripts/add_routes.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/scripts/add_routes.py rename to tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/scripts/adjacencies.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/adjacencies.py similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/scripts/adjacencies.py rename to tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/adjacencies.py diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/scripts/check_routes.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/check_routes.py similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/scripts/check_routes.py rename to tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/check_routes.py diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/scripts/cleanup_all.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/cleanup_all.py similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/scripts/cleanup_all.py rename to tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/cleanup_all.py diff --git a/tests/topotests/bgp_direct_to_bgp_vpn/test_bgp_direct_to_bgp_vpn.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py similarity index 100% rename from tests/topotests/bgp_direct_to_bgp_vpn/test_bgp_direct_to_bgp_vpn.py rename to tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py -- 2.39.5