From d600a9760896407bdb7c7332710db77265a0fc06 Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Fri, 30 Aug 2024 11:16:44 +0200 Subject: [PATCH] tests: rename routers in nhrp_redundancy Rename routers in nhrp_redundancy to match the diagram. Cosmetic change. > cd tests/topotests/nhrp_redundancy > git grep r1 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|r1|nhs1|g' -i > git grep r2 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|r2|nhs2|g' -i > git grep r3 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|r3|nhs3|g' -i > git grep r4 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|r4|nhc1|g' -i > git grep r5 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|r5|nhc2|g' -i > git grep r6 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|r6|router|g' -i > git grep r7 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|r7|host|g' -i > > git grep R1 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|R1|nhs1|g' -i > git grep R2 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|R2|nhs2|g' -i > git grep R3 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|R3|nhs3|g' -i > git grep R4 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|R4|nhc1|g' -i > git grep R5 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|R5|nhc2|g' -i > git grep R6 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|R6|router|g' -i > git grep R7 | cut -f1 -d: | uniq | xargs -L1 sed -e 's|R7|host|g' -i > > mv r1 nhs1 > mv r2 nhs2 > mv r3 nhs3 > mv r4 nhc1 > mv r5 nhc2 > mv r6 router > mv r7 host Signed-off-by: Louis Scalbert (cherry picked from commit 3f49c5026c3f6ebc1583951f145b77d479abb834) --- .../nhrp_redundancy/{r7 => host}/zebra.conf | 2 +- .../{r4 => nhc1}/nhrp_cache.json | 8 +- .../{r5 => nhc1}/nhrp_route.json | 6 +- .../{r4 => nhc1}/nhrp_route_shortcut.json | 10 +- .../nhrp_redundancy/{r4 => nhc1}/nhrpd.conf | 4 +- .../nhrp_redundancy/{r4 => nhc1}/zebra.conf | 6 +- .../{r5 => nhc2}/nhrp_cache.json | 8 +- .../{r4 => nhc2}/nhrp_route.json | 6 +- .../nhrp_redundancy/{r5 => nhc2}/nhrpd.conf | 4 +- .../nhrp_redundancy/{r5 => nhc2}/zebra.conf | 6 +- .../{r1 => nhs1}/nhrp_cache.json | 6 +- .../{r3 => nhs1}/nhrp_route.json | 4 +- .../nhrp_redundancy/{r2 => nhs1}/nhrpd.conf | 4 +- .../nhrp_redundancy/{r1 => nhs1}/zebra.conf | 4 +- .../{r2 => nhs2}/nhrp_cache.json | 6 +- .../{r1 => nhs2}/nhrp_route.json | 4 +- .../nhrp_redundancy/{r3 => nhs2}/nhrpd.conf | 4 +- .../nhrp_redundancy/{r2 => nhs2}/zebra.conf | 4 +- .../{r3 => nhs3}/nhrp_cache.json | 6 +- .../{r2 => nhs3}/nhrp_route.json | 4 +- .../nhrp_redundancy/{r1 => nhs3}/nhrpd.conf | 4 +- .../nhrp_redundancy/{r3 => nhs3}/zebra.conf | 4 +- .../nhrp_redundancy/{r6 => router}/zebra.conf | 4 +- .../nhrp_redundancy/test_nhrp_redundancy.dot | 34 ++--- .../nhrp_redundancy/test_nhrp_redundancy.py | 121 +++++++++--------- 25 files changed, 133 insertions(+), 140 deletions(-) rename tests/topotests/nhrp_redundancy/{r7 => host}/zebra.conf (72%) rename tests/topotests/nhrp_redundancy/{r4 => nhc1}/nhrp_cache.json (88%) rename tests/topotests/nhrp_redundancy/{r5 => nhc1}/nhrp_route.json (92%) rename tests/topotests/nhrp_redundancy/{r4 => nhc1}/nhrp_route_shortcut.json (92%) rename tests/topotests/nhrp_redundancy/{r4 => nhc1}/nhrpd.conf (83%) rename tests/topotests/nhrp_redundancy/{r4 => nhc1}/zebra.conf (71%) rename tests/topotests/nhrp_redundancy/{r5 => nhc2}/nhrp_cache.json (88%) rename tests/topotests/nhrp_redundancy/{r4 => nhc2}/nhrp_route.json (92%) rename tests/topotests/nhrp_redundancy/{r5 => nhc2}/nhrpd.conf (83%) rename tests/topotests/nhrp_redundancy/{r5 => nhc2}/zebra.conf (81%) rename tests/topotests/nhrp_redundancy/{r1 => nhs1}/nhrp_cache.json (88%) rename tests/topotests/nhrp_redundancy/{r3 => nhs1}/nhrp_route.json (92%) rename tests/topotests/nhrp_redundancy/{r2 => nhs1}/nhrpd.conf (74%) rename tests/topotests/nhrp_redundancy/{r1 => nhs1}/zebra.conf (83%) rename tests/topotests/nhrp_redundancy/{r2 => nhs2}/nhrp_cache.json (88%) rename tests/topotests/nhrp_redundancy/{r1 => nhs2}/nhrp_route.json (92%) rename tests/topotests/nhrp_redundancy/{r3 => nhs2}/nhrpd.conf (74%) rename tests/topotests/nhrp_redundancy/{r2 => nhs2}/zebra.conf (83%) rename tests/topotests/nhrp_redundancy/{r3 => nhs3}/nhrp_cache.json (88%) rename tests/topotests/nhrp_redundancy/{r2 => nhs3}/nhrp_route.json (92%) rename tests/topotests/nhrp_redundancy/{r1 => nhs3}/nhrpd.conf (74%) rename tests/topotests/nhrp_redundancy/{r3 => nhs3}/zebra.conf (71%) rename tests/topotests/nhrp_redundancy/{r6 => router}/zebra.conf (63%) diff --git a/tests/topotests/nhrp_redundancy/r7/zebra.conf b/tests/topotests/nhrp_redundancy/host/zebra.conf similarity index 72% rename from tests/topotests/nhrp_redundancy/r7/zebra.conf rename to tests/topotests/nhrp_redundancy/host/zebra.conf index 5747b40956..58c8cb2c4b 100644 --- a/tests/topotests/nhrp_redundancy/r7/zebra.conf +++ b/tests/topotests/nhrp_redundancy/host/zebra.conf @@ -1,4 +1,4 @@ -interface r7-eth0 +interface host-eth0 ip address 4.4.4.7/24 ! ip route 0.0.0.0/0 4.4.4.4 diff --git a/tests/topotests/nhrp_redundancy/r4/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_cache.json similarity index 88% rename from tests/topotests/nhrp_redundancy/r4/nhrp_cache.json rename to tests/topotests/nhrp_redundancy/nhc1/nhrp_cache.json index f87ebcf5fc..5d2cf6fb5e 100644 --- a/tests/topotests/nhrp_redundancy/r4/nhrp_cache.json +++ b/tests/topotests/nhrp_redundancy/nhc1/nhrp_cache.json @@ -4,7 +4,7 @@ }, "table": [ { - "interface": "r4-gre0", + "interface": "nhc1-gre0", "type": "nhs", "protocol": "176.16.1.2", "nbma": "192.168.1.2", @@ -15,7 +15,7 @@ "identity": "" }, { - "interface": "r4-gre0", + "interface": "nhc1-gre0", "type": "local", "protocol": "176.16.1.4", "nbma": "192.168.2.4", @@ -26,7 +26,7 @@ "identity": "-" }, { - "interface": "r4-gre0", + "interface": "nhc1-gre0", "type": "nhs", "protocol": "176.16.1.3", "nbma": "192.168.1.3", @@ -37,7 +37,7 @@ "identity": "" }, { - "interface": "r4-gre0", + "interface": "nhc1-gre0", "type": "nhs", "protocol": "176.16.1.1", "nbma": "192.168.1.1", diff --git a/tests/topotests/nhrp_redundancy/r5/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_route.json similarity index 92% rename from tests/topotests/nhrp_redundancy/r5/nhrp_route.json rename to tests/topotests/nhrp_redundancy/nhc1/nhrp_route.json index 1d1c16ffb8..2af62dd4d6 100644 --- a/tests/topotests/nhrp_redundancy/r5/nhrp_route.json +++ b/tests/topotests/nhrp_redundancy/nhc1/nhrp_route.json @@ -16,7 +16,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r5-gre0", + "interfaceName": "nhc1-gre0", "active": true } ] @@ -39,7 +39,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r5-gre0", + "interfaceName": "nhc1-gre0", "active": true } ] @@ -62,7 +62,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r5-gre0", + "interfaceName": "nhc1-gre0", "active": true } ] diff --git a/tests/topotests/nhrp_redundancy/r4/nhrp_route_shortcut.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_shortcut.json similarity index 92% rename from tests/topotests/nhrp_redundancy/r4/nhrp_route_shortcut.json rename to tests/topotests/nhrp_redundancy/nhc1/nhrp_route_shortcut.json index 835dfd6b0f..2111e27583 100644 --- a/tests/topotests/nhrp_redundancy/r4/nhrp_route_shortcut.json +++ b/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_shortcut.json @@ -17,7 +17,7 @@ "fib": true, "ip": "176.16.1.5", "afi": "ipv4", - "interfaceName": "r4-gre0", + "interfaceName": "nhc1-gre0", "active": true } ] @@ -40,7 +40,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r4-gre0", + "interfaceName": "nhc1-gre0", "active": true } ] @@ -63,7 +63,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r4-gre0", + "interfaceName": "nhc1-gre0", "active": true } ] @@ -86,7 +86,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r4-gre0", + "interfaceName": "nhc1-gre0", "active": true } ] @@ -109,7 +109,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r4-gre0", + "interfaceName": "nhc1-gre0", "active": true } ] diff --git a/tests/topotests/nhrp_redundancy/r4/nhrpd.conf b/tests/topotests/nhrp_redundancy/nhc1/nhrpd.conf similarity index 83% rename from tests/topotests/nhrp_redundancy/r4/nhrpd.conf rename to tests/topotests/nhrp_redundancy/nhc1/nhrpd.conf index 8a52f3386e..a0862f77ef 100644 --- a/tests/topotests/nhrp_redundancy/r4/nhrpd.conf +++ b/tests/topotests/nhrp_redundancy/nhc1/nhrpd.conf @@ -1,5 +1,5 @@ !debug nhrp all -interface r4-gre0 +interface nhc1-gre0 ip nhrp holdtime 10 ip nhrp network-id 42 ip nhrp registration no-unique @@ -7,5 +7,5 @@ interface r4-gre0 ip nhrp nhs dynamic nbma 192.168.1.2 ip nhrp nhs dynamic nbma 192.168.1.3 ip nhrp shortcut - tunnel source r4-eth0 + tunnel source nhc1-eth0 exit diff --git a/tests/topotests/nhrp_redundancy/r4/zebra.conf b/tests/topotests/nhrp_redundancy/nhc1/zebra.conf similarity index 71% rename from tests/topotests/nhrp_redundancy/r4/zebra.conf rename to tests/topotests/nhrp_redundancy/nhc1/zebra.conf index e4a9a6f80f..db25964ee4 100644 --- a/tests/topotests/nhrp_redundancy/r4/zebra.conf +++ b/tests/topotests/nhrp_redundancy/nhc1/zebra.conf @@ -1,14 +1,14 @@ ip forwarding -interface r4-eth0 +interface nhc1-eth0 ip address 192.168.2.4/24 ! ip route 192.168.1.0/24 192.168.2.6 -interface r4-gre0 +interface nhc1-gre0 ip address 176.16.1.4/32 no link-detect ipv6 nd suppress-ra ! -interface r4-eth1 +interface nhc1-eth1 ip address 4.4.4.4/24 ! ip route 0.0.0.0/0 176.16.1.1 50 diff --git a/tests/topotests/nhrp_redundancy/r5/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhc2/nhrp_cache.json similarity index 88% rename from tests/topotests/nhrp_redundancy/r5/nhrp_cache.json rename to tests/topotests/nhrp_redundancy/nhc2/nhrp_cache.json index bc041c6014..fa0f07aacf 100644 --- a/tests/topotests/nhrp_redundancy/r5/nhrp_cache.json +++ b/tests/topotests/nhrp_redundancy/nhc2/nhrp_cache.json @@ -4,7 +4,7 @@ }, "table": [ { - "interface": "r5-gre0", + "interface": "nhc2-gre0", "type": "nhs", "protocol": "176.16.1.2", "nbma": "192.168.1.2", @@ -15,7 +15,7 @@ "identity": "" }, { - "interface": "r5-gre0", + "interface": "nhc2-gre0", "type": "nhs", "protocol": "176.16.1.3", "nbma": "192.168.1.3", @@ -26,7 +26,7 @@ "identity": "" }, { - "interface": "r5-gre0", + "interface": "nhc2-gre0", "type": "nhs", "protocol": "176.16.1.1", "nbma": "192.168.1.1", @@ -37,7 +37,7 @@ "identity": "" }, { - "interface": "r5-gre0", + "interface": "nhc2-gre0", "type": "local", "protocol": "176.16.1.5", "nbma": "192.168.2.5", diff --git a/tests/topotests/nhrp_redundancy/r4/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhc2/nhrp_route.json similarity index 92% rename from tests/topotests/nhrp_redundancy/r4/nhrp_route.json rename to tests/topotests/nhrp_redundancy/nhc2/nhrp_route.json index 4f1faee7a7..a8f61861bc 100644 --- a/tests/topotests/nhrp_redundancy/r4/nhrp_route.json +++ b/tests/topotests/nhrp_redundancy/nhc2/nhrp_route.json @@ -16,7 +16,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r4-gre0", + "interfaceName": "nhc2-gre0", "active": true } ] @@ -39,7 +39,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r4-gre0", + "interfaceName": "nhc2-gre0", "active": true } ] @@ -62,7 +62,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r4-gre0", + "interfaceName": "nhc2-gre0", "active": true } ] diff --git a/tests/topotests/nhrp_redundancy/r5/nhrpd.conf b/tests/topotests/nhrp_redundancy/nhc2/nhrpd.conf similarity index 83% rename from tests/topotests/nhrp_redundancy/r5/nhrpd.conf rename to tests/topotests/nhrp_redundancy/nhc2/nhrpd.conf index 7241ed592d..16a6d87c27 100644 --- a/tests/topotests/nhrp_redundancy/r5/nhrpd.conf +++ b/tests/topotests/nhrp_redundancy/nhc2/nhrpd.conf @@ -1,5 +1,5 @@ !debug nhrp all -interface r5-gre0 +interface nhc2-gre0 ip nhrp holdtime 10 ip nhrp network-id 42 ip nhrp nhs dynamic nbma 192.168.1.1 @@ -7,5 +7,5 @@ interface r5-gre0 ip nhrp nhs dynamic nbma 192.168.1.3 ip nhrp registration no-unique ip nhrp shortcut - tunnel source r5-eth0 + tunnel source nhc2-eth0 exit diff --git a/tests/topotests/nhrp_redundancy/r5/zebra.conf b/tests/topotests/nhrp_redundancy/nhc2/zebra.conf similarity index 81% rename from tests/topotests/nhrp_redundancy/r5/zebra.conf rename to tests/topotests/nhrp_redundancy/nhc2/zebra.conf index 9b1e1c0646..be22fc0ae5 100644 --- a/tests/topotests/nhrp_redundancy/r5/zebra.conf +++ b/tests/topotests/nhrp_redundancy/nhc2/zebra.conf @@ -1,14 +1,14 @@ ip forwarding -interface r5-eth0 +interface nhc2-eth0 ip address 192.168.2.5/24 ! ip route 192.168.1.0/24 192.168.2.6 -interface r5-gre0 +interface nhc2-gre0 ip address 176.16.1.5/32 no link-detect ipv6 nd suppress-ra ! -interface r5-eth1 +interface nhc2-eth1 ip address 5.5.5.5/24 ! ip route 0.0.0.0/0 176.16.1.1 50 diff --git a/tests/topotests/nhrp_redundancy/r1/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhs1/nhrp_cache.json similarity index 88% rename from tests/topotests/nhrp_redundancy/r1/nhrp_cache.json rename to tests/topotests/nhrp_redundancy/nhs1/nhrp_cache.json index a94dd9fecf..920644e67d 100644 --- a/tests/topotests/nhrp_redundancy/r1/nhrp_cache.json +++ b/tests/topotests/nhrp_redundancy/nhs1/nhrp_cache.json @@ -4,7 +4,7 @@ }, "table": [ { - "interface": "r1-gre0", + "interface": "nhs1-gre0", "type": "dynamic", "protocol": "176.16.1.4", "nbma": "192.168.2.4", @@ -15,7 +15,7 @@ "identity": "" }, { - "interface": "r1-gre0", + "interface": "nhs1-gre0", "type": "local", "protocol": "176.16.1.1", "nbma": "192.168.1.1", @@ -26,7 +26,7 @@ "identity": "-" }, { - "interface": "r1-gre0", + "interface": "nhs1-gre0", "type": "dynamic", "protocol": "176.16.1.5", "nbma": "192.168.2.5", diff --git a/tests/topotests/nhrp_redundancy/r3/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhs1/nhrp_route.json similarity index 92% rename from tests/topotests/nhrp_redundancy/r3/nhrp_route.json rename to tests/topotests/nhrp_redundancy/nhs1/nhrp_route.json index 3d548c08fd..d89719c802 100644 --- a/tests/topotests/nhrp_redundancy/r3/nhrp_route.json +++ b/tests/topotests/nhrp_redundancy/nhs1/nhrp_route.json @@ -16,7 +16,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r3-gre0", + "interfaceName": "nhs1-gre0", "active": true } ] @@ -39,7 +39,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r3-gre0", + "interfaceName": "nhs1-gre0", "active": true } ] diff --git a/tests/topotests/nhrp_redundancy/r2/nhrpd.conf b/tests/topotests/nhrp_redundancy/nhs1/nhrpd.conf similarity index 74% rename from tests/topotests/nhrp_redundancy/r2/nhrpd.conf rename to tests/topotests/nhrp_redundancy/nhs1/nhrpd.conf index 4d63f07d1f..c0c8c28f94 100644 --- a/tests/topotests/nhrp_redundancy/r2/nhrpd.conf +++ b/tests/topotests/nhrp_redundancy/nhs1/nhrpd.conf @@ -1,9 +1,9 @@ !debug nhrp all nhrp nflog-group 1 -interface r2-gre0 +interface nhs1-gre0 ip nhrp holdtime 10 ip nhrp network-id 42 ip nhrp registration no-unique ip nhrp redirect - tunnel source r2-eth0 + tunnel source nhs1-eth0 exit diff --git a/tests/topotests/nhrp_redundancy/r1/zebra.conf b/tests/topotests/nhrp_redundancy/nhs1/zebra.conf similarity index 83% rename from tests/topotests/nhrp_redundancy/r1/zebra.conf rename to tests/topotests/nhrp_redundancy/nhs1/zebra.conf index 0f11563f57..d116612c4f 100644 --- a/tests/topotests/nhrp_redundancy/r1/zebra.conf +++ b/tests/topotests/nhrp_redundancy/nhs1/zebra.conf @@ -1,9 +1,9 @@ ip forwarding -interface r1-eth0 +interface nhs1-eth0 ip address 192.168.1.1/24 ! ip route 192.168.2.0/24 192.168.1.6 -interface r1-gre0 +interface nhs1-gre0 ip address 176.16.1.1/32 no link-detect ipv6 nd suppress-ra diff --git a/tests/topotests/nhrp_redundancy/r2/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhs2/nhrp_cache.json similarity index 88% rename from tests/topotests/nhrp_redundancy/r2/nhrp_cache.json rename to tests/topotests/nhrp_redundancy/nhs2/nhrp_cache.json index 91557a1918..c0538203c7 100644 --- a/tests/topotests/nhrp_redundancy/r2/nhrp_cache.json +++ b/tests/topotests/nhrp_redundancy/nhs2/nhrp_cache.json @@ -4,7 +4,7 @@ }, "table": [ { - "interface": "r2-gre0", + "interface": "nhs2-gre0", "type": "local", "protocol": "176.16.1.2", "nbma": "192.168.1.2", @@ -15,7 +15,7 @@ "identity": "-" }, { - "interface": "r2-gre0", + "interface": "nhs2-gre0", "type": "dynamic", "protocol": "176.16.1.4", "nbma": "192.168.2.4", @@ -26,7 +26,7 @@ "identity": "" }, { - "interface": "r2-gre0", + "interface": "nhs2-gre0", "type": "dynamic", "protocol": "176.16.1.5", "nbma": "192.168.2.5", diff --git a/tests/topotests/nhrp_redundancy/r1/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhs2/nhrp_route.json similarity index 92% rename from tests/topotests/nhrp_redundancy/r1/nhrp_route.json rename to tests/topotests/nhrp_redundancy/nhs2/nhrp_route.json index b5f3e29e74..25086be7e8 100644 --- a/tests/topotests/nhrp_redundancy/r1/nhrp_route.json +++ b/tests/topotests/nhrp_redundancy/nhs2/nhrp_route.json @@ -16,7 +16,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r1-gre0", + "interfaceName": "nhs2-gre0", "active": true } ] @@ -39,7 +39,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r1-gre0", + "interfaceName": "nhs2-gre0", "active": true } ] diff --git a/tests/topotests/nhrp_redundancy/r3/nhrpd.conf b/tests/topotests/nhrp_redundancy/nhs2/nhrpd.conf similarity index 74% rename from tests/topotests/nhrp_redundancy/r3/nhrpd.conf rename to tests/topotests/nhrp_redundancy/nhs2/nhrpd.conf index 87cc2161f8..df86d2798e 100644 --- a/tests/topotests/nhrp_redundancy/r3/nhrpd.conf +++ b/tests/topotests/nhrp_redundancy/nhs2/nhrpd.conf @@ -1,9 +1,9 @@ !debug nhrp all nhrp nflog-group 1 -interface r3-gre0 +interface nhs2-gre0 ip nhrp holdtime 10 ip nhrp network-id 42 ip nhrp registration no-unique ip nhrp redirect - tunnel source r3-eth0 + tunnel source nhs2-eth0 exit diff --git a/tests/topotests/nhrp_redundancy/r2/zebra.conf b/tests/topotests/nhrp_redundancy/nhs2/zebra.conf similarity index 83% rename from tests/topotests/nhrp_redundancy/r2/zebra.conf rename to tests/topotests/nhrp_redundancy/nhs2/zebra.conf index 1a9c4ff915..bf482b5837 100644 --- a/tests/topotests/nhrp_redundancy/r2/zebra.conf +++ b/tests/topotests/nhrp_redundancy/nhs2/zebra.conf @@ -1,9 +1,9 @@ ip forwarding -interface r2-eth0 +interface nhs2-eth0 ip address 192.168.1.2/24 ! ip route 192.168.2.0/24 192.168.1.6 -interface r2-gre0 +interface nhs2-gre0 ip address 176.16.1.2/32 no link-detect ipv6 nd suppress-ra diff --git a/tests/topotests/nhrp_redundancy/r3/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhs3/nhrp_cache.json similarity index 88% rename from tests/topotests/nhrp_redundancy/r3/nhrp_cache.json rename to tests/topotests/nhrp_redundancy/nhs3/nhrp_cache.json index ef3ab690bc..9bcf0f78c2 100644 --- a/tests/topotests/nhrp_redundancy/r3/nhrp_cache.json +++ b/tests/topotests/nhrp_redundancy/nhs3/nhrp_cache.json @@ -4,7 +4,7 @@ }, "table": [ { - "interface": "r3-gre0", + "interface": "nhs3-gre0", "type": "dynamic", "protocol": "176.16.1.4", "nbma": "192.168.2.4", @@ -15,7 +15,7 @@ "identity": "" }, { - "interface": "r3-gre0", + "interface": "nhs3-gre0", "type": "local", "protocol": "176.16.1.3", "nbma": "192.168.1.3", @@ -26,7 +26,7 @@ "identity": "-" }, { - "interface": "r3-gre0", + "interface": "nhs3-gre0", "type": "dynamic", "protocol": "176.16.1.5", "nbma": "192.168.2.5", diff --git a/tests/topotests/nhrp_redundancy/r2/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhs3/nhrp_route.json similarity index 92% rename from tests/topotests/nhrp_redundancy/r2/nhrp_route.json rename to tests/topotests/nhrp_redundancy/nhs3/nhrp_route.json index f1fa6e54c1..a5a493c973 100644 --- a/tests/topotests/nhrp_redundancy/r2/nhrp_route.json +++ b/tests/topotests/nhrp_redundancy/nhs3/nhrp_route.json @@ -16,7 +16,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r2-gre0", + "interfaceName": "nhs3-gre0", "active": true } ] @@ -39,7 +39,7 @@ { "fib": true, "directlyConnected": true, - "interfaceName": "r2-gre0", + "interfaceName": "nhs3-gre0", "active": true } ] diff --git a/tests/topotests/nhrp_redundancy/r1/nhrpd.conf b/tests/topotests/nhrp_redundancy/nhs3/nhrpd.conf similarity index 74% rename from tests/topotests/nhrp_redundancy/r1/nhrpd.conf rename to tests/topotests/nhrp_redundancy/nhs3/nhrpd.conf index ad48ce3769..e7c3504f65 100644 --- a/tests/topotests/nhrp_redundancy/r1/nhrpd.conf +++ b/tests/topotests/nhrp_redundancy/nhs3/nhrpd.conf @@ -1,9 +1,9 @@ !debug nhrp all nhrp nflog-group 1 -interface r1-gre0 +interface nhs3-gre0 ip nhrp holdtime 10 ip nhrp network-id 42 ip nhrp registration no-unique ip nhrp redirect - tunnel source r1-eth0 + tunnel source nhs3-eth0 exit diff --git a/tests/topotests/nhrp_redundancy/r3/zebra.conf b/tests/topotests/nhrp_redundancy/nhs3/zebra.conf similarity index 71% rename from tests/topotests/nhrp_redundancy/r3/zebra.conf rename to tests/topotests/nhrp_redundancy/nhs3/zebra.conf index 980cfbcaab..2aac2eabbf 100644 --- a/tests/topotests/nhrp_redundancy/r3/zebra.conf +++ b/tests/topotests/nhrp_redundancy/nhs3/zebra.conf @@ -1,9 +1,9 @@ ip forwarding -interface r3-eth0 +interface nhs3-eth0 ip address 192.168.1.3/24 ! ip route 192.168.2.0/24 192.168.1.6 -interface r3-gre0 +interface nhs3-gre0 ip address 176.16.1.3/32 no link-detect ipv6 nd suppress-ra diff --git a/tests/topotests/nhrp_redundancy/r6/zebra.conf b/tests/topotests/nhrp_redundancy/router/zebra.conf similarity index 63% rename from tests/topotests/nhrp_redundancy/r6/zebra.conf rename to tests/topotests/nhrp_redundancy/router/zebra.conf index 63a37cd5bf..c0eb19ca40 100644 --- a/tests/topotests/nhrp_redundancy/r6/zebra.conf +++ b/tests/topotests/nhrp_redundancy/router/zebra.conf @@ -1,7 +1,7 @@ ip forwarding -interface r6-eth0 +interface router-eth0 ip address 192.168.1.6/24 ! -interface r6-eth1 +interface router-eth1 ip address 192.168.2.6/24 exit diff --git a/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.dot b/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.dot index c169436db0..8a3363d1ae 100644 --- a/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.dot +++ b/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.dot @@ -16,43 +16,43 @@ graph template { label="nhrp-topo-redundant-nhs"; # Routers - r1 [ + nhs1 [ shape=doubleoctagon, label="NHS 1", fillcolor="#f08080", style=filled, ]; - r2 [ + nhs2 [ shape=doubleoctagon label="NHS 2", fillcolor="#f08080", style=filled, ]; - r3 [ + nhs3 [ shape=doubleoctagon label="NHS 3", fillcolor="#f08080", style=filled, ]; - r4 [ + nhc1 [ shape=doubleoctagon label="NHC 1", fillcolor="#f08080", style=filled, ]; - r5 [ + nhc2 [ shape=doubleoctagon label="NHC 2", fillcolor="#f08080", style=filled, ]; - r6 [ + router [ shape=doubleoctagon label="router", fillcolor="#f08080", style=filled, ]; - r7 [ + host [ shape=doubleoctagon label="host", fillcolor="#f08080", @@ -86,18 +86,18 @@ graph template { ]; # Connections - r1 -- sw1 [label="eth0"]; - r2 -- sw1 [label="eth0"]; - r3 -- sw1 [label="eth0"]; - r6 -- sw1 [label="eth0"]; + nhs1 -- sw1 [label="eth0"]; + nhs2 -- sw1 [label="eth0"]; + nhs3 -- sw1 [label="eth0"]; + router -- sw1 [label="eth0"]; - r4 -- sw2 [label="eth0"]; - r5 -- sw2 [label="eth0"]; - r6 -- sw2 [label="eth1"]; + nhc1 -- sw2 [label="eth0"]; + nhc2 -- sw2 [label="eth0"]; + router -- sw2 [label="eth1"]; - r4 -- sw3 [label="eth1"]; - r7 -- sw3 [label="eth0"]; + nhc1 -- sw3 [label="eth1"]; + host -- sw3 [label="eth0"]; - r5 -- sw4 [label="eth1"]; + nhc2 -- sw4 [label="eth1"]; } diff --git a/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py b/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py index 81a22ebfaf..c0d7312102 100644 --- a/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py +++ b/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py @@ -77,30 +77,26 @@ def build_topo(tgen): "Build function" # Create 7 routers - for routern in range(1, 8): - tgen.add_router("r{}".format(routern)) + for rname in ["nhs1", "nhs2", "nhs3", "nhc1", "nhc2", "router", "host"]: + tgen.add_router(rname) - # Interconnect routers 1, 2, 3, 6 switch = tgen.add_switch("s1") - switch.add_link(tgen.gears["r1"]) - switch.add_link(tgen.gears["r2"]) - switch.add_link(tgen.gears["r3"]) - switch.add_link(tgen.gears["r6"]) + switch.add_link(tgen.gears["nhs1"]) + switch.add_link(tgen.gears["nhs2"]) + switch.add_link(tgen.gears["nhs3"]) + switch.add_link(tgen.gears["router"]) - # Interconnect routers 4, 5, 6 switch = tgen.add_switch("s2") - switch.add_link(tgen.gears["r4"]) - switch.add_link(tgen.gears["r5"]) - switch.add_link(tgen.gears["r6"]) + switch.add_link(tgen.gears["nhc1"]) + switch.add_link(tgen.gears["nhc2"]) + switch.add_link(tgen.gears["router"]) - # Connect router 4, 7 switch = tgen.add_switch("s3") - switch.add_link(tgen.gears["r4"]) - switch.add_link(tgen.gears["r7"]) + switch.add_link(tgen.gears["nhc1"]) + switch.add_link(tgen.gears["host"]) - # Connect router 5 switch = tgen.add_switch("s4") - switch.add_link(tgen.gears["r5"]) + switch.add_link(tgen.gears["nhc2"]) def _populate_iface(): @@ -123,40 +119,37 @@ def _populate_iface(): ] for cmd in cmds_tot_hub: - # Router 1 - input = cmd.format("r1", "1") + input = cmd.format("nhs1", "1") logger.info("input: " + input) - output = tgen.net["r1"].cmd(input) + output = tgen.net["nhs1"].cmd(input) logger.info("output: " + output) - # Router 2 - input = cmd.format("r2", "2") + input = cmd.format("nhs2", "2") logger.info("input: " + input) - output = tgen.net["r2"].cmd(input) + output = tgen.net["nhs2"].cmd(input) logger.info("output: " + output) - # Router 3 - input = cmd.format("r3", "3") + input = cmd.format("nhs3", "3") logger.info("input: " + input) - output = tgen.net["r3"].cmd(input) + output = tgen.net["nhs3"].cmd(input) logger.info("output: " + output) for cmd in cmds_tot: - input = cmd.format("r4", "4") + input = cmd.format("nhc1", "4") logger.info("input: " + input) - output = tgen.net["r4"].cmd(input) + output = tgen.net["nhc1"].cmd(input) logger.info("output: " + output) - input = cmd.format("r5", "5") + input = cmd.format("nhc2", "5") logger.info("input: " + input) - output = tgen.net["r5"].cmd(input) + output = tgen.net["nhc2"].cmd(input) logger.info("output: " + output) def _verify_iptables(): tgen = get_topogen() # Verify iptables is installed. Required for shortcuts - rc, _, _ = tgen.net["r1"].cmd_status("iptables") + rc, _, _ = tgen.net["nhs1"].cmd_status("iptables") return False if rc == 127 else True @@ -179,7 +172,7 @@ def setup_module(mod): TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname)), ) - if rname in ("r1", "r2", "r3", "r4", "r5"): + if rname in ("nhs1", "nhs2", "nhs3", "nhc1", "nhc2"): router.load_config( TopoRouter.RD_NHRP, os.path.join(CWD, "{}/nhrpd.conf".format(rname)) ) @@ -247,53 +240,53 @@ def test_protocols_convergence(): assert result is None, assertmsg # Test connectivity from 1 NHRP server to all clients - pingrouter = tgen.gears["r1"] - logger.info("Check Ping IPv4 from R1 to R4 = 176.16.1.4)") + pingrouter = tgen.gears["nhs1"] + logger.info("Check Ping IPv4 from nhs1 to nhc1 = 176.16.1.4)") output = pingrouter.run("ping 176.16.1.4 -f -c 1000") logger.info(output) if "1000 packets transmitted, 1000 received" not in output: - assertmsg = "expected ping IPv4 from R1 to R4 should be ok" + assertmsg = "expected ping IPv4 from nhs1 to nhc1 should be ok" assert 0, assertmsg else: - logger.info("Check Ping IPv4 from R1 to R4 OK") + logger.info("Check Ping IPv4 from nhs1 to nhc1 OK") - logger.info("Check Ping IPv4 from R1 to R5 = 176.16.1.5)") + logger.info("Check Ping IPv4 from nhs1 to nhc2 = 176.16.1.5)") output = pingrouter.run("ping 176.16.1.5 -f -c 1000") logger.info(output) if "1000 packets transmitted, 1000 received" not in output: - assertmsg = "expected ping IPv4 from R1 to R5 should be ok" + assertmsg = "expected ping IPv4 from nhs1 to nhc2 should be ok" assert 0, assertmsg else: - logger.info("Check Ping IPv4 from R1 to R5 OK") + logger.info("Check Ping IPv4 from nhs1 to nhc2 OK") # Test connectivity from 1 NHRP client to all servers - pingrouter = tgen.gears["r4"] - logger.info("Check Ping IPv4 from R4 to R1 = 176.16.1.1)") + pingrouter = tgen.gears["nhc1"] + logger.info("Check Ping IPv4 from nhc1 to nhs1 = 176.16.1.1)") output = pingrouter.run("ping 176.16.1.1 -f -c 1000") logger.info(output) if "1000 packets transmitted, 1000 received" not in output: - assertmsg = "expected ping IPv4 from R4 to R1 should be ok" + assertmsg = "expected ping IPv4 from nhc1 to nhs1 should be ok" assert 0, assertmsg else: - logger.info("Check Ping IPv4 from R4 to R1 OK") + logger.info("Check Ping IPv4 from nhc1 to nhs1 OK") - logger.info("Check Ping IPv4 from R4 to R2 = 176.16.1.2)") + logger.info("Check Ping IPv4 from nhc1 to nhs2 = 176.16.1.2)") output = pingrouter.run("ping 176.16.1.2 -f -c 1000") logger.info(output) if "1000 packets transmitted, 1000 received" not in output: - assertmsg = "expected ping IPv4 from R4 to R2 should be ok" + assertmsg = "expected ping IPv4 from nhc1 to nhs2 should be ok" assert 0, assertmsg else: - logger.info("Check Ping IPv4 from R4 to R2 OK") + logger.info("Check Ping IPv4 from nhc1 to nhs2 OK") - logger.info("Check Ping IPv4 from R4 to R3 = 176.16.1.3)") + logger.info("Check Ping IPv4 from nhc1 to nhs3 = 176.16.1.3)") output = pingrouter.run("ping 176.16.1.3 -f -c 1000") logger.info(output) if "1000 packets transmitted, 1000 received" not in output: - assertmsg = "expected ping IPv4 from R4 to R3 should be ok" + assertmsg = "expected ping IPv4 from nhc1 to nhs3 should be ok" assert 0, assertmsg else: - logger.info("Check Ping IPv4 from R4 to R3 OK") + logger.info("Check Ping IPv4 from nhc1 to nhs3 OK") @retry(retry_timeout=30, initial_wait=5) @@ -302,16 +295,16 @@ def verify_shortcut_path(): Verifying that traffic flows through shortcut path """ tgen = get_topogen() - pingrouter = tgen.gears["r7"] - logger.info("Check Ping IPv4 from R7 to R5 = 5.5.5.5") + pingrouter = tgen.gears["host"] + logger.info("Check Ping IPv4 from host to nhc2 = 5.5.5.5") output = pingrouter.run("ping 5.5.5.5 -f -c 1000") logger.info(output) if "1000 packets transmitted, 1000 received" not in output: - assertmsg = "expected ping IPv4 from R7 to R5 should be ok" + assertmsg = "expected ping IPv4 from host to nhc2 should be ok" assert 0, assertmsg else: - logger.info("Check Ping IPv4 from R7 to R5 OK") + logger.info("Check Ping IPv4 from host to nhc2 OK") def test_redundancy_shortcut(): @@ -328,8 +321,8 @@ def test_redundancy_shortcut(): logger.info("Testing NHRP shortcuts with redundant servers") - # Verify R4 nhrp routes before shortcut creation - router = tgen.gears["r4"] + # Verify nhc1 nhrp routes before shortcut creation + router = tgen.gears["nhc1"] json_file = "{}/{}/nhrp_route.json".format(CWD, router.name) assertmsg = "No nhrp_route file found" assert os.path.isfile(json_file), assertmsg @@ -347,16 +340,16 @@ def test_redundancy_shortcut(): assert result is None, assertmsg # Initiate shortcut by pinging between clients - pingrouter = tgen.gears["r7"] - logger.info("Check Ping IPv4 from R7 to R5 via shortcut = 5.5.5.5") + pingrouter = tgen.gears["host"] + logger.info("Check Ping IPv4 from host to nhc2 via shortcut = 5.5.5.5") output = pingrouter.run("ping 5.5.5.5 -f -c 1000") logger.info(output) if "1000 packets transmitted, 1000 received" not in output: - assertmsg = "expected ping IPv4 from R7 to R5 via shortcut should be ok" + assertmsg = "expected ping IPv4 from host to nhc2 via shortcut should be ok" assert 0, assertmsg else: - logger.info("Check Ping IPv4 from R7 to R5 via shortcut OK") + logger.info("Check Ping IPv4 from host to nhc2 via shortcut OK") # Now check that NHRP shortcut route installed json_file = "{}/{}/nhrp_route_shortcut.json".format(CWD, router.name) @@ -376,20 +369,20 @@ def test_redundancy_shortcut(): assert result is None, assertmsg # Bring down primary GRE interface and verify shortcut is not disturbed - logger.info("Bringing down R1, primary NHRP server.") - shutdown_bringup_interface(tgen, "r1", "r1-gre0", False) + logger.info("Bringing down nhs1, primary NHRP server.") + shutdown_bringup_interface(tgen, "nhs1", "nhs1-gre0", False) # Verify shortcut is still active - pingrouter = tgen.gears["r7"] - logger.info("Check Ping IPv4 from R7 to R5 via shortcut = 5.5.5.5") + pingrouter = tgen.gears["host"] + logger.info("Check Ping IPv4 from host to nhc2 via shortcut = 5.5.5.5") output = pingrouter.run("ping 5.5.5.5 -f -c 1000") logger.info(output) if "1000 packets transmitted, 1000 received" not in output: - assertmsg = "expected ping IPv4 from R7 to R5 via shortcut should be ok" + assertmsg = "expected ping IPv4 from host to nhc2 via shortcut should be ok" assert 0, assertmsg else: - logger.info("Check Ping IPv4 from R7 to R5 via shortcut OK") + logger.info("Check Ping IPv4 from host to nhc2 via shortcut OK") # Now verify shortcut is purged with lack of traffic json_file = "{}/{}/nhrp_route.json".format(CWD, router.name) -- 2.39.5