From: Louis Scalbert Date: Fri, 30 Aug 2024 09:16:44 +0000 (+0200) Subject: tests: rename routers in nhrp_redundancy X-Git-Tag: base_10.2~137^2~8 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5f058cdef7ef52da9a4aa9589169e50e457b40a0;p=matthieu%2Ffrr.git 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 --- diff --git a/tests/topotests/nhrp_redundancy/host/zebra.conf b/tests/topotests/nhrp_redundancy/host/zebra.conf new file mode 100644 index 0000000000..58c8cb2c4b --- /dev/null +++ b/tests/topotests/nhrp_redundancy/host/zebra.conf @@ -0,0 +1,4 @@ +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/nhc1/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_cache.json new file mode 100644 index 0000000000..5d2cf6fb5e --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhc1/nhrp_cache.json @@ -0,0 +1,51 @@ +{ + "attr": { + "entriesCount": 4 + }, + "table": [ + { + "interface": "nhc1-gre0", + "type": "nhs", + "protocol": "176.16.1.2", + "nbma": "192.168.1.2", + "claimed_nbma": "192.168.1.2", + "used": false, + "timeout": true, + "auth": false, + "identity": "" + }, + { + "interface": "nhc1-gre0", + "type": "local", + "protocol": "176.16.1.4", + "nbma": "192.168.2.4", + "claimed_nbma": "192.168.2.4", + "used": false, + "timeout": false, + "auth": false, + "identity": "-" + }, + { + "interface": "nhc1-gre0", + "type": "nhs", + "protocol": "176.16.1.3", + "nbma": "192.168.1.3", + "claimed_nbma": "192.168.1.3", + "used": false, + "timeout": true, + "auth": false, + "identity": "" + }, + { + "interface": "nhc1-gre0", + "type": "nhs", + "protocol": "176.16.1.1", + "nbma": "192.168.1.1", + "claimed_nbma": "192.168.1.1", + "used": false, + "timeout": true, + "auth": false, + "identity": "" + } + ] +} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/nhc1/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_route.json new file mode 100644 index 0000000000..2af62dd4d6 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhc1/nhrp_route.json @@ -0,0 +1,71 @@ +{ + "176.16.1.1\/32": [ + { + "prefix": "176.16.1.1\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhc1-gre0", + "active": true + } + ] + } + ], + "176.16.1.2\/32": [ + { + "prefix": "176.16.1.2\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhc1-gre0", + "active": true + } + ] + } + ], + "176.16.1.3\/32": [ + { + "prefix": "176.16.1.3\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhc1-gre0", + "active": true + } + ] + } + ] +} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_shortcut.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_shortcut.json new file mode 100644 index 0000000000..2111e27583 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_shortcut.json @@ -0,0 +1,118 @@ +{ + "5.5.5.0\/24": [ + { + "prefix": "5.5.5.0\/24", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "ip": "176.16.1.5", + "afi": "ipv4", + "interfaceName": "nhc1-gre0", + "active": true + } + ] + } + ], + "176.16.1.1\/32": [ + { + "prefix": "176.16.1.1\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhc1-gre0", + "active": true + } + ] + } + ], + "176.16.1.2\/32": [ + { + "prefix": "176.16.1.2\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhc1-gre0", + "active": true + } + ] + } + ], + "176.16.1.3\/32": [ + { + "prefix": "176.16.1.3\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhc1-gre0", + "active": true + } + ] + } + ], + "176.16.1.5\/32": [ + { + "prefix": "176.16.1.5\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhc1-gre0", + "active": true + } + ] + } + ] +} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/nhc1/nhrpd.conf b/tests/topotests/nhrp_redundancy/nhc1/nhrpd.conf new file mode 100644 index 0000000000..a0862f77ef --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhc1/nhrpd.conf @@ -0,0 +1,11 @@ +!debug nhrp all +interface nhc1-gre0 + ip nhrp holdtime 10 + ip nhrp network-id 42 + ip nhrp registration no-unique + ip nhrp nhs dynamic nbma 192.168.1.1 + ip nhrp nhs dynamic nbma 192.168.1.2 + ip nhrp nhs dynamic nbma 192.168.1.3 + ip nhrp shortcut + tunnel source nhc1-eth0 +exit diff --git a/tests/topotests/nhrp_redundancy/nhc1/zebra.conf b/tests/topotests/nhrp_redundancy/nhc1/zebra.conf new file mode 100644 index 0000000000..db25964ee4 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhc1/zebra.conf @@ -0,0 +1,16 @@ +ip forwarding +interface nhc1-eth0 + ip address 192.168.2.4/24 +! +ip route 192.168.1.0/24 192.168.2.6 +interface nhc1-gre0 + ip address 176.16.1.4/32 + no link-detect + ipv6 nd suppress-ra +! +interface nhc1-eth1 + ip address 4.4.4.4/24 +! +ip route 0.0.0.0/0 176.16.1.1 50 +ip route 0.0.0.0/0 176.16.1.2 60 +ip route 0.0.0.0/0 176.16.1.3 70 \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/nhc2/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhc2/nhrp_cache.json new file mode 100644 index 0000000000..fa0f07aacf --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhc2/nhrp_cache.json @@ -0,0 +1,51 @@ +{ + "attr": { + "entriesCount": 4 + }, + "table": [ + { + "interface": "nhc2-gre0", + "type": "nhs", + "protocol": "176.16.1.2", + "nbma": "192.168.1.2", + "claimed_nbma": "192.168.1.2", + "used": false, + "timeout": true, + "auth": false, + "identity": "" + }, + { + "interface": "nhc2-gre0", + "type": "nhs", + "protocol": "176.16.1.3", + "nbma": "192.168.1.3", + "claimed_nbma": "192.168.1.3", + "used": false, + "timeout": true, + "auth": false, + "identity": "" + }, + { + "interface": "nhc2-gre0", + "type": "nhs", + "protocol": "176.16.1.1", + "nbma": "192.168.1.1", + "claimed_nbma": "192.168.1.1", + "used": false, + "timeout": true, + "auth": false, + "identity": "" + }, + { + "interface": "nhc2-gre0", + "type": "local", + "protocol": "176.16.1.5", + "nbma": "192.168.2.5", + "claimed_nbma": "192.168.2.5", + "used": false, + "timeout": false, + "auth": false, + "identity": "-" + } + ] +} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/nhc2/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhc2/nhrp_route.json new file mode 100644 index 0000000000..a8f61861bc --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhc2/nhrp_route.json @@ -0,0 +1,71 @@ +{ + "176.16.1.1\/32": [ + { + "prefix": "176.16.1.1\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhc2-gre0", + "active": true + } + ] + } + ], + "176.16.1.2\/32": [ + { + "prefix": "176.16.1.2\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhc2-gre0", + "active": true + } + ] + } + ], + "176.16.1.3\/32": [ + { + "prefix": "176.16.1.3\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhc2-gre0", + "active": true + } + ] + } + ] +} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/nhc2/nhrpd.conf b/tests/topotests/nhrp_redundancy/nhc2/nhrpd.conf new file mode 100644 index 0000000000..16a6d87c27 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhc2/nhrpd.conf @@ -0,0 +1,11 @@ +!debug nhrp all +interface nhc2-gre0 + ip nhrp holdtime 10 + ip nhrp network-id 42 + ip nhrp nhs dynamic nbma 192.168.1.1 + ip nhrp nhs dynamic nbma 192.168.1.2 + ip nhrp nhs dynamic nbma 192.168.1.3 + ip nhrp registration no-unique + ip nhrp shortcut + tunnel source nhc2-eth0 +exit diff --git a/tests/topotests/nhrp_redundancy/nhc2/zebra.conf b/tests/topotests/nhrp_redundancy/nhc2/zebra.conf new file mode 100644 index 0000000000..be22fc0ae5 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhc2/zebra.conf @@ -0,0 +1,16 @@ +ip forwarding +interface nhc2-eth0 + ip address 192.168.2.5/24 +! +ip route 192.168.1.0/24 192.168.2.6 +interface nhc2-gre0 + ip address 176.16.1.5/32 + no link-detect + ipv6 nd suppress-ra +! +interface nhc2-eth1 + ip address 5.5.5.5/24 +! +ip route 0.0.0.0/0 176.16.1.1 50 +ip route 0.0.0.0/0 176.16.1.2 60 +ip route 0.0.0.0/0 176.16.1.3 70 diff --git a/tests/topotests/nhrp_redundancy/nhs1/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhs1/nhrp_cache.json new file mode 100644 index 0000000000..920644e67d --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhs1/nhrp_cache.json @@ -0,0 +1,40 @@ +{ + "attr": { + "entriesCount": 3 + }, + "table": [ + { + "interface": "nhs1-gre0", + "type": "dynamic", + "protocol": "176.16.1.4", + "nbma": "192.168.2.4", + "claimed_nbma": "192.168.2.4", + "used": false, + "timeout": true, + "auth": false, + "identity": "" + }, + { + "interface": "nhs1-gre0", + "type": "local", + "protocol": "176.16.1.1", + "nbma": "192.168.1.1", + "claimed_nbma": "192.168.1.1", + "used": false, + "timeout": false, + "auth": false, + "identity": "-" + }, + { + "interface": "nhs1-gre0", + "type": "dynamic", + "protocol": "176.16.1.5", + "nbma": "192.168.2.5", + "claimed_nbma": "192.168.2.5", + "used": false, + "timeout": true, + "auth": false, + "identity": "" + } + ] +} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/nhs1/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhs1/nhrp_route.json new file mode 100644 index 0000000000..d89719c802 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhs1/nhrp_route.json @@ -0,0 +1,48 @@ +{ + "176.16.1.4\/32": [ + { + "prefix": "176.16.1.4\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhs1-gre0", + "active": true + } + ] + } + ], + "176.16.1.5\/32": [ + { + "prefix": "176.16.1.5\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhs1-gre0", + "active": true + } + ] + } + ] +} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/nhs1/nhrpd.conf b/tests/topotests/nhrp_redundancy/nhs1/nhrpd.conf new file mode 100644 index 0000000000..c0c8c28f94 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhs1/nhrpd.conf @@ -0,0 +1,9 @@ +!debug nhrp all +nhrp nflog-group 1 +interface nhs1-gre0 + ip nhrp holdtime 10 + ip nhrp network-id 42 + ip nhrp registration no-unique + ip nhrp redirect + tunnel source nhs1-eth0 +exit diff --git a/tests/topotests/nhrp_redundancy/nhs1/zebra.conf b/tests/topotests/nhrp_redundancy/nhs1/zebra.conf new file mode 100644 index 0000000000..d116612c4f --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhs1/zebra.conf @@ -0,0 +1,12 @@ +ip forwarding +interface nhs1-eth0 + ip address 192.168.1.1/24 +! +ip route 192.168.2.0/24 192.168.1.6 +interface nhs1-gre0 + ip address 176.16.1.1/32 + no link-detect + ipv6 nd suppress-ra +! +ip route 4.4.4.0/24 176.16.1.4 +ip route 5.5.5.0/24 176.16.1.5 diff --git a/tests/topotests/nhrp_redundancy/nhs2/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhs2/nhrp_cache.json new file mode 100644 index 0000000000..c0538203c7 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhs2/nhrp_cache.json @@ -0,0 +1,40 @@ +{ + "attr": { + "entriesCount": 3 + }, + "table": [ + { + "interface": "nhs2-gre0", + "type": "local", + "protocol": "176.16.1.2", + "nbma": "192.168.1.2", + "claimed_nbma": "192.168.1.2", + "used": false, + "timeout": false, + "auth": false, + "identity": "-" + }, + { + "interface": "nhs2-gre0", + "type": "dynamic", + "protocol": "176.16.1.4", + "nbma": "192.168.2.4", + "claimed_nbma": "192.168.2.4", + "used": false, + "timeout": true, + "auth": false, + "identity": "" + }, + { + "interface": "nhs2-gre0", + "type": "dynamic", + "protocol": "176.16.1.5", + "nbma": "192.168.2.5", + "claimed_nbma": "192.168.2.5", + "used": false, + "timeout": true, + "auth": false, + "identity": "" + } + ] +} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/nhs2/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhs2/nhrp_route.json new file mode 100644 index 0000000000..25086be7e8 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhs2/nhrp_route.json @@ -0,0 +1,48 @@ +{ + "176.16.1.4\/32": [ + { + "prefix": "176.16.1.4\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhs2-gre0", + "active": true + } + ] + } + ], + "176.16.1.5\/32": [ + { + "prefix": "176.16.1.5\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhs2-gre0", + "active": true + } + ] + } + ] +} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/nhs2/nhrpd.conf b/tests/topotests/nhrp_redundancy/nhs2/nhrpd.conf new file mode 100644 index 0000000000..df86d2798e --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhs2/nhrpd.conf @@ -0,0 +1,9 @@ +!debug nhrp all +nhrp nflog-group 1 +interface nhs2-gre0 + ip nhrp holdtime 10 + ip nhrp network-id 42 + ip nhrp registration no-unique + ip nhrp redirect + tunnel source nhs2-eth0 +exit diff --git a/tests/topotests/nhrp_redundancy/nhs2/zebra.conf b/tests/topotests/nhrp_redundancy/nhs2/zebra.conf new file mode 100644 index 0000000000..bf482b5837 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhs2/zebra.conf @@ -0,0 +1,12 @@ +ip forwarding +interface nhs2-eth0 + ip address 192.168.1.2/24 +! +ip route 192.168.2.0/24 192.168.1.6 +interface nhs2-gre0 + ip address 176.16.1.2/32 + no link-detect + ipv6 nd suppress-ra +! +ip route 4.4.4.0/24 176.16.1.4 +ip route 5.5.5.0/24 176.16.1.5 diff --git a/tests/topotests/nhrp_redundancy/nhs3/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhs3/nhrp_cache.json new file mode 100644 index 0000000000..9bcf0f78c2 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhs3/nhrp_cache.json @@ -0,0 +1,40 @@ +{ + "attr": { + "entriesCount": 3 + }, + "table": [ + { + "interface": "nhs3-gre0", + "type": "dynamic", + "protocol": "176.16.1.4", + "nbma": "192.168.2.4", + "claimed_nbma": "192.168.2.4", + "used": false, + "timeout": true, + "auth": false, + "identity": "" + }, + { + "interface": "nhs3-gre0", + "type": "local", + "protocol": "176.16.1.3", + "nbma": "192.168.1.3", + "claimed_nbma": "192.168.1.3", + "used": false, + "timeout": false, + "auth": false, + "identity": "-" + }, + { + "interface": "nhs3-gre0", + "type": "dynamic", + "protocol": "176.16.1.5", + "nbma": "192.168.2.5", + "claimed_nbma": "192.168.2.5", + "used": false, + "timeout": true, + "auth": false, + "identity": "" + } + ] +} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/nhs3/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhs3/nhrp_route.json new file mode 100644 index 0000000000..a5a493c973 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhs3/nhrp_route.json @@ -0,0 +1,48 @@ +{ + "176.16.1.4\/32": [ + { + "prefix": "176.16.1.4\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhs3-gre0", + "active": true + } + ] + } + ], + "176.16.1.5\/32": [ + { + "prefix": "176.16.1.5\/32", + "protocol": "nhrp", + "vrfId": 0, + "vrfName": "default", + "selected": true, + "destSelected": true, + "distance": 10, + "metric": 0, + "installed": true, + "internalNextHopNum": 1, + "internalNextHopActiveNum": 1, + "nexthops": [ + { + "fib": true, + "directlyConnected": true, + "interfaceName": "nhs3-gre0", + "active": true + } + ] + } + ] +} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/nhs3/nhrpd.conf b/tests/topotests/nhrp_redundancy/nhs3/nhrpd.conf new file mode 100644 index 0000000000..e7c3504f65 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhs3/nhrpd.conf @@ -0,0 +1,9 @@ +!debug nhrp all +nhrp nflog-group 1 +interface nhs3-gre0 + ip nhrp holdtime 10 + ip nhrp network-id 42 + ip nhrp registration no-unique + ip nhrp redirect + tunnel source nhs3-eth0 +exit diff --git a/tests/topotests/nhrp_redundancy/nhs3/zebra.conf b/tests/topotests/nhrp_redundancy/nhs3/zebra.conf new file mode 100644 index 0000000000..2aac2eabbf --- /dev/null +++ b/tests/topotests/nhrp_redundancy/nhs3/zebra.conf @@ -0,0 +1,12 @@ +ip forwarding +interface nhs3-eth0 + ip address 192.168.1.3/24 +! +ip route 192.168.2.0/24 192.168.1.6 +interface nhs3-gre0 + ip address 176.16.1.3/32 + no link-detect + ipv6 nd suppress-ra +! +ip route 4.4.4.0/24 176.16.1.4 +ip route 5.5.5.0/24 176.16.1.5 \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r1/nhrp_cache.json b/tests/topotests/nhrp_redundancy/r1/nhrp_cache.json deleted file mode 100644 index a94dd9fecf..0000000000 --- a/tests/topotests/nhrp_redundancy/r1/nhrp_cache.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "attr": { - "entriesCount": 3 - }, - "table": [ - { - "interface": "r1-gre0", - "type": "dynamic", - "protocol": "176.16.1.4", - "nbma": "192.168.2.4", - "claimed_nbma": "192.168.2.4", - "used": false, - "timeout": true, - "auth": false, - "identity": "" - }, - { - "interface": "r1-gre0", - "type": "local", - "protocol": "176.16.1.1", - "nbma": "192.168.1.1", - "claimed_nbma": "192.168.1.1", - "used": false, - "timeout": false, - "auth": false, - "identity": "-" - }, - { - "interface": "r1-gre0", - "type": "dynamic", - "protocol": "176.16.1.5", - "nbma": "192.168.2.5", - "claimed_nbma": "192.168.2.5", - "used": false, - "timeout": true, - "auth": false, - "identity": "" - } - ] -} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r1/nhrp_route.json b/tests/topotests/nhrp_redundancy/r1/nhrp_route.json deleted file mode 100644 index b5f3e29e74..0000000000 --- a/tests/topotests/nhrp_redundancy/r1/nhrp_route.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "176.16.1.4\/32": [ - { - "prefix": "176.16.1.4\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r1-gre0", - "active": true - } - ] - } - ], - "176.16.1.5\/32": [ - { - "prefix": "176.16.1.5\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r1-gre0", - "active": true - } - ] - } - ] -} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r1/nhrpd.conf b/tests/topotests/nhrp_redundancy/r1/nhrpd.conf deleted file mode 100644 index ad48ce3769..0000000000 --- a/tests/topotests/nhrp_redundancy/r1/nhrpd.conf +++ /dev/null @@ -1,9 +0,0 @@ -!debug nhrp all -nhrp nflog-group 1 -interface r1-gre0 - ip nhrp holdtime 10 - ip nhrp network-id 42 - ip nhrp registration no-unique - ip nhrp redirect - tunnel source r1-eth0 -exit diff --git a/tests/topotests/nhrp_redundancy/r1/zebra.conf b/tests/topotests/nhrp_redundancy/r1/zebra.conf deleted file mode 100644 index 0f11563f57..0000000000 --- a/tests/topotests/nhrp_redundancy/r1/zebra.conf +++ /dev/null @@ -1,12 +0,0 @@ -ip forwarding -interface r1-eth0 - ip address 192.168.1.1/24 -! -ip route 192.168.2.0/24 192.168.1.6 -interface r1-gre0 - ip address 176.16.1.1/32 - no link-detect - ipv6 nd suppress-ra -! -ip route 4.4.4.0/24 176.16.1.4 -ip route 5.5.5.0/24 176.16.1.5 diff --git a/tests/topotests/nhrp_redundancy/r2/nhrp_cache.json b/tests/topotests/nhrp_redundancy/r2/nhrp_cache.json deleted file mode 100644 index 91557a1918..0000000000 --- a/tests/topotests/nhrp_redundancy/r2/nhrp_cache.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "attr": { - "entriesCount": 3 - }, - "table": [ - { - "interface": "r2-gre0", - "type": "local", - "protocol": "176.16.1.2", - "nbma": "192.168.1.2", - "claimed_nbma": "192.168.1.2", - "used": false, - "timeout": false, - "auth": false, - "identity": "-" - }, - { - "interface": "r2-gre0", - "type": "dynamic", - "protocol": "176.16.1.4", - "nbma": "192.168.2.4", - "claimed_nbma": "192.168.2.4", - "used": false, - "timeout": true, - "auth": false, - "identity": "" - }, - { - "interface": "r2-gre0", - "type": "dynamic", - "protocol": "176.16.1.5", - "nbma": "192.168.2.5", - "claimed_nbma": "192.168.2.5", - "used": false, - "timeout": true, - "auth": false, - "identity": "" - } - ] -} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r2/nhrp_route.json b/tests/topotests/nhrp_redundancy/r2/nhrp_route.json deleted file mode 100644 index f1fa6e54c1..0000000000 --- a/tests/topotests/nhrp_redundancy/r2/nhrp_route.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "176.16.1.4\/32": [ - { - "prefix": "176.16.1.4\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r2-gre0", - "active": true - } - ] - } - ], - "176.16.1.5\/32": [ - { - "prefix": "176.16.1.5\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r2-gre0", - "active": true - } - ] - } - ] -} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r2/nhrpd.conf b/tests/topotests/nhrp_redundancy/r2/nhrpd.conf deleted file mode 100644 index 4d63f07d1f..0000000000 --- a/tests/topotests/nhrp_redundancy/r2/nhrpd.conf +++ /dev/null @@ -1,9 +0,0 @@ -!debug nhrp all -nhrp nflog-group 1 -interface r2-gre0 - ip nhrp holdtime 10 - ip nhrp network-id 42 - ip nhrp registration no-unique - ip nhrp redirect - tunnel source r2-eth0 -exit diff --git a/tests/topotests/nhrp_redundancy/r2/zebra.conf b/tests/topotests/nhrp_redundancy/r2/zebra.conf deleted file mode 100644 index 1a9c4ff915..0000000000 --- a/tests/topotests/nhrp_redundancy/r2/zebra.conf +++ /dev/null @@ -1,12 +0,0 @@ -ip forwarding -interface r2-eth0 - ip address 192.168.1.2/24 -! -ip route 192.168.2.0/24 192.168.1.6 -interface r2-gre0 - ip address 176.16.1.2/32 - no link-detect - ipv6 nd suppress-ra -! -ip route 4.4.4.0/24 176.16.1.4 -ip route 5.5.5.0/24 176.16.1.5 diff --git a/tests/topotests/nhrp_redundancy/r3/nhrp_cache.json b/tests/topotests/nhrp_redundancy/r3/nhrp_cache.json deleted file mode 100644 index ef3ab690bc..0000000000 --- a/tests/topotests/nhrp_redundancy/r3/nhrp_cache.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "attr": { - "entriesCount": 3 - }, - "table": [ - { - "interface": "r3-gre0", - "type": "dynamic", - "protocol": "176.16.1.4", - "nbma": "192.168.2.4", - "claimed_nbma": "192.168.2.4", - "used": false, - "timeout": true, - "auth": false, - "identity": "" - }, - { - "interface": "r3-gre0", - "type": "local", - "protocol": "176.16.1.3", - "nbma": "192.168.1.3", - "claimed_nbma": "192.168.1.3", - "used": false, - "timeout": false, - "auth": false, - "identity": "-" - }, - { - "interface": "r3-gre0", - "type": "dynamic", - "protocol": "176.16.1.5", - "nbma": "192.168.2.5", - "claimed_nbma": "192.168.2.5", - "used": false, - "timeout": true, - "auth": false, - "identity": "" - } - ] -} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r3/nhrp_route.json b/tests/topotests/nhrp_redundancy/r3/nhrp_route.json deleted file mode 100644 index 3d548c08fd..0000000000 --- a/tests/topotests/nhrp_redundancy/r3/nhrp_route.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "176.16.1.4\/32": [ - { - "prefix": "176.16.1.4\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r3-gre0", - "active": true - } - ] - } - ], - "176.16.1.5\/32": [ - { - "prefix": "176.16.1.5\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r3-gre0", - "active": true - } - ] - } - ] -} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r3/nhrpd.conf b/tests/topotests/nhrp_redundancy/r3/nhrpd.conf deleted file mode 100644 index 87cc2161f8..0000000000 --- a/tests/topotests/nhrp_redundancy/r3/nhrpd.conf +++ /dev/null @@ -1,9 +0,0 @@ -!debug nhrp all -nhrp nflog-group 1 -interface r3-gre0 - ip nhrp holdtime 10 - ip nhrp network-id 42 - ip nhrp registration no-unique - ip nhrp redirect - tunnel source r3-eth0 -exit diff --git a/tests/topotests/nhrp_redundancy/r3/zebra.conf b/tests/topotests/nhrp_redundancy/r3/zebra.conf deleted file mode 100644 index 980cfbcaab..0000000000 --- a/tests/topotests/nhrp_redundancy/r3/zebra.conf +++ /dev/null @@ -1,12 +0,0 @@ -ip forwarding -interface r3-eth0 - ip address 192.168.1.3/24 -! -ip route 192.168.2.0/24 192.168.1.6 -interface r3-gre0 - ip address 176.16.1.3/32 - no link-detect - ipv6 nd suppress-ra -! -ip route 4.4.4.0/24 176.16.1.4 -ip route 5.5.5.0/24 176.16.1.5 \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r4/nhrp_cache.json b/tests/topotests/nhrp_redundancy/r4/nhrp_cache.json deleted file mode 100644 index f87ebcf5fc..0000000000 --- a/tests/topotests/nhrp_redundancy/r4/nhrp_cache.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "attr": { - "entriesCount": 4 - }, - "table": [ - { - "interface": "r4-gre0", - "type": "nhs", - "protocol": "176.16.1.2", - "nbma": "192.168.1.2", - "claimed_nbma": "192.168.1.2", - "used": false, - "timeout": true, - "auth": false, - "identity": "" - }, - { - "interface": "r4-gre0", - "type": "local", - "protocol": "176.16.1.4", - "nbma": "192.168.2.4", - "claimed_nbma": "192.168.2.4", - "used": false, - "timeout": false, - "auth": false, - "identity": "-" - }, - { - "interface": "r4-gre0", - "type": "nhs", - "protocol": "176.16.1.3", - "nbma": "192.168.1.3", - "claimed_nbma": "192.168.1.3", - "used": false, - "timeout": true, - "auth": false, - "identity": "" - }, - { - "interface": "r4-gre0", - "type": "nhs", - "protocol": "176.16.1.1", - "nbma": "192.168.1.1", - "claimed_nbma": "192.168.1.1", - "used": false, - "timeout": true, - "auth": false, - "identity": "" - } - ] -} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r4/nhrp_route.json b/tests/topotests/nhrp_redundancy/r4/nhrp_route.json deleted file mode 100644 index 4f1faee7a7..0000000000 --- a/tests/topotests/nhrp_redundancy/r4/nhrp_route.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "176.16.1.1\/32": [ - { - "prefix": "176.16.1.1\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r4-gre0", - "active": true - } - ] - } - ], - "176.16.1.2\/32": [ - { - "prefix": "176.16.1.2\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r4-gre0", - "active": true - } - ] - } - ], - "176.16.1.3\/32": [ - { - "prefix": "176.16.1.3\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r4-gre0", - "active": true - } - ] - } - ] -} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r4/nhrp_route_shortcut.json b/tests/topotests/nhrp_redundancy/r4/nhrp_route_shortcut.json deleted file mode 100644 index 835dfd6b0f..0000000000 --- a/tests/topotests/nhrp_redundancy/r4/nhrp_route_shortcut.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "5.5.5.0\/24": [ - { - "prefix": "5.5.5.0\/24", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "ip": "176.16.1.5", - "afi": "ipv4", - "interfaceName": "r4-gre0", - "active": true - } - ] - } - ], - "176.16.1.1\/32": [ - { - "prefix": "176.16.1.1\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r4-gre0", - "active": true - } - ] - } - ], - "176.16.1.2\/32": [ - { - "prefix": "176.16.1.2\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r4-gre0", - "active": true - } - ] - } - ], - "176.16.1.3\/32": [ - { - "prefix": "176.16.1.3\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r4-gre0", - "active": true - } - ] - } - ], - "176.16.1.5\/32": [ - { - "prefix": "176.16.1.5\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r4-gre0", - "active": true - } - ] - } - ] -} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r4/nhrpd.conf b/tests/topotests/nhrp_redundancy/r4/nhrpd.conf deleted file mode 100644 index 8a52f3386e..0000000000 --- a/tests/topotests/nhrp_redundancy/r4/nhrpd.conf +++ /dev/null @@ -1,11 +0,0 @@ -!debug nhrp all -interface r4-gre0 - ip nhrp holdtime 10 - ip nhrp network-id 42 - ip nhrp registration no-unique - ip nhrp nhs dynamic nbma 192.168.1.1 - 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 -exit diff --git a/tests/topotests/nhrp_redundancy/r4/zebra.conf b/tests/topotests/nhrp_redundancy/r4/zebra.conf deleted file mode 100644 index e4a9a6f80f..0000000000 --- a/tests/topotests/nhrp_redundancy/r4/zebra.conf +++ /dev/null @@ -1,16 +0,0 @@ -ip forwarding -interface r4-eth0 - ip address 192.168.2.4/24 -! -ip route 192.168.1.0/24 192.168.2.6 -interface r4-gre0 - ip address 176.16.1.4/32 - no link-detect - ipv6 nd suppress-ra -! -interface r4-eth1 - ip address 4.4.4.4/24 -! -ip route 0.0.0.0/0 176.16.1.1 50 -ip route 0.0.0.0/0 176.16.1.2 60 -ip route 0.0.0.0/0 176.16.1.3 70 \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r5/nhrp_cache.json b/tests/topotests/nhrp_redundancy/r5/nhrp_cache.json deleted file mode 100644 index bc041c6014..0000000000 --- a/tests/topotests/nhrp_redundancy/r5/nhrp_cache.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "attr": { - "entriesCount": 4 - }, - "table": [ - { - "interface": "r5-gre0", - "type": "nhs", - "protocol": "176.16.1.2", - "nbma": "192.168.1.2", - "claimed_nbma": "192.168.1.2", - "used": false, - "timeout": true, - "auth": false, - "identity": "" - }, - { - "interface": "r5-gre0", - "type": "nhs", - "protocol": "176.16.1.3", - "nbma": "192.168.1.3", - "claimed_nbma": "192.168.1.3", - "used": false, - "timeout": true, - "auth": false, - "identity": "" - }, - { - "interface": "r5-gre0", - "type": "nhs", - "protocol": "176.16.1.1", - "nbma": "192.168.1.1", - "claimed_nbma": "192.168.1.1", - "used": false, - "timeout": true, - "auth": false, - "identity": "" - }, - { - "interface": "r5-gre0", - "type": "local", - "protocol": "176.16.1.5", - "nbma": "192.168.2.5", - "claimed_nbma": "192.168.2.5", - "used": false, - "timeout": false, - "auth": false, - "identity": "-" - } - ] -} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r5/nhrp_route.json b/tests/topotests/nhrp_redundancy/r5/nhrp_route.json deleted file mode 100644 index 1d1c16ffb8..0000000000 --- a/tests/topotests/nhrp_redundancy/r5/nhrp_route.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "176.16.1.1\/32": [ - { - "prefix": "176.16.1.1\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r5-gre0", - "active": true - } - ] - } - ], - "176.16.1.2\/32": [ - { - "prefix": "176.16.1.2\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r5-gre0", - "active": true - } - ] - } - ], - "176.16.1.3\/32": [ - { - "prefix": "176.16.1.3\/32", - "protocol": "nhrp", - "vrfId": 0, - "vrfName": "default", - "selected": true, - "destSelected": true, - "distance": 10, - "metric": 0, - "installed": true, - "internalNextHopNum": 1, - "internalNextHopActiveNum": 1, - "nexthops": [ - { - "fib": true, - "directlyConnected": true, - "interfaceName": "r5-gre0", - "active": true - } - ] - } - ] -} \ No newline at end of file diff --git a/tests/topotests/nhrp_redundancy/r5/nhrpd.conf b/tests/topotests/nhrp_redundancy/r5/nhrpd.conf deleted file mode 100644 index 7241ed592d..0000000000 --- a/tests/topotests/nhrp_redundancy/r5/nhrpd.conf +++ /dev/null @@ -1,11 +0,0 @@ -!debug nhrp all -interface r5-gre0 - ip nhrp holdtime 10 - ip nhrp network-id 42 - ip nhrp nhs dynamic nbma 192.168.1.1 - ip nhrp nhs dynamic nbma 192.168.1.2 - ip nhrp nhs dynamic nbma 192.168.1.3 - ip nhrp registration no-unique - ip nhrp shortcut - tunnel source r5-eth0 -exit diff --git a/tests/topotests/nhrp_redundancy/r5/zebra.conf b/tests/topotests/nhrp_redundancy/r5/zebra.conf deleted file mode 100644 index 9b1e1c0646..0000000000 --- a/tests/topotests/nhrp_redundancy/r5/zebra.conf +++ /dev/null @@ -1,16 +0,0 @@ -ip forwarding -interface r5-eth0 - ip address 192.168.2.5/24 -! -ip route 192.168.1.0/24 192.168.2.6 -interface r5-gre0 - ip address 176.16.1.5/32 - no link-detect - ipv6 nd suppress-ra -! -interface r5-eth1 - ip address 5.5.5.5/24 -! -ip route 0.0.0.0/0 176.16.1.1 50 -ip route 0.0.0.0/0 176.16.1.2 60 -ip route 0.0.0.0/0 176.16.1.3 70 diff --git a/tests/topotests/nhrp_redundancy/r6/zebra.conf b/tests/topotests/nhrp_redundancy/r6/zebra.conf deleted file mode 100644 index 63a37cd5bf..0000000000 --- a/tests/topotests/nhrp_redundancy/r6/zebra.conf +++ /dev/null @@ -1,7 +0,0 @@ -ip forwarding -interface r6-eth0 - ip address 192.168.1.6/24 -! -interface r6-eth1 - ip address 192.168.2.6/24 -exit diff --git a/tests/topotests/nhrp_redundancy/r7/zebra.conf b/tests/topotests/nhrp_redundancy/r7/zebra.conf deleted file mode 100644 index 5747b40956..0000000000 --- a/tests/topotests/nhrp_redundancy/r7/zebra.conf +++ /dev/null @@ -1,4 +0,0 @@ -interface r7-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/router/zebra.conf b/tests/topotests/nhrp_redundancy/router/zebra.conf new file mode 100644 index 0000000000..c0eb19ca40 --- /dev/null +++ b/tests/topotests/nhrp_redundancy/router/zebra.conf @@ -0,0 +1,7 @@ +ip forwarding +interface router-eth0 + ip address 192.168.1.6/24 +! +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 7c90db206e..0d33ff3c74 100644 --- a/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py +++ b/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py @@ -76,30 +76,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(): @@ -122,40 +118,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 @@ -178,7 +171,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)) ) @@ -244,53 +237,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) @@ -299,16 +292,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(): @@ -325,8 +318,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 @@ -344,16 +337,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) @@ -373,20 +366,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)