tests: remove more topotest backward-compatibility cruft

This isn't necessary anymore since topotest was integrated into
the FRR repo.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.ref b/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.ref
deleted file mode 100644 (file)
index fb19326..0000000
--- a/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.ref
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "neighbors":[
-    {
-      "2.2.2.2":[
-        {
-          "priority":1,
-          "state":"Full/DR",
-          "address":"10.0.1.2",
-          "ifaceName":"r1-eth1:10.0.1.1",
-          "retransmitCounter":0,
-          "requestCounter":0,
-          "dbSummaryCounter":0
-        }
-      ]
-    },
-    {
-      "3.3.3.3":[
-        {
-          "priority":1,
-          "state":"Full/DR",
-          "address":"10.0.2.3",
-          "ifaceName":"r1-eth2:10.0.2.1",
-          "retransmitCounter":0,
-          "requestCounter":0,
-          "dbSummaryCounter":0
-        }
-      ]
-    }
-  ]
-}
-

diff --git a/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.ref-no-neigh b/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.ref-no-neigh
deleted file mode 100644 (file)
index 7c4d0ab..0000000
--- a/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.ref-no-neigh
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "2.2.2.2":[
-    {
-      "priority":1,
-      "state":"Full/DR",
-      "address":"10.0.1.2",
-      "ifaceName":"r1-eth1:10.0.1.1"
-    }
-  ],
-  "3.3.3.3":[
-    {
-      "priority":1,
-      "state":"Full/DR",
-      "address":"10.0.2.3",
-      "ifaceName":"r1-eth2:10.0.2.1"
-    }
-  ]
-}

diff --git a/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.ref-old-nolist b/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.ref-old-nolist
deleted file mode 100644 (file)
index 2270c3f..0000000
--- a/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.ref-old-nolist
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "2.2.2.2":{
-    "priority":1,
-    "state":"Full/DR",
-    "address":"10.0.1.2",
-    "ifaceName":"r1-eth1:10.0.1.1"
-  },
-  "3.3.3.3":{
-    "priority":1,
-    "state":"Full/DR",
-    "address":"10.0.2.3",
-    "ifaceName":"r1-eth2:10.0.2.1"
-  }
-}

diff --git a/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.ref b/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.ref
deleted file mode 100644 (file)
index 1376579..0000000
--- a/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.ref
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "neighbors":[
-    {
-      "1.1.1.1":[
-        {
-          "priority":1,
-          "state":"Full/Backup",
-          "address":"10.0.1.1",
-          "ifaceName":"r2-eth1:10.0.1.2",
-          "retransmitCounter":0,
-          "requestCounter":0,
-          "dbSummaryCounter":0
-        }
-      ]
-    },
-    {
-      "3.3.3.3":[
-        {
-          "priority":1,
-          "state":"Full/DR",
-          "address":"10.0.3.3",
-          "ifaceName":"r2-eth2:10.0.3.2",
-          "retransmitCounter":0,
-          "requestCounter":0,
-          "dbSummaryCounter":0
-        }
-      ]
-    }
-  ]
-}

diff --git a/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.ref-no-neigh b/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.ref-no-neigh
deleted file mode 100644 (file)
index a982c1c..0000000
--- a/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.ref-no-neigh
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "1.1.1.1":[
-    {
-      "priority":1,
-      "state":"Full/Backup",
-      "address":"10.0.1.1",
-      "ifaceName":"r2-eth1:10.0.1.2"
-    }
-  ],
-  "3.3.3.3":[
-    {
-      "priority":1,
-      "state":"Full/DR",
-      "address":"10.0.3.3",
-      "ifaceName":"r2-eth2:10.0.3.2"
-    }
-  ]
-}

diff --git a/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.ref-old-nolist b/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.ref-old-nolist
deleted file mode 100644 (file)
index 18ffbc2..0000000
--- a/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.ref-old-nolist
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "1.1.1.1":{
-    "priority":1,
-    "state":"Full/Backup",
-    "address":"10.0.1.1",
-    "ifaceName":"r2-eth1:10.0.1.2"
-  },
-  "3.3.3.3":{
-    "priority":1,
-    "state":"Full/DR",
-    "address":"10.0.3.3",
-    "ifaceName":"r2-eth2:10.0.3.2"
-  }
-}

