From: Rafael Zalamena <rzalamena@opensourcerouting.org>
Date: Tue, 23 Mar 2021 13:12:40 +0000 (-0300)
Subject: topotests: remove old configuration files
X-Git-Tag: base_8.0~178^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=639b03ca2445bf226b5abf4b985264ca5521ab0b;p=mirror%2Ffrr.git

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 <rzalamena@opensourcerouting.org>
---

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():