From 639b03ca2445bf226b5abf4b985264ca5521ab0b Mon Sep 17 00:00:00 2001 From: Rafael Zalamena Date: Tue, 23 Mar 2021 10:12:40 -0300 Subject: [PATCH] topotests: remove old configuration files We version the tests with FRR so it is no longer necessary to support old versions. Signed-off-by: Rafael Zalamena --- tests/topotests/ospf-topo1/r1/ospf6d.conf-pre-v4 | 9 --------- tests/topotests/ospf-topo1/r2/ospf6d.conf-pre-v4 | 9 --------- tests/topotests/ospf-topo1/r3/ospf6d.conf-pre-v4 | 10 ---------- tests/topotests/ospf-topo1/r4/ospf6d.conf-pre-v4 | 9 --------- tests/topotests/ospf-topo1/test_ospf_topo1.py | 2 -- 5 files changed, 39 deletions(-) delete mode 100644 tests/topotests/ospf-topo1/r1/ospf6d.conf-pre-v4 delete mode 100644 tests/topotests/ospf-topo1/r2/ospf6d.conf-pre-v4 delete mode 100644 tests/topotests/ospf-topo1/r3/ospf6d.conf-pre-v4 delete mode 100644 tests/topotests/ospf-topo1/r4/ospf6d.conf-pre-v4 diff --git a/tests/topotests/ospf-topo1/r1/ospf6d.conf-pre-v4 b/tests/topotests/ospf-topo1/r1/ospf6d.conf-pre-v4 deleted file mode 100644 index 6a40f859db..0000000000 --- a/tests/topotests/ospf-topo1/r1/ospf6d.conf-pre-v4 +++ /dev/null @@ -1,9 +0,0 @@ -! -router ospf6 - router-id 10.0.255.1 - redistribute kernel - redistribute connected - redistribute static - interface r1-eth0 area 0.0.0.0 - interface r1-eth1 area 0.0.0.0 -! diff --git a/tests/topotests/ospf-topo1/r2/ospf6d.conf-pre-v4 b/tests/topotests/ospf-topo1/r2/ospf6d.conf-pre-v4 deleted file mode 100644 index 7448b25327..0000000000 --- a/tests/topotests/ospf-topo1/r2/ospf6d.conf-pre-v4 +++ /dev/null @@ -1,9 +0,0 @@ -! -router ospf6 - router-id 10.0.255.2 - redistribute kernel - redistribute connected - redistribute static - interface r2-eth0 area 0.0.0.0 - interface r2-eth1 area 0.0.0.0 -! diff --git a/tests/topotests/ospf-topo1/r3/ospf6d.conf-pre-v4 b/tests/topotests/ospf-topo1/r3/ospf6d.conf-pre-v4 deleted file mode 100644 index e853e0e2b2..0000000000 --- a/tests/topotests/ospf-topo1/r3/ospf6d.conf-pre-v4 +++ /dev/null @@ -1,10 +0,0 @@ -! -router ospf6 - router-id 10.0.255.3 - redistribute kernel - redistribute connected - redistribute static - interface r3-eth0 area 0.0.0.0 - interface r3-eth1 area 0.0.0.0 - interface r3-eth2 area 0.0.0.1 -! diff --git a/tests/topotests/ospf-topo1/r4/ospf6d.conf-pre-v4 b/tests/topotests/ospf-topo1/r4/ospf6d.conf-pre-v4 deleted file mode 100644 index dcc07a4fdc..0000000000 --- a/tests/topotests/ospf-topo1/r4/ospf6d.conf-pre-v4 +++ /dev/null @@ -1,9 +0,0 @@ -! -router ospf6 - router-id 10.0.255.4 - redistribute kernel - redistribute connected - redistribute static - interface r4-eth0 area 0.0.0.1 - interface r4-eth1 area 0.0.0.1 -! diff --git a/tests/topotests/ospf-topo1/test_ospf_topo1.py b/tests/topotests/ospf-topo1/test_ospf_topo1.py index 5bb6c2c818..4bb0abfb94 100644 --- a/tests/topotests/ospf-topo1/test_ospf_topo1.py +++ b/tests/topotests/ospf-topo1/test_ospf_topo1.py @@ -93,8 +93,6 @@ def setup_module(mod): tgen.start_topology() ospf6_config = "ospf6d.conf" - if tgen.gears["r1"].has_version("<", "4.0"): - ospf6_config = "ospf6d.conf-pre-v4" router_list = tgen.routers() for rname, router in router_list.items(): -- 2.39.5