diff --git a/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.ref b/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.ref
deleted file mode 100644 (file)
index 41de304..0000000
--- a/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.ref
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "neighbors":[
-    {
-      "1.1.1.1":[
-        {
-          "priority":1,
-          "state":"Full/Backup",
-          "address":"10.0.2.1",
-          "ifaceName":"r3-eth1:10.0.2.3",
-          "retransmitCounter":0,
-          "requestCounter":0,
-          "dbSummaryCounter":0
-        }
-      ]
-    },
-    {
-      "2.2.2.2":[
-        {
-          "priority":1,
-          "state":"Full/Backup",
-          "address":"10.0.3.2",
-          "ifaceName":"r3-eth2:10.0.3.3",
-          "retransmitCounter":0,
-          "requestCounter":0,
-          "dbSummaryCounter":0
-        }
-      ]
-    }
-  ]
-}

diff --git a/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.ref-no-neigh b/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.ref-no-neigh
deleted file mode 100644 (file)
index d7e0e42..0000000
--- a/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.ref-no-neigh
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "1.1.1.1":[
-    {
-      "priority":1,
-      "state":"Full/Backup",
-      "address":"10.0.2.1",
-      "ifaceName":"r3-eth1:10.0.2.3"
-    }
-  ],
-  "2.2.2.2":[
-    {
-      "priority":1,
-      "state":"Full/Backup",
-      "address":"10.0.3.2",
-      "ifaceName":"r3-eth2:10.0.3.3"
-    }
-  ]
-}

diff --git a/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.ref-old-nolist b/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.ref-old-nolist
deleted file mode 100644 (file)
index b066974..0000000
--- a/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.ref-old-nolist
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "1.1.1.1":{
-    "priority":1,
-    "state":"Full/Backup",
-    "address":"10.0.2.1",
-    "ifaceName":"r3-eth1:10.0.2.3"
-  },
-  "2.2.2.2":{
-    "priority":1,
-    "state":"Full/Backup",
-    "address":"10.0.3.2",
-    "ifaceName":"r3-eth2:10.0.3.3"
-  }
-}

diff --git a/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py b/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py
index 0948c2e41b681de016f127d0360938a47ba97023..ce651c50cdd6c6df985ca8189203a496521da59d 100755 (executable)
--- a/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py
+++ b/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py
@@ -144,9 +144,6 @@ def setup_module(mod):
             )
 
     tgen.start_router()
-    for router in router_list.values():
-        if router.has_version('<', '3'):
-            tgen.set_error('unsupported version')
 
 def teardown_module(mod):
     "Teardown the pytest environment"
@@ -180,30 +177,8 @@ def test_ospf_convergence():
     if tgen.routers_have_failure():
         pytest.skip(tgen.errors)
 
-    # Old output (before FRR PR1383) didn't show a list of neighbors.
-    # Check for dict object and compare to old output if this is the case
-    tgen = get_topogen()
-    router = tgen.gears['r1']
-    output = router.vtysh_cmd("show ip ospf neighbor json", isjson=True)
-
-    # We could have either old format (without "neighbors" and direct list
-    # of IP's or new format from PR1659 with "neighbors".
-    # Trying old formats first and fall back to new format
-    #
-    # New format: neighbors have dict instead of list of dicts (PR1723).
-    if output.has_key('neighbors'):
-        if isinstance(output['neighbors'], dict):
-            reffile = "show_ip_ospf_neighbor.json"
-        else:
-            reffile = "show_ip_ospf_neighbor.ref"
-    else:
-        if isinstance(output["2.2.2.2"], dict):
-            reffile = "show_ip_ospf_neighbor.ref-old-nolist"
-        else:
-            reffile = "show_ip_ospf_neighbor.ref-no-neigh"
-
     for rname in ['r1', 'r2', 'r3']:
-        router_compare_json_output(rname, "show ip ospf neighbor json", reffile)
+        router_compare_json_output(rname, "show ip ospf neighbor json", "show_ip_ospf_neighbor.json")
 
 def test_rib():
     logger.info("Test: verify RIB")