From 17128dea275d7300e9d797499a30f221ea9c6fcd Mon Sep 17 00:00:00 2001 From: GalaxyGorilla Date: Wed, 10 Mar 2021 10:00:01 +0000 Subject: [PATCH] tests: Replace ospf-sr-topo1 by ospf-sr-topo2 The new ospf-sr-topo2 tests are much broader and detailed, hence it makes no sense to keep the old ospf-sr-topo1 tests. Signed-off-by: GalaxyGorilla --- tests/topotests/ospf-sr-topo1/__init__.py | 0 .../topotests/ospf-sr-topo1/r1/ospf_srdb.json | 161 ---- tests/topotests/ospf-sr-topo1/r1/ospfd.conf | 27 - tests/topotests/ospf-sr-topo1/r1/zebra.conf | 12 - .../ospf-sr-topo1/r1/zebra_mpls.json | 115 --- .../topotests/ospf-sr-topo1/r2/ospf_srdb.json | 183 ----- tests/topotests/ospf-sr-topo1/r2/ospfd.conf | 36 - tests/topotests/ospf-sr-topo1/r2/zebra.conf | 18 - .../ospf-sr-topo1/r2/zebra_mpls.json | 179 ----- .../topotests/ospf-sr-topo1/r3/ospf_srdb.json | 130 ---- tests/topotests/ospf-sr-topo1/r3/ospfd.conf | 22 - tests/topotests/ospf-sr-topo1/r3/zebra.conf | 9 - .../ospf-sr-topo1/r3/zebra_mpls.json | 82 --- .../topotests/ospf-sr-topo1/r4/ospf_srdb.json | 130 ---- tests/topotests/ospf-sr-topo1/r4/ospfd.conf | 23 - tests/topotests/ospf-sr-topo1/r4/zebra.conf | 9 - .../ospf-sr-topo1/r4/zebra_mpls.json | 97 --- .../rt1/ospfd.conf | 0 .../rt1/step1/show_ip_route.ref | 0 .../rt1/step1/show_mpls_table.ref | 0 .../rt1/step10/show_ip_route.ref | 0 .../rt1/step10/show_mpls_table.ref | 0 .../rt1/step2/show_ip_route.ref | 0 .../rt1/step2/show_mpls_table.ref | 0 .../rt1/step3/show_ip_route.ref | 0 .../rt1/step3/show_mpls_table.ref | 0 .../rt1/step4/show_ip_route.ref | 0 .../rt1/step4/show_mpls_table.ref | 0 .../rt1/step5/show_ip_route.ref | 0 .../rt1/step5/show_mpls_table.ref | 0 .../rt1/step6/show_ip_route.ref | 0 .../rt1/step6/show_mpls_table.ref | 0 .../rt1/step7/show_ip_route.ref | 0 .../rt1/step7/show_mpls_table.ref | 0 .../rt1/step8/show_ip_route.ref | 0 .../rt1/step8/show_mpls_table.ref | 0 .../rt1/step9/show_ip_route.ref | 0 .../rt1/step9/show_mpls_table.ref | 0 .../rt1/zebra.conf | 0 .../rt2/ospfd.conf | 0 .../rt2/step1/show_ip_route.ref | 0 .../rt2/step1/show_mpls_table.ref | 0 .../rt2/step10/show_ip_route.ref | 0 .../rt2/step10/show_mpls_table.ref | 0 .../rt2/step2/show_ip_route.ref | 0 .../rt2/step2/show_mpls_table.ref | 0 .../rt2/step3/show_ip_route.ref | 0 .../rt2/step3/show_mpls_table.ref | 0 .../rt2/step4/show_ip_route.ref | 0 .../rt2/step4/show_mpls_table.ref | 0 .../rt2/step5/show_ip_route.ref | 0 .../rt2/step5/show_mpls_table.ref | 0 .../rt2/step6/show_ip_route.ref | 0 .../rt2/step6/show_mpls_table.ref | 0 .../rt2/step7/show_ip_route.ref | 0 .../rt2/step7/show_mpls_table.ref | 0 .../rt2/step8/show_ip_route.ref | 0 .../rt2/step8/show_mpls_table.ref | 0 .../rt2/step9/show_ip_route.ref | 0 .../rt2/step9/show_mpls_table.ref | 0 .../rt2/zebra.conf | 0 .../rt3/ospfd.conf | 0 .../rt3/step1/show_ip_route.ref | 0 .../rt3/step1/show_mpls_table.ref | 0 .../rt3/step10/show_ip_route.ref | 0 .../rt3/step10/show_mpls_table.ref | 0 .../rt3/step2/show_ip_route.ref | 0 .../rt3/step2/show_mpls_table.ref | 0 .../rt3/step3/show_ip_route.ref | 0 .../rt3/step3/show_mpls_table.ref | 0 .../rt3/step4/show_ip_route.ref | 0 .../rt3/step4/show_mpls_table.ref | 0 .../rt3/step5/show_ip_route.ref | 0 .../rt3/step5/show_mpls_table.ref | 0 .../rt3/step6/show_ip_route.ref | 0 .../rt3/step6/show_mpls_table.ref | 0 .../rt3/step7/show_ip_route.ref | 0 .../rt3/step7/show_mpls_table.ref | 0 .../rt3/step8/show_ip_route.ref | 0 .../rt3/step8/show_mpls_table.ref | 0 .../rt3/step9/show_ip_route.ref | 0 .../rt3/step9/show_mpls_table.ref | 0 .../rt3/zebra.conf | 0 .../rt4/ospfd.conf | 0 .../rt4/step1/show_ip_route.ref | 0 .../rt4/step1/show_mpls_table.ref | 0 .../rt4/step10/show_ip_route.ref | 0 .../rt4/step10/show_mpls_table.ref | 0 .../rt4/step2/show_ip_route.ref | 0 .../rt4/step2/show_mpls_table.ref | 0 .../rt4/step3/show_ip_route.ref | 0 .../rt4/step3/show_mpls_table.ref | 0 .../rt4/step4/show_ip_route.ref | 0 .../rt4/step4/show_mpls_table.ref | 0 .../rt4/step5/show_ip_route.ref | 0 .../rt4/step5/show_mpls_table.ref | 0 .../rt4/step6/show_ip_route.ref | 0 .../rt4/step6/show_mpls_table.ref | 0 .../rt4/step7/show_ip_route.ref | 0 .../rt4/step7/show_mpls_table.ref | 0 .../rt4/step8/show_ip_route.ref | 0 .../rt4/step8/show_mpls_table.ref | 0 .../rt4/step9/show_ip_route.ref | 0 .../rt4/step9/show_mpls_table.ref | 0 .../rt4/zebra.conf | 0 .../rt5/ospfd.conf | 0 .../rt5/step1/show_ip_route.ref | 0 .../rt5/step1/show_mpls_table.ref | 0 .../rt5/step10/show_ip_route.ref | 0 .../rt5/step10/show_mpls_table.ref | 0 .../rt5/step2/show_ip_route.ref | 0 .../rt5/step2/show_mpls_table.ref | 0 .../rt5/step3/show_ip_route.ref | 0 .../rt5/step3/show_mpls_table.ref | 0 .../rt5/step4/show_ip_route.ref | 0 .../rt5/step4/show_mpls_table.ref | 0 .../rt5/step5/show_ip_route.ref | 0 .../rt5/step5/show_mpls_table.ref | 0 .../rt5/step6/show_ip_route.ref | 0 .../rt5/step6/show_mpls_table.ref | 0 .../rt5/step7/show_ip_route.ref | 0 .../rt5/step7/show_mpls_table.ref | 0 .../rt5/step8/show_ip_route.ref | 0 .../rt5/step8/show_mpls_table.ref | 0 .../rt5/step9/show_ip_route.ref | 0 .../rt5/step9/show_mpls_table.ref | 0 .../rt5/zebra.conf | 0 .../rt6/ospfd.conf | 0 .../rt6/step1/show_ip_route.ref | 0 .../rt6/step1/show_mpls_table.ref | 0 .../rt6/step10/show_ip_route.ref | 0 .../rt6/step10/show_mpls_table.ref | 0 .../rt6/step2/show_ip_route.ref | 0 .../rt6/step2/show_mpls_table.ref | 0 .../rt6/step3/show_ip_route.ref | 0 .../rt6/step3/show_mpls_table.ref | 0 .../rt6/step4/show_ip_route.ref | 0 .../rt6/step4/show_mpls_table.ref | 0 .../rt6/step5/show_ip_route.ref | 0 .../rt6/step5/show_mpls_table.ref | 0 .../rt6/step6/show_ip_route.ref | 0 .../rt6/step6/show_mpls_table.ref | 0 .../rt6/step7/show_ip_route.ref | 0 .../rt6/step7/show_mpls_table.ref | 0 .../rt6/step8/show_ip_route.ref | 0 .../rt6/step8/show_mpls_table.ref | 0 .../rt6/step9/show_ip_route.ref | 0 .../rt6/step9/show_mpls_table.ref | 0 .../rt6/zebra.conf | 0 .../ospf-sr-topo1/test_ospf_sr_topo1.dot | 78 -- .../ospf-sr-topo1/test_ospf_sr_topo1.jpg | Bin 48784 -> 0 bytes .../ospf-sr-topo1/test_ospf_sr_topo1.py | 666 ++++++++++++++--- tests/topotests/ospf-sr-topo2/__init__.py | 0 .../ospf-sr-topo2/test_ospf_sr_topo2.py | 695 ------------------ 154 files changed, 575 insertions(+), 2097 deletions(-) mode change 100755 => 100644 tests/topotests/ospf-sr-topo1/__init__.py delete mode 100644 tests/topotests/ospf-sr-topo1/r1/ospf_srdb.json delete mode 100644 tests/topotests/ospf-sr-topo1/r1/ospfd.conf delete mode 100644 tests/topotests/ospf-sr-topo1/r1/zebra.conf delete mode 100644 tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json delete mode 100644 tests/topotests/ospf-sr-topo1/r2/ospf_srdb.json delete mode 100644 tests/topotests/ospf-sr-topo1/r2/ospfd.conf delete mode 100644 tests/topotests/ospf-sr-topo1/r2/zebra.conf delete mode 100644 tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json delete mode 100644 tests/topotests/ospf-sr-topo1/r3/ospf_srdb.json delete mode 100644 tests/topotests/ospf-sr-topo1/r3/ospfd.conf delete mode 100644 tests/topotests/ospf-sr-topo1/r3/zebra.conf delete mode 100644 tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json delete mode 100644 tests/topotests/ospf-sr-topo1/r4/ospf_srdb.json delete mode 100644 tests/topotests/ospf-sr-topo1/r4/ospfd.conf delete mode 100644 tests/topotests/ospf-sr-topo1/r4/zebra.conf delete mode 100644 tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/ospfd.conf (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step1/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step1/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step10/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step10/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step2/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step2/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step3/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step3/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step4/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step4/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step5/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step5/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step6/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step6/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step7/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step7/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step8/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step8/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step9/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/step9/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt1/zebra.conf (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/ospfd.conf (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step1/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step1/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step10/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step10/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step2/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step2/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step3/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step3/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step4/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step4/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step5/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step5/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step6/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step6/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step7/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step7/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step8/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step8/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step9/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/step9/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt2/zebra.conf (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/ospfd.conf (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step1/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step1/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step10/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step10/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step2/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step2/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step3/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step3/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step4/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step4/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step5/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step5/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step6/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step6/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step7/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step7/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step8/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step8/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step9/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/step9/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt3/zebra.conf (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/ospfd.conf (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step1/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step1/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step10/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step10/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step2/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step2/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step3/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step3/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step4/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step4/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step5/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step5/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step6/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step6/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step7/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step7/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step8/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step8/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step9/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/step9/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt4/zebra.conf (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/ospfd.conf (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step1/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step1/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step10/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step10/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step2/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step2/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step3/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step3/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step4/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step4/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step5/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step5/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step6/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step6/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step7/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step7/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step8/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step8/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step9/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/step9/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt5/zebra.conf (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/ospfd.conf (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step1/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step1/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step10/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step10/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step2/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step2/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step3/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step3/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step4/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step4/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step5/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step5/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step6/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step6/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step7/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step7/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step8/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step8/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step9/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/step9/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo2 => ospf-sr-topo1}/rt6/zebra.conf (100%) delete mode 100644 tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.dot delete mode 100644 tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.jpg delete mode 100644 tests/topotests/ospf-sr-topo2/__init__.py delete mode 100644 tests/topotests/ospf-sr-topo2/test_ospf_sr_topo2.py diff --git a/tests/topotests/ospf-sr-topo1/__init__.py b/tests/topotests/ospf-sr-topo1/__init__.py old mode 100755 new mode 100644 diff --git a/tests/topotests/ospf-sr-topo1/r1/ospf_srdb.json b/tests/topotests/ospf-sr-topo1/r1/ospf_srdb.json deleted file mode 100644 index 952a26ed10..0000000000 --- a/tests/topotests/ospf-sr-topo1/r1/ospf_srdb.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "srdbID":"10.0.255.1", - "srNodes":[ - { - "routerID":"10.0.255.2", - "srgbSize":8000, - "srgbLabel":16000, - "srlbSize":1000, - "srlbLabel":15000, - "algorithms":[ - { - "0":"SPF" - } - ], - "extendedPrefix":[ - { - "prefix":"10.0.255.2\/32", - "sid":200, - "inputLabel":20200, - "prefixRoute":[ - { - "outputLabel":3, - "interface":"r1-eth0", - "nexthop":"10.0.0.2" - }, - { - "outputLabel":3, - "interface":"r1-eth1", - "nexthop":"10.0.1.2" - } - ] - } - ] - }, - { - "routerID":"10.0.255.4", - "srgbSize":10000, - "srgbLabel":10000, - "srlbSize":1000, - "srlbLabel":5000, - "algorithms":[ - { - "0":"SPF" - } - ], - "nodeMsd":12, - "extendedPrefix":[ - { - "prefix":"10.0.255.4\/32", - "sid":400, - "inputLabel":20400, - "prefixRoute":[ - { - "outputLabel":16400, - "interface":"r1-eth0", - "nexthop":"10.0.0.2" - }, - { - "outputLabel":16400, - "interface":"r1-eth1", - "nexthop":"10.0.1.2" - } - ] - } - ] - }, - { - "routerID":"10.0.255.3", - "srgbSize":10000, - "srgbLabel":10000, - "srlbSize":1000, - "srlbLabel":5000, - "algorithms":[ - { - "0":"SPF" - } - ], - "nodeMsd":8, - "extendedPrefix":[ - { - "prefix":"10.0.255.3\/32", - "sid":300, - "inputLabel":20300, - "prefixRoute":[ - { - "outputLabel":16300, - "interface":"r1-eth0", - "nexthop":"10.0.0.2" - }, - { - "outputLabel":16300, - "interface":"r1-eth1", - "nexthop":"10.0.1.2" - } - ] - } - ] - }, - { - "routerID":"10.0.255.1", - "srgbSize":10000, - "srgbLabel":20000, - "srlbSize":1000, - "srlbLabel":15000, - "algorithms":[ - { - "0":"SPF" - } - ], - "nodeMsd":16, - "extendedPrefix":[ - { - "prefix":"10.0.255.1\/32", - "sid":100, - "inputLabel":0, - "prefixRoute":[ - { - "outputLabel":0, - "interface":"lo", - "nexthop":"10.0.255.1" - } - ] - } - ], - "extendedLink":[ - { - "prefix":"10.0.0.1\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r1-eth0", - "nexthop":"10.0.0.2" - }, - { - "prefix":"10.0.0.1\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r1-eth0", - "nexthop":"10.0.0.2" - }, - { - "prefix":"10.0.1.1\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r1-eth1", - "nexthop":"10.0.1.2" - }, - { - "prefix":"10.0.1.1\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r1-eth1", - "nexthop":"10.0.1.2" - } - ] - } - ] -} diff --git a/tests/topotests/ospf-sr-topo1/r1/ospfd.conf b/tests/topotests/ospf-sr-topo1/r1/ospfd.conf deleted file mode 100644 index 0773153a76..0000000000 --- a/tests/topotests/ospf-sr-topo1/r1/ospfd.conf +++ /dev/null @@ -1,27 +0,0 @@ -debug ospf sr -! -interface lo - ip ospf area 0.0.0.0 -! -interface r1-eth0 - ip ospf network point-to-point - ip ospf hello-interval 2 - ip ospf dead-interval 10 - ip ospf area 0.0.0.0 -! -interface r1-eth1 - ip ospf network point-to-point - ip ospf hello-interval 2 - ip ospf dead-interval 10 - ip ospf area 0.0.0.0 -! -router ospf - ospf router-id 10.0.255.1 - capability opaque - router-info area 0.0.0.0 - segment-routing on - segment-routing node-msd 16 - segment-routing global-block 20000 29999 - segment-routing prefix 10.0.255.1/32 index 100 explicit-null -! - diff --git a/tests/topotests/ospf-sr-topo1/r1/zebra.conf b/tests/topotests/ospf-sr-topo1/r1/zebra.conf deleted file mode 100644 index faf71db25c..0000000000 --- a/tests/topotests/ospf-sr-topo1/r1/zebra.conf +++ /dev/null @@ -1,12 +0,0 @@ -! -interface lo - ip address 10.0.255.1/32 -! -interface r1-eth0 - ip address 10.0.0.1/24 -! -interface r1-eth1 - ip address 10.0.1.1/24 -! -ip forwarding -! diff --git a/tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json b/tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json deleted file mode 100644 index 6c87596acb..0000000000 --- a/tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json +++ /dev/null @@ -1,115 +0,0 @@ -[ - { - "inLabel":20200, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.1.2" - }, - { - "type":"SR (OSPF)", - "outLabel":3, - "distance":150, - "installed":true, - "nexthop":"10.0.0.2" - } - ] - }, - { - "inLabel":20300, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":16300, - "outLabelStack":[ - 16300 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.1.2" - } - ] - }, - { - "inLabel":20400, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":16400, - "outLabelStack":[ - 16400 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.1.2" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "distance":150, - "installed":true, - "nexthop":"10.0.0.2" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "distance":150, - "installed":true, - "nexthop":"10.0.0.2" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.1.2" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.1.2" - } - ] - } -] diff --git a/tests/topotests/ospf-sr-topo1/r2/ospf_srdb.json b/tests/topotests/ospf-sr-topo1/r2/ospf_srdb.json deleted file mode 100644 index 1de780d84e..0000000000 --- a/tests/topotests/ospf-sr-topo1/r2/ospf_srdb.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "srdbID":"10.0.255.2", - "srNodes":[ - { - "routerID":"10.0.255.2", - "srgbSize":8000, - "srgbLabel":16000, - "srlbSize":1000, - "srlbLabel":15000, - "algorithms":[ - { - "0":"SPF" - } - ], - "extendedPrefix":[ - { - "prefix":"10.0.255.2\/32", - "sid":200, - "inputLabel":0, - "prefixRoute":[ - { - "outputLabel":0, - "interface":"lo", - "nexthop":"10.0.255.2" - } - ] - } - ], - "extendedLink":[ - { - "prefix":"10.0.4.2\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r2-eth3", - "nexthop":"10.0.4.1" - }, - { - "prefix":"10.0.4.2\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r2-eth3", - "nexthop":"10.0.4.1" - }, - { - "prefix":"10.0.0.2\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r2-eth0", - "nexthop":"10.0.0.1" - }, - { - "prefix":"10.0.0.2\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r2-eth0", - "nexthop":"10.0.0.1" - }, - { - "prefix":"10.0.1.2\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r2-eth1", - "nexthop":"10.0.1.1" - }, - { - "prefix":"10.0.1.2\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r2-eth1", - "nexthop":"10.0.1.1" - }, - { - "prefix":"10.0.3.2\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r2-eth2", - "nexthop":"10.0.3.1" - }, - { - "prefix":"10.0.3.2\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r2-eth2", - "nexthop":"10.0.3.1" - } - ] - }, - { - "routerID":"10.0.255.4", - "srgbSize":10000, - "srgbLabel":10000, - "srlbSize":1000, - "srlbLabel":5000, - "algorithms":[ - { - "0":"SPF" - } - ], - "nodeMsd":12, - "extendedPrefix":[ - { - "prefix":"10.0.255.4\/32", - "sid":400, - "inputLabel":16400, - "prefixRoute":[ - { - "outputLabel":10400, - "interface":"r2-eth3", - "nexthop":"10.0.4.1" - } - ] - } - ] - }, - { - "routerID":"10.0.255.3", - "srgbSize":10000, - "srgbLabel":10000, - "srlbSize":1000, - "srlbLabel":5000, - "algorithms":[ - { - "0":"SPF" - } - ], - "nodeMsd":8, - "extendedPrefix":[ - { - "prefix":"10.0.255.3\/32", - "sid":300, - "inputLabel":16300, - "prefixRoute":[ - { - "outputLabel":3, - "interface":"r2-eth2", - "nexthop":"10.0.3.1" - } - ] - } - ] - }, - { - "routerID":"10.0.255.1", - "srgbSize":10000, - "srgbLabel":20000, - "srlbSize":1000, - "srlbLabel":15000, - "algorithms":[ - { - "0":"SPF" - } - ], - "nodeMsd":16, - "extendedPrefix":[ - { - "prefix":"10.0.255.1\/32", - "sid":100, - "inputLabel":16100, - "prefixRoute":[ - { - "outputLabel":0, - "interface":"r2-eth0", - "nexthop":"10.0.0.1" - }, - { - "outputLabel":0, - "interface":"r2-eth1", - "nexthop":"10.0.1.1" - } - ] - } - ] - } - ] -} diff --git a/tests/topotests/ospf-sr-topo1/r2/ospfd.conf b/tests/topotests/ospf-sr-topo1/r2/ospfd.conf deleted file mode 100644 index 92dc2f7cd1..0000000000 --- a/tests/topotests/ospf-sr-topo1/r2/ospfd.conf +++ /dev/null @@ -1,36 +0,0 @@ -! -debug ospf sr -! -interface lo - ip ospf area 0.0.0.0 -! -interface r2-eth0 - ip ospf network point-to-point - ip ospf hello-interval 2 - ip ospf dead-interval 10 - ip ospf area 0.0.0.0 -! -interface r2-eth1 - ip ospf network point-to-point - ip ospf hello-interval 2 - ip ospf dead-interval 10 - ip ospf area 0.0.0.0 -! -interface r2-eth2 - ip ospf area 0.0.0.0 - ip ospf hello-interval 2 - ip ospf dead-interval 10 -! -interface r2-eth3 - ip ospf network point-to-point - ip ospf hello-interval 2 - ip ospf dead-interval 10 - ip ospf area 0.0.0.0 -! -router ospf - ospf router-id 10.0.255.2 - capability opaque - router-info area 0.0.0.0 - segment-routing on - segment-routing prefix 10.0.255.2/32 index 200 -! diff --git a/tests/topotests/ospf-sr-topo1/r2/zebra.conf b/tests/topotests/ospf-sr-topo1/r2/zebra.conf deleted file mode 100644 index ba1d833f50..0000000000 --- a/tests/topotests/ospf-sr-topo1/r2/zebra.conf +++ /dev/null @@ -1,18 +0,0 @@ -! -interface lo - ip address 10.0.255.2/32 -! -interface r2-eth0 - ip address 10.0.0.2/24 -! -interface r2-eth1 - ip address 10.0.1.2/24 -! -interface r2-eth2 - ip address 10.0.3.2/24 -! -interface r2-eth3 - ip address 10.0.4.2/24 -! -ip forwarding -! diff --git a/tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json b/tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json deleted file mode 100644 index a885e88fc5..0000000000 --- a/tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json +++ /dev/null @@ -1,179 +0,0 @@ -[ - { - "inLabel":16100, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":0, - "outLabelStack":[ - 0 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.1.1" - }, - { - "type":"SR (OSPF)", - "outLabel":0, - "distance":150, - "installed":true, - "nexthop":"10.0.0.1" - } - ] - }, - { - "inLabel":16300, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.3.1" - } - ] - }, - { - "inLabel":16400, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":10400, - "outLabelStack":[ - 10400 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.4.1" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.4.1" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.4.1" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.0.1" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.0.1" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.1.1" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.1.1" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "distance":150, - "installed":true, - "nexthop":"10.0.3.1" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "distance":150, - "installed":true, - "nexthop":"10.0.3.1" - } - ] - } -] diff --git a/tests/topotests/ospf-sr-topo1/r3/ospf_srdb.json b/tests/topotests/ospf-sr-topo1/r3/ospf_srdb.json deleted file mode 100644 index e7371ff593..0000000000 --- a/tests/topotests/ospf-sr-topo1/r3/ospf_srdb.json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "srdbID":"10.0.255.3", - "srNodes":[ - { - "routerID":"10.0.255.2", - "srgbSize":8000, - "srgbLabel":16000, - "srlbSize":1000, - "srlbLabel":15000, - "algorithms":[ - { - "0":"SPF" - } - ], - "extendedPrefix":[ - { - "prefix":"10.0.255.2\/32", - "sid":200, - "inputLabel":10200, - "prefixRoute":[ - { - "outputLabel":3, - "interface":"r3-eth0", - "nexthop":"10.0.3.2" - } - ] - } - ] - }, - { - "routerID":"10.0.255.4", - "srgbSize":10000, - "srgbLabel":10000, - "srlbSize":1000, - "srlbLabel":5000, - "algorithms":[ - { - "0":"SPF" - } - ], - "nodeMsd":12, - "extendedPrefix":[ - { - "prefix":"10.0.255.4\/32", - "sid":400, - "inputLabel":10400, - "prefixRoute":[ - { - "outputLabel":16400, - "interface":"r3-eth0", - "nexthop":"10.0.3.2" - } - ] - } - ] - }, - { - "routerID":"10.0.255.3", - "srgbSize":10000, - "srgbLabel":10000, - "srlbSize":1000, - "srlbLabel":5000, - "algorithms":[ - { - "0":"SPF" - } - ], - "nodeMsd":8, - "extendedPrefix":[ - { - "prefix":"10.0.255.3\/32", - "sid":300, - "inputLabel":0, - "prefixRoute":[ - { - "outputLabel":0, - "interface":"lo", - "nexthop":"10.0.255.3" - } - ] - } - ], - "extendedLink":[ - { - "prefix":"10.0.3.1\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r3-eth0", - "nexthop":"10.0.3.2" - }, - { - "prefix":"10.0.3.1\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r3-eth0", - "nexthop":"10.0.3.2" - } - ] - }, - { - "routerID":"10.0.255.1", - "srgbSize":10000, - "srgbLabel":20000, - "srlbSize":1000, - "srlbLabel":15000, - "algorithms":[ - { - "0":"SPF" - } - ], - "nodeMsd":16, - "extendedPrefix":[ - { - "prefix":"10.0.255.1\/32", - "sid":100, - "inputLabel":10100, - "prefixRoute":[ - { - "outputLabel":16100, - "interface":"r3-eth0", - "nexthop":"10.0.3.2" - } - ] - } - ] - } - ] -} diff --git a/tests/topotests/ospf-sr-topo1/r3/ospfd.conf b/tests/topotests/ospf-sr-topo1/r3/ospfd.conf deleted file mode 100644 index e2766f202d..0000000000 --- a/tests/topotests/ospf-sr-topo1/r3/ospfd.conf +++ /dev/null @@ -1,22 +0,0 @@ -! -interface lo - ip ospf area 0.0.0.0 - ip ospf hello-interval 2 - ip ospf dead-interval 10 -! -interface r3-eth0 - ip ospf area 0.0.0.0 - ip ospf hello-interval 2 - ip ospf dead-interval 10 -! -! -router ospf - ospf router-id 10.0.255.3 - capability opaque - router-info area 0.0.0.0 - segment-routing on - segment-routing local-block 5000 5999 - segment-routing global-block 10000 19999 - segment-routing node-msd 8 - segment-routing prefix 10.0.255.3/32 index 300 -! diff --git a/tests/topotests/ospf-sr-topo1/r3/zebra.conf b/tests/topotests/ospf-sr-topo1/r3/zebra.conf deleted file mode 100644 index ef16a8ca13..0000000000 --- a/tests/topotests/ospf-sr-topo1/r3/zebra.conf +++ /dev/null @@ -1,9 +0,0 @@ -! -interface lo - ip address 10.0.255.3/32 -! -interface r3-eth0 - ip address 10.0.3.1/24 -! -ip forwarding -! diff --git a/tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json b/tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json deleted file mode 100644 index 1b98ff4756..0000000000 --- a/tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json +++ /dev/null @@ -1,82 +0,0 @@ -[ - { - "inLabel":10100, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":16100, - "outLabelStack":[ - 16100 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.3.2" - } - ] - }, - { - "inLabel":10200, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.3.2" - } - ] - }, - { - "inLabel":10400, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":16400, - "outLabelStack":[ - 16400 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.3.2" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.3.2" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.3.2" - } - ] - } -] diff --git a/tests/topotests/ospf-sr-topo1/r4/ospf_srdb.json b/tests/topotests/ospf-sr-topo1/r4/ospf_srdb.json deleted file mode 100644 index a241b32607..0000000000 --- a/tests/topotests/ospf-sr-topo1/r4/ospf_srdb.json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "srdbID":"10.0.255.4", - "srNodes":[ - { - "routerID":"10.0.255.2", - "srgbSize":8000, - "srgbLabel":16000, - "srlbSize":1000, - "srlbLabel":15000, - "algorithms":[ - { - "0":"SPF" - } - ], - "extendedPrefix":[ - { - "prefix":"10.0.255.2\/32", - "sid":200, - "inputLabel":10200, - "prefixRoute":[ - { - "outputLabel":3, - "interface":"r4-eth0", - "nexthop":"10.0.4.2" - } - ] - } - ] - }, - { - "routerID":"10.0.255.4", - "srgbSize":10000, - "srgbLabel":10000, - "srlbSize":1000, - "srlbLabel":5000, - "algorithms":[ - { - "0":"SPF" - } - ], - "nodeMsd":12, - "extendedPrefix":[ - { - "prefix":"10.0.255.4\/32", - "sid":400, - "inputLabel":10400, - "prefixRoute":[ - { - "outputLabel":3, - "interface":"lo", - "nexthop":"10.0.255.4" - } - ] - } - ], - "extendedLink":[ - { - "prefix":"10.0.4.1\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r4-eth0", - "nexthop":"10.0.4.2" - }, - { - "prefix":"10.0.4.1\/32", - "sid":"*", - "inputLabel":"*", - "outputLabel":3, - "interface":"r4-eth0", - "nexthop":"10.0.4.2" - } - ] - }, - { - "routerID":"10.0.255.3", - "srgbSize":10000, - "srgbLabel":10000, - "srlbSize":1000, - "srlbLabel":5000, - "algorithms":[ - { - "0":"SPF" - } - ], - "nodeMsd":8, - "extendedPrefix":[ - { - "prefix":"10.0.255.3\/32", - "sid":300, - "inputLabel":10300, - "prefixRoute":[ - { - "outputLabel":16300, - "interface":"r4-eth0", - "nexthop":"10.0.4.2" - } - ] - } - ] - }, - { - "routerID":"10.0.255.1", - "srgbSize":10000, - "srgbLabel":20000, - "srlbSize":1000, - "srlbLabel":15000, - "algorithms":[ - { - "0":"SPF" - } - ], - "nodeMsd":16, - "extendedPrefix":[ - { - "prefix":"10.0.255.1\/32", - "sid":100, - "inputLabel":10100, - "prefixRoute":[ - { - "outputLabel":16100, - "interface":"r4-eth0", - "nexthop":"10.0.4.2" - } - ] - } - ] - } - ] -} diff --git a/tests/topotests/ospf-sr-topo1/r4/ospfd.conf b/tests/topotests/ospf-sr-topo1/r4/ospfd.conf deleted file mode 100644 index e80880af88..0000000000 --- a/tests/topotests/ospf-sr-topo1/r4/ospfd.conf +++ /dev/null @@ -1,23 +0,0 @@ -! -interface lo - ip ospf area 0.0.0.0 - ip ospf hello-interval 2 - ip ospf dead-interval 10 -! -interface r4-eth0 - ip ospf network point-to-point - ip ospf hello-interval 2 - ip ospf dead-interval 10 - ip ospf area 0.0.0.0 -! -! -router ospf - ospf router-id 10.0.255.4 - capability opaque - router-info area 0.0.0.0 - segment-routing on - segment-routing local-block 5000 5999 - segment-routing global-block 10000 19999 - segment-routing node-msd 12 - segment-routing prefix 10.0.255.4/32 index 400 no-php-flag -! diff --git a/tests/topotests/ospf-sr-topo1/r4/zebra.conf b/tests/topotests/ospf-sr-topo1/r4/zebra.conf deleted file mode 100644 index 428f6f4156..0000000000 --- a/tests/topotests/ospf-sr-topo1/r4/zebra.conf +++ /dev/null @@ -1,9 +0,0 @@ -! -interface lo - ip address 10.0.255.4/32 -! -interface r4-eth0 - ip address 10.0.4.1/24 -! -ip forwarding -! diff --git a/tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json b/tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json deleted file mode 100644 index b5758f29a0..0000000000 --- a/tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json +++ /dev/null @@ -1,97 +0,0 @@ -[ - { - "inLabel":10100, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":16100, - "outLabelStack":[ - 16100 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.4.2" - } - ] - }, - { - "inLabel":10200, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.4.2" - } - ] - }, - { - "inLabel":10300, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":16300, - "outLabelStack":[ - 16300 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.4.2" - } - ] - }, - { - "inLabel":10400, - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.4.2" - } - ] - }, - { - "inLabel":"*", - "installed":true, - "nexthops":[ - { - "type":"SR (OSPF)", - "outLabel":3, - "outLabelStack":[ - 3 - ], - "distance":150, - "installed":true, - "nexthop":"10.0.4.2" - } - ] - } -] diff --git a/tests/topotests/ospf-sr-topo2/rt1/ospfd.conf b/tests/topotests/ospf-sr-topo1/rt1/ospfd.conf similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/ospfd.conf rename to tests/topotests/ospf-sr-topo1/rt1/ospfd.conf diff --git a/tests/topotests/ospf-sr-topo2/rt1/step1/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt1/step1/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step1/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt1/step1/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step1/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt1/step1/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step1/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt1/step1/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step10/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt1/step10/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step10/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt1/step10/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step10/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt1/step10/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step10/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt1/step10/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step2/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt1/step2/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step2/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt1/step2/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step2/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt1/step2/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step2/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt1/step2/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step3/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt1/step3/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step3/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt1/step3/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step3/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt1/step3/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step3/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt1/step3/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step4/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt1/step4/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step4/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt1/step4/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step4/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt1/step4/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step4/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt1/step4/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step5/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt1/step5/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step5/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt1/step5/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step5/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt1/step5/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step5/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt1/step5/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step6/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt1/step6/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step6/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt1/step6/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step6/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt1/step6/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step6/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt1/step6/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step7/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt1/step7/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step7/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt1/step7/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step7/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt1/step7/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step7/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt1/step7/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step8/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt1/step8/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step8/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt1/step8/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step8/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt1/step8/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step8/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt1/step8/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step9/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt1/step9/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step9/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt1/step9/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/step9/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt1/step9/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/step9/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt1/step9/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt1/zebra.conf b/tests/topotests/ospf-sr-topo1/rt1/zebra.conf similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt1/zebra.conf rename to tests/topotests/ospf-sr-topo1/rt1/zebra.conf diff --git a/tests/topotests/ospf-sr-topo2/rt2/ospfd.conf b/tests/topotests/ospf-sr-topo1/rt2/ospfd.conf similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/ospfd.conf rename to tests/topotests/ospf-sr-topo1/rt2/ospfd.conf diff --git a/tests/topotests/ospf-sr-topo2/rt2/step1/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt2/step1/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step1/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt2/step1/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step1/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt2/step1/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step1/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt2/step1/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step10/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt2/step10/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step10/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt2/step10/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step10/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt2/step10/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step10/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt2/step10/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step2/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt2/step2/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step2/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt2/step2/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step2/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt2/step2/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step2/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt2/step2/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step3/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt2/step3/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step3/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt2/step3/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step3/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt2/step3/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step3/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt2/step3/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step4/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt2/step4/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step4/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt2/step4/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step4/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt2/step4/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step4/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt2/step4/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step5/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt2/step5/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step5/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt2/step5/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step5/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt2/step5/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step5/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt2/step5/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step6/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt2/step6/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step6/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt2/step6/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step6/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt2/step6/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step6/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt2/step6/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step7/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt2/step7/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step7/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt2/step7/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step7/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt2/step7/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step7/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt2/step7/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step8/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt2/step8/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step8/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt2/step8/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step8/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt2/step8/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step8/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt2/step8/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step9/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt2/step9/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step9/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt2/step9/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/step9/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt2/step9/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/step9/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt2/step9/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt2/zebra.conf b/tests/topotests/ospf-sr-topo1/rt2/zebra.conf similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt2/zebra.conf rename to tests/topotests/ospf-sr-topo1/rt2/zebra.conf diff --git a/tests/topotests/ospf-sr-topo2/rt3/ospfd.conf b/tests/topotests/ospf-sr-topo1/rt3/ospfd.conf similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/ospfd.conf rename to tests/topotests/ospf-sr-topo1/rt3/ospfd.conf diff --git a/tests/topotests/ospf-sr-topo2/rt3/step1/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt3/step1/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step1/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt3/step1/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step1/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt3/step1/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step1/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt3/step1/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step10/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt3/step10/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step10/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt3/step10/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step10/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt3/step10/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step10/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt3/step10/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step2/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt3/step2/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step2/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt3/step2/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step2/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt3/step2/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step2/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt3/step2/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step3/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt3/step3/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step3/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt3/step3/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step3/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt3/step3/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step3/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt3/step3/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step4/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt3/step4/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step4/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt3/step4/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step4/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt3/step4/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step4/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt3/step4/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step5/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt3/step5/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step5/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt3/step5/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step5/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt3/step5/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step5/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt3/step5/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step6/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt3/step6/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step6/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt3/step6/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step6/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt3/step6/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step6/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt3/step6/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step7/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt3/step7/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step7/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt3/step7/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step7/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt3/step7/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step7/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt3/step7/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step8/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt3/step8/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step8/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt3/step8/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step8/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt3/step8/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step8/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt3/step8/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step9/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt3/step9/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step9/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt3/step9/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/step9/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt3/step9/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/step9/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt3/step9/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt3/zebra.conf b/tests/topotests/ospf-sr-topo1/rt3/zebra.conf similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt3/zebra.conf rename to tests/topotests/ospf-sr-topo1/rt3/zebra.conf diff --git a/tests/topotests/ospf-sr-topo2/rt4/ospfd.conf b/tests/topotests/ospf-sr-topo1/rt4/ospfd.conf similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/ospfd.conf rename to tests/topotests/ospf-sr-topo1/rt4/ospfd.conf diff --git a/tests/topotests/ospf-sr-topo2/rt4/step1/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt4/step1/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step1/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt4/step1/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step1/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt4/step1/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step1/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt4/step1/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step10/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt4/step10/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step10/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt4/step10/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step10/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt4/step10/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step10/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt4/step10/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step2/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt4/step2/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step2/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt4/step2/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step2/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt4/step2/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step2/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt4/step2/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step3/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt4/step3/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step3/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt4/step3/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step3/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt4/step3/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step3/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt4/step3/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step4/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt4/step4/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step4/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt4/step4/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step4/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt4/step4/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step4/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt4/step4/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step5/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt4/step5/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step5/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt4/step5/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step5/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt4/step5/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step5/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt4/step5/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step6/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt4/step6/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step6/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt4/step6/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step6/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt4/step6/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step6/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt4/step6/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step7/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt4/step7/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step7/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt4/step7/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step7/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt4/step7/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step7/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt4/step7/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step8/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt4/step8/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step8/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt4/step8/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step8/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt4/step8/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step8/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt4/step8/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step9/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt4/step9/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step9/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt4/step9/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/step9/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt4/step9/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/step9/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt4/step9/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt4/zebra.conf b/tests/topotests/ospf-sr-topo1/rt4/zebra.conf similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt4/zebra.conf rename to tests/topotests/ospf-sr-topo1/rt4/zebra.conf diff --git a/tests/topotests/ospf-sr-topo2/rt5/ospfd.conf b/tests/topotests/ospf-sr-topo1/rt5/ospfd.conf similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/ospfd.conf rename to tests/topotests/ospf-sr-topo1/rt5/ospfd.conf diff --git a/tests/topotests/ospf-sr-topo2/rt5/step1/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt5/step1/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step1/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt5/step1/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step1/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt5/step1/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step1/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt5/step1/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step10/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt5/step10/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step10/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt5/step10/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step10/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt5/step10/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step10/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt5/step10/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step2/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt5/step2/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step2/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt5/step2/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step2/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt5/step2/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step2/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt5/step2/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step3/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt5/step3/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step3/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt5/step3/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step3/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt5/step3/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step3/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt5/step3/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step4/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt5/step4/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step4/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt5/step4/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step4/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt5/step4/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step4/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt5/step4/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step5/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt5/step5/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step5/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt5/step5/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step5/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt5/step5/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step5/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt5/step5/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step6/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt5/step6/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step6/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt5/step6/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step6/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt5/step6/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step6/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt5/step6/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step7/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt5/step7/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step7/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt5/step7/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step7/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt5/step7/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step7/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt5/step7/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step8/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt5/step8/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step8/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt5/step8/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step8/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt5/step8/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step8/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt5/step8/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step9/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt5/step9/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step9/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt5/step9/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/step9/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt5/step9/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/step9/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt5/step9/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt5/zebra.conf b/tests/topotests/ospf-sr-topo1/rt5/zebra.conf similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt5/zebra.conf rename to tests/topotests/ospf-sr-topo1/rt5/zebra.conf diff --git a/tests/topotests/ospf-sr-topo2/rt6/ospfd.conf b/tests/topotests/ospf-sr-topo1/rt6/ospfd.conf similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/ospfd.conf rename to tests/topotests/ospf-sr-topo1/rt6/ospfd.conf diff --git a/tests/topotests/ospf-sr-topo2/rt6/step1/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt6/step1/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step1/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt6/step1/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step1/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt6/step1/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step1/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt6/step1/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step10/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt6/step10/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step10/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt6/step10/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step10/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt6/step10/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step10/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt6/step10/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step2/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt6/step2/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step2/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt6/step2/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step2/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt6/step2/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step2/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt6/step2/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step3/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt6/step3/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step3/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt6/step3/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step3/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt6/step3/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step3/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt6/step3/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step4/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt6/step4/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step4/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt6/step4/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step4/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt6/step4/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step4/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt6/step4/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step5/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt6/step5/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step5/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt6/step5/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step5/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt6/step5/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step5/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt6/step5/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step6/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt6/step6/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step6/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt6/step6/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step6/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt6/step6/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step6/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt6/step6/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step7/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt6/step7/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step7/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt6/step7/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step7/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt6/step7/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step7/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt6/step7/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step8/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt6/step8/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step8/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt6/step8/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step8/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt6/step8/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step8/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt6/step8/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step9/show_ip_route.ref b/tests/topotests/ospf-sr-topo1/rt6/step9/show_ip_route.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step9/show_ip_route.ref rename to tests/topotests/ospf-sr-topo1/rt6/step9/show_ip_route.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/step9/show_mpls_table.ref b/tests/topotests/ospf-sr-topo1/rt6/step9/show_mpls_table.ref similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/step9/show_mpls_table.ref rename to tests/topotests/ospf-sr-topo1/rt6/step9/show_mpls_table.ref diff --git a/tests/topotests/ospf-sr-topo2/rt6/zebra.conf b/tests/topotests/ospf-sr-topo1/rt6/zebra.conf similarity index 100% rename from tests/topotests/ospf-sr-topo2/rt6/zebra.conf rename to tests/topotests/ospf-sr-topo1/rt6/zebra.conf diff --git a/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.dot b/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.dot deleted file mode 100644 index d293669209..0000000000 --- a/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.dot +++ /dev/null @@ -1,78 +0,0 @@ -## Color coding: -######################### -## Main FRR: #f08080 red -## Switches: #d0e0d0 gray -## RIP: #19e3d9 Cyan -## RIPng: #fcb314 dark yellow -## OSPFv2: #32b835 Green -## OSPFv3: #19e3d9 Cyan -## ISIS IPv4 #fcb314 dark yellow -## ISIS IPv6 #9a81ec purple -## BGP IPv4 #eee3d3 beige -## BGP IPv6 #fdff00 yellow -##### Colors (see http://www.color-hex.com/) - -graph ospf_topo1 { - label="ospf SR topo1"; - - # Routers - r1 [ - label="r1\nrtr-id 10.0.255.1/32", - shape=doubleoctagon, - fillcolor="#f08080", - style=filled, - ]; - r2 [ - label="r2\nrtr-id 10.0.255.2/32", - shape=doubleoctagon, - fillcolor="#f08080", - style=filled, - ]; - r3 [ - label="r3\nrtr-id 10.0.255.3/32", - shape=doubleoctagon, - fillcolor="#f08080", - style=filled, - ]; - r4 [ - label="r4\nrtr-id 10.0.255.4/32", - shape=doubleoctagon, - fillcolor="#f08080", - style=filled, - ]; - - # Switches - s1 [ - label="s2\n10.0.1.0/24", - shape=oval, - fillcolor="#d0e0d0", - style=filled, - ]; - s2 [ - label="s1\n10.0.3.0/24", - shape=oval, - fillcolor="#d0e0d0", - style=filled, - ]; - s3 [ - label="s2\n10.0.4.0/24", - shape=oval, - fillcolor="#d0e0d0", - style=filled, - ]; - - # Connections - subgraph cluster0 { - label="area 0" - - r1 -- s1 [label="eth0\n.1"]; - - r2 -- s1 [label="eth0\n.2"]; - r2 -- s2 [label="eth1\n.2"]; - r2 -- s3 [label="eth2\n.2"]; - - r3 -- s2 [label="eth0\n.1"]; - - r4 -- s3 [label="eth0\n.1"]; - } -} diff --git a/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.jpg b/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.jpg deleted file mode 100644 index 636f9b320c219ad90298e9e5a5f4c8e940416fc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48784 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