tests: use private addresses in nhrp_redundancy

Use private addresses in nhrp_redundancy.

> cd tests/topotests/nhrp_redundancy
> git grep 176.16  | cut -f1 -d: | uniq | xargs -L1 sed -e 's|176.16|172.16|g' -i
> git grep 5.5.5.  | cut -f1 -d: | uniq | xargs -L1 sed -e 's|5.5.5.|10.5.5.|g' -i
> git grep 4.4.4  | cut -f1 -d: | uniq | xargs -L1 sed -e 's|4.4.4.|10.4.4.|g' -i

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Louis Scalbert 2024-08-30 14:52:49 +02:00
parent 94ba96747b
commit 64ad1dca42
29 changed files with 135 additions and 135 deletions

View File

@ -1,4 +1,4 @@
interface host-eth0 interface host-eth0
ip address 4.4.4.7/24 ip address 10.4.4.7/24
! !
ip route 0.0.0.0/0 4.4.4.4 ip route 0.0.0.0/0 10.4.4.4

View File

@ -6,7 +6,7 @@
{ {
"interface": "nhc1-gre0", "interface": "nhc1-gre0",
"type": "nhs", "type": "nhs",
"protocol": "176.16.1.2", "protocol": "172.16.1.2",
"nbma": "192.168.1.2", "nbma": "192.168.1.2",
"claimed_nbma": "192.168.1.2", "claimed_nbma": "192.168.1.2",
"used": false, "used": false,
@ -17,7 +17,7 @@
{ {
"interface": "nhc1-gre0", "interface": "nhc1-gre0",
"type": "local", "type": "local",
"protocol": "176.16.1.4", "protocol": "172.16.1.4",
"nbma": "192.168.2.4", "nbma": "192.168.2.4",
"claimed_nbma": "192.168.2.4", "claimed_nbma": "192.168.2.4",
"used": false, "used": false,
@ -28,7 +28,7 @@
{ {
"interface": "nhc1-gre0", "interface": "nhc1-gre0",
"type": "nhs", "type": "nhs",
"protocol": "176.16.1.3", "protocol": "172.16.1.3",
"nbma": "192.168.1.3", "nbma": "192.168.1.3",
"claimed_nbma": "192.168.1.3", "claimed_nbma": "192.168.1.3",
"used": false, "used": false,
@ -39,7 +39,7 @@
{ {
"interface": "nhc1-gre0", "interface": "nhc1-gre0",
"type": "nhs", "type": "nhs",
"protocol": "176.16.1.1", "protocol": "172.16.1.1",
"nbma": "192.168.1.1", "nbma": "192.168.1.1",
"claimed_nbma": "192.168.1.1", "claimed_nbma": "192.168.1.1",
"used": false, "used": false,

View File

@ -6,7 +6,7 @@
{ {
"interface": "nhc1-gre0", "interface": "nhc1-gre0",
"type": "nhs", "type": "nhs",
"protocol": "176.16.1.2", "protocol": "172.16.1.2",
"nbma": "192.168.1.2", "nbma": "192.168.1.2",
"claimed_nbma": "192.168.1.2", "claimed_nbma": "192.168.1.2",
"used": false, "used": false,
@ -17,7 +17,7 @@
{ {
"interface": "nhc1-gre0", "interface": "nhc1-gre0",
"type": "local", "type": "local",
"protocol": "176.16.1.4", "protocol": "172.16.1.4",
"nbma": "192.168.2.4", "nbma": "192.168.2.4",
"claimed_nbma": "192.168.2.4", "claimed_nbma": "192.168.2.4",
"used": false, "used": false,
@ -28,7 +28,7 @@
{ {
"interface": "nhc1-gre0", "interface": "nhc1-gre0",
"type": "nhs", "type": "nhs",
"protocol": "176.16.1.3", "protocol": "172.16.1.3",
"nbma": "192.168.1.3", "nbma": "192.168.1.3",
"claimed_nbma": "192.168.1.3", "claimed_nbma": "192.168.1.3",
"used": false, "used": false,

View File

@ -1,7 +1,7 @@
{ {
"176.16.1.1\/32": [ "172.16.1.1\/32": [
{ {
"prefix": "176.16.1.1\/32", "prefix": "172.16.1.1\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -22,9 +22,9 @@
] ]
} }
], ],
"176.16.1.2\/32": [ "172.16.1.2\/32": [
{ {
"prefix": "176.16.1.2\/32", "prefix": "172.16.1.2\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -45,9 +45,9 @@
] ]
} }
], ],
"176.16.1.3\/32": [ "172.16.1.3\/32": [
{ {
"prefix": "176.16.1.3\/32", "prefix": "172.16.1.3\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",

View File

@ -1,8 +1,8 @@
{ {
"176.16.1.1\/32": null, "172.16.1.1\/32": null,
"176.16.1.2\/32": [ "172.16.1.2\/32": [
{ {
"prefix": "176.16.1.2\/32", "prefix": "172.16.1.2\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -23,9 +23,9 @@
] ]
} }
], ],
"176.16.1.3\/32": [ "172.16.1.3\/32": [
{ {
"prefix": "176.16.1.3\/32", "prefix": "172.16.1.3\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",

View File

@ -1,7 +1,7 @@
{ {
"5.5.5.0\/24": [ "10.5.5.0\/24": [
{ {
"prefix": "5.5.5.0\/24", "prefix": "10.5.5.0\/24",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -15,7 +15,7 @@
"nexthops": [ "nexthops": [
{ {
"fib": true, "fib": true,
"ip": "176.16.1.5", "ip": "172.16.1.5",
"afi": "ipv4", "afi": "ipv4",
"interfaceName": "nhc1-gre0", "interfaceName": "nhc1-gre0",
"active": true "active": true
@ -23,9 +23,9 @@
] ]
} }
], ],
"176.16.1.1\/32": [ "172.16.1.1\/32": [
{ {
"prefix": "176.16.1.1\/32", "prefix": "172.16.1.1\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -46,9 +46,9 @@
] ]
} }
], ],
"176.16.1.2\/32": [ "172.16.1.2\/32": [
{ {
"prefix": "176.16.1.2\/32", "prefix": "172.16.1.2\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -69,9 +69,9 @@
] ]
} }
], ],
"176.16.1.3\/32": [ "172.16.1.3\/32": [
{ {
"prefix": "176.16.1.3\/32", "prefix": "172.16.1.3\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -92,9 +92,9 @@
] ]
} }
], ],
"176.16.1.5\/32": [ "172.16.1.5\/32": [
{ {
"prefix": "176.16.1.5\/32", "prefix": "172.16.1.5\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",

View File

@ -1,7 +1,7 @@
{ {
"5.5.5.0\/24": [ "10.5.5.0\/24": [
{ {
"prefix": "5.5.5.0\/24", "prefix": "10.5.5.0\/24",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -15,7 +15,7 @@
"nexthops": [ "nexthops": [
{ {
"fib": true, "fib": true,
"ip": "176.16.1.5", "ip": "172.16.1.5",
"afi": "ipv4", "afi": "ipv4",
"interfaceName": "nhc1-gre0", "interfaceName": "nhc1-gre0",
"active": true "active": true
@ -23,10 +23,10 @@
] ]
} }
], ],
"176.16.1.1\/32": null, "172.16.1.1\/32": null,
"176.16.1.2\/32": [ "172.16.1.2\/32": [
{ {
"prefix": "176.16.1.2\/32", "prefix": "172.16.1.2\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -47,9 +47,9 @@
] ]
} }
], ],
"176.16.1.3\/32": [ "172.16.1.3\/32": [
{ {
"prefix": "176.16.1.3\/32", "prefix": "172.16.1.3\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -70,9 +70,9 @@
] ]
} }
], ],
"176.16.1.5\/32": [ "172.16.1.5\/32": [
{ {
"prefix": "176.16.1.5\/32", "prefix": "172.16.1.5\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",

View File

@ -2,8 +2,8 @@
"table":[ "table":[
{ {
"type":"dynamic", "type":"dynamic",
"prefix":"5.5.5.0/24", "prefix":"10.5.5.0/24",
"via":"176.16.1.5" "via":"172.16.1.5"
} }
] ]
} }

View File

@ -4,13 +4,13 @@ interface nhc1-eth0
! !
ip route 192.168.1.0/24 192.168.2.6 ip route 192.168.1.0/24 192.168.2.6
interface nhc1-gre0 interface nhc1-gre0
ip address 176.16.1.4/32 ip address 172.16.1.4/32
no link-detect no link-detect
ipv6 nd suppress-ra ipv6 nd suppress-ra
! !
interface nhc1-eth1 interface nhc1-eth1
ip address 4.4.4.4/24 ip address 10.4.4.4/24
! !
ip route 0.0.0.0/0 176.16.1.1 50 ip route 0.0.0.0/0 172.16.1.1 50
ip route 0.0.0.0/0 176.16.1.2 60 ip route 0.0.0.0/0 172.16.1.2 60
ip route 0.0.0.0/0 176.16.1.3 70 ip route 0.0.0.0/0 172.16.1.3 70

View File

@ -6,7 +6,7 @@
{ {
"interface": "nhc2-gre0", "interface": "nhc2-gre0",
"type": "nhs", "type": "nhs",
"protocol": "176.16.1.2", "protocol": "172.16.1.2",
"nbma": "192.168.1.2", "nbma": "192.168.1.2",
"claimed_nbma": "192.168.1.2", "claimed_nbma": "192.168.1.2",
"used": false, "used": false,
@ -17,7 +17,7 @@
{ {
"interface": "nhc2-gre0", "interface": "nhc2-gre0",
"type": "nhs", "type": "nhs",
"protocol": "176.16.1.3", "protocol": "172.16.1.3",
"nbma": "192.168.1.3", "nbma": "192.168.1.3",
"claimed_nbma": "192.168.1.3", "claimed_nbma": "192.168.1.3",
"used": false, "used": false,
@ -28,7 +28,7 @@
{ {
"interface": "nhc2-gre0", "interface": "nhc2-gre0",
"type": "nhs", "type": "nhs",
"protocol": "176.16.1.1", "protocol": "172.16.1.1",
"nbma": "192.168.1.1", "nbma": "192.168.1.1",
"claimed_nbma": "192.168.1.1", "claimed_nbma": "192.168.1.1",
"used": false, "used": false,
@ -39,7 +39,7 @@
{ {
"interface": "nhc2-gre0", "interface": "nhc2-gre0",
"type": "local", "type": "local",
"protocol": "176.16.1.5", "protocol": "172.16.1.5",
"nbma": "192.168.2.5", "nbma": "192.168.2.5",
"claimed_nbma": "192.168.2.5", "claimed_nbma": "192.168.2.5",
"used": false, "used": false,

View File

@ -6,7 +6,7 @@
{ {
"interface": "nhc2-gre0", "interface": "nhc2-gre0",
"type": "nhs", "type": "nhs",
"protocol": "176.16.1.2", "protocol": "172.16.1.2",
"nbma": "192.168.1.2", "nbma": "192.168.1.2",
"claimed_nbma": "192.168.1.2", "claimed_nbma": "192.168.1.2",
"used": false, "used": false,
@ -17,7 +17,7 @@
{ {
"interface": "nhc2-gre0", "interface": "nhc2-gre0",
"type": "nhs", "type": "nhs",
"protocol": "176.16.1.3", "protocol": "172.16.1.3",
"nbma": "192.168.1.3", "nbma": "192.168.1.3",
"claimed_nbma": "192.168.1.3", "claimed_nbma": "192.168.1.3",
"used": false, "used": false,
@ -28,7 +28,7 @@
{ {
"interface": "nhc2-gre0", "interface": "nhc2-gre0",
"type": "local", "type": "local",
"protocol": "176.16.1.5", "protocol": "172.16.1.5",
"nbma": "192.168.2.5", "nbma": "192.168.2.5",
"claimed_nbma": "192.168.2.5", "claimed_nbma": "192.168.2.5",
"used": false, "used": false,

View File

@ -1,7 +1,7 @@
{ {
"176.16.1.1\/32": [ "172.16.1.1\/32": [
{ {
"prefix": "176.16.1.1\/32", "prefix": "172.16.1.1\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -22,9 +22,9 @@
] ]
} }
], ],
"176.16.1.2\/32": [ "172.16.1.2\/32": [
{ {
"prefix": "176.16.1.2\/32", "prefix": "172.16.1.2\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -45,9 +45,9 @@
] ]
} }
], ],
"176.16.1.3\/32": [ "172.16.1.3\/32": [
{ {
"prefix": "176.16.1.3\/32", "prefix": "172.16.1.3\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",

View File

@ -1,8 +1,8 @@
{ {
"176.16.1.1\/32": null, "172.16.1.1\/32": null,
"176.16.1.2\/32": [ "172.16.1.2\/32": [
{ {
"prefix": "176.16.1.2\/32", "prefix": "172.16.1.2\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -23,9 +23,9 @@
] ]
} }
], ],
"176.16.1.3\/32": [ "172.16.1.3\/32": [
{ {
"prefix": "176.16.1.3\/32", "prefix": "172.16.1.3\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",

View File

@ -4,13 +4,13 @@ interface nhc2-eth0
! !
ip route 192.168.1.0/24 192.168.2.6 ip route 192.168.1.0/24 192.168.2.6
interface nhc2-gre0 interface nhc2-gre0
ip address 176.16.1.5/32 ip address 172.16.1.5/32
no link-detect no link-detect
ipv6 nd suppress-ra ipv6 nd suppress-ra
! !
interface nhc2-eth1 interface nhc2-eth1
ip address 5.5.5.5/24 ip address 10.5.5.5/24
! !
ip route 0.0.0.0/0 176.16.1.1 50 ip route 0.0.0.0/0 172.16.1.1 50
ip route 0.0.0.0/0 176.16.1.2 60 ip route 0.0.0.0/0 172.16.1.2 60
ip route 0.0.0.0/0 176.16.1.3 70 ip route 0.0.0.0/0 172.16.1.3 70

View File

@ -6,7 +6,7 @@
{ {
"interface": "nhs1-gre0", "interface": "nhs1-gre0",
"type": "dynamic", "type": "dynamic",
"protocol": "176.16.1.4", "protocol": "172.16.1.4",
"nbma": "192.168.2.4", "nbma": "192.168.2.4",
"claimed_nbma": "192.168.2.4", "claimed_nbma": "192.168.2.4",
"used": false, "used": false,
@ -17,7 +17,7 @@
{ {
"interface": "nhs1-gre0", "interface": "nhs1-gre0",
"type": "local", "type": "local",
"protocol": "176.16.1.1", "protocol": "172.16.1.1",
"nbma": "192.168.1.1", "nbma": "192.168.1.1",
"claimed_nbma": "192.168.1.1", "claimed_nbma": "192.168.1.1",
"used": false, "used": false,
@ -28,7 +28,7 @@
{ {
"interface": "nhs1-gre0", "interface": "nhs1-gre0",
"type": "dynamic", "type": "dynamic",
"protocol": "176.16.1.5", "protocol": "172.16.1.5",
"nbma": "192.168.2.5", "nbma": "192.168.2.5",
"claimed_nbma": "192.168.2.5", "claimed_nbma": "192.168.2.5",
"used": false, "used": false,

View File

@ -1,7 +1,7 @@
{ {
"176.16.1.4\/32": [ "172.16.1.4\/32": [
{ {
"prefix": "176.16.1.4\/32", "prefix": "172.16.1.4\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -22,9 +22,9 @@
] ]
} }
], ],
"176.16.1.5\/32": [ "172.16.1.5\/32": [
{ {
"prefix": "176.16.1.5\/32", "prefix": "172.16.1.5\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",

View File

@ -4,9 +4,9 @@ interface nhs1-eth0
! !
ip route 192.168.2.0/24 192.168.1.6 ip route 192.168.2.0/24 192.168.1.6
interface nhs1-gre0 interface nhs1-gre0
ip address 176.16.1.1/32 ip address 172.16.1.1/32
no link-detect no link-detect
ipv6 nd suppress-ra ipv6 nd suppress-ra
! !
ip route 4.4.4.0/24 176.16.1.4 ip route 10.4.4.0/24 172.16.1.4
ip route 5.5.5.0/24 176.16.1.5 ip route 10.5.5.0/24 172.16.1.5

View File

@ -6,7 +6,7 @@
{ {
"interface": "nhs2-gre0", "interface": "nhs2-gre0",
"type": "local", "type": "local",
"protocol": "176.16.1.2", "protocol": "172.16.1.2",
"nbma": "192.168.1.2", "nbma": "192.168.1.2",
"claimed_nbma": "192.168.1.2", "claimed_nbma": "192.168.1.2",
"used": false, "used": false,
@ -17,7 +17,7 @@
{ {
"interface": "nhs2-gre0", "interface": "nhs2-gre0",
"type": "dynamic", "type": "dynamic",
"protocol": "176.16.1.4", "protocol": "172.16.1.4",
"nbma": "192.168.2.4", "nbma": "192.168.2.4",
"claimed_nbma": "192.168.2.4", "claimed_nbma": "192.168.2.4",
"used": false, "used": false,
@ -28,7 +28,7 @@
{ {
"interface": "nhs2-gre0", "interface": "nhs2-gre0",
"type": "dynamic", "type": "dynamic",
"protocol": "176.16.1.5", "protocol": "172.16.1.5",
"nbma": "192.168.2.5", "nbma": "192.168.2.5",
"claimed_nbma": "192.168.2.5", "claimed_nbma": "192.168.2.5",
"used": false, "used": false,

View File

@ -6,7 +6,7 @@
{ {
"interface": "nhs2-gre0", "interface": "nhs2-gre0",
"type": "local", "type": "local",
"protocol": "176.16.1.2", "protocol": "172.16.1.2",
"nbma": "192.168.1.2", "nbma": "192.168.1.2",
"claimed_nbma": "192.168.1.2", "claimed_nbma": "192.168.1.2",
"used": false, "used": false,
@ -17,7 +17,7 @@
{ {
"interface": "nhs2-gre0", "interface": "nhs2-gre0",
"type": "dynamic", "type": "dynamic",
"protocol": "176.16.1.4", "protocol": "172.16.1.4",
"nbma": "192.168.2.4", "nbma": "192.168.2.4",
"claimed_nbma": "192.168.2.4", "claimed_nbma": "192.168.2.4",
"used": false, "used": false,
@ -28,7 +28,7 @@
{ {
"interface": "nhs2-gre0", "interface": "nhs2-gre0",
"type": "dynamic", "type": "dynamic",
"protocol": "176.16.1.5", "protocol": "172.16.1.5",
"nbma": "192.168.2.5", "nbma": "192.168.2.5",
"claimed_nbma": "192.168.2.5", "claimed_nbma": "192.168.2.5",
"used": false, "used": false,

View File

@ -1,7 +1,7 @@
{ {
"176.16.1.4\/32": [ "172.16.1.4\/32": [
{ {
"prefix": "176.16.1.4\/32", "prefix": "172.16.1.4\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -22,9 +22,9 @@
] ]
} }
], ],
"176.16.1.5\/32": [ "172.16.1.5\/32": [
{ {
"prefix": "176.16.1.5\/32", "prefix": "172.16.1.5\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",

View File

@ -1,7 +1,7 @@
{ {
"176.16.1.4\/32": [ "172.16.1.4\/32": [
{ {
"prefix": "176.16.1.4\/32", "prefix": "172.16.1.4\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -22,9 +22,9 @@
] ]
} }
], ],
"176.16.1.5\/32": [ "172.16.1.5\/32": [
{ {
"prefix": "176.16.1.5\/32", "prefix": "172.16.1.5\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",

View File

@ -4,9 +4,9 @@ interface nhs2-eth0
! !
ip route 192.168.2.0/24 192.168.1.6 ip route 192.168.2.0/24 192.168.1.6
interface nhs2-gre0 interface nhs2-gre0
ip address 176.16.1.2/32 ip address 172.16.1.2/32
no link-detect no link-detect
ipv6 nd suppress-ra ipv6 nd suppress-ra
! !
ip route 4.4.4.0/24 176.16.1.4 ip route 10.4.4.0/24 172.16.1.4
ip route 5.5.5.0/24 176.16.1.5 ip route 10.5.5.0/24 172.16.1.5

View File

@ -6,7 +6,7 @@
{ {
"interface": "nhs3-gre0", "interface": "nhs3-gre0",
"type": "dynamic", "type": "dynamic",
"protocol": "176.16.1.4", "protocol": "172.16.1.4",
"nbma": "192.168.2.4", "nbma": "192.168.2.4",
"claimed_nbma": "192.168.2.4", "claimed_nbma": "192.168.2.4",
"used": false, "used": false,
@ -17,7 +17,7 @@
{ {
"interface": "nhs3-gre0", "interface": "nhs3-gre0",
"type": "local", "type": "local",
"protocol": "176.16.1.3", "protocol": "172.16.1.3",
"nbma": "192.168.1.3", "nbma": "192.168.1.3",
"claimed_nbma": "192.168.1.3", "claimed_nbma": "192.168.1.3",
"used": false, "used": false,
@ -28,7 +28,7 @@
{ {
"interface": "nhs3-gre0", "interface": "nhs3-gre0",
"type": "dynamic", "type": "dynamic",
"protocol": "176.16.1.5", "protocol": "172.16.1.5",
"nbma": "192.168.2.5", "nbma": "192.168.2.5",
"claimed_nbma": "192.168.2.5", "claimed_nbma": "192.168.2.5",
"used": false, "used": false,

View File

@ -6,7 +6,7 @@
{ {
"interface": "nhs3-gre0", "interface": "nhs3-gre0",
"type": "dynamic", "type": "dynamic",
"protocol": "176.16.1.4", "protocol": "172.16.1.4",
"nbma": "192.168.2.4", "nbma": "192.168.2.4",
"claimed_nbma": "192.168.2.4", "claimed_nbma": "192.168.2.4",
"used": false, "used": false,
@ -17,7 +17,7 @@
{ {
"interface": "nhs3-gre0", "interface": "nhs3-gre0",
"type": "local", "type": "local",
"protocol": "176.16.1.3", "protocol": "172.16.1.3",
"nbma": "192.168.1.3", "nbma": "192.168.1.3",
"claimed_nbma": "192.168.1.3", "claimed_nbma": "192.168.1.3",
"used": false, "used": false,
@ -28,7 +28,7 @@
{ {
"interface": "nhs3-gre0", "interface": "nhs3-gre0",
"type": "dynamic", "type": "dynamic",
"protocol": "176.16.1.5", "protocol": "172.16.1.5",
"nbma": "192.168.2.5", "nbma": "192.168.2.5",
"claimed_nbma": "192.168.2.5", "claimed_nbma": "192.168.2.5",
"used": false, "used": false,

View File

@ -1,7 +1,7 @@
{ {
"176.16.1.4\/32": [ "172.16.1.4\/32": [
{ {
"prefix": "176.16.1.4\/32", "prefix": "172.16.1.4\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -22,9 +22,9 @@
] ]
} }
], ],
"176.16.1.5\/32": [ "172.16.1.5\/32": [
{ {
"prefix": "176.16.1.5\/32", "prefix": "172.16.1.5\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",

View File

@ -1,7 +1,7 @@
{ {
"176.16.1.4\/32": [ "172.16.1.4\/32": [
{ {
"prefix": "176.16.1.4\/32", "prefix": "172.16.1.4\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",
@ -22,9 +22,9 @@
] ]
} }
], ],
"176.16.1.5\/32": [ "172.16.1.5\/32": [
{ {
"prefix": "176.16.1.5\/32", "prefix": "172.16.1.5\/32",
"protocol": "nhrp", "protocol": "nhrp",
"vrfId": 0, "vrfId": 0,
"vrfName": "default", "vrfName": "default",

View File

@ -4,9 +4,9 @@ interface nhs3-eth0
! !
ip route 192.168.2.0/24 192.168.1.6 ip route 192.168.2.0/24 192.168.1.6
interface nhs3-gre0 interface nhs3-gre0
ip address 176.16.1.3/32 ip address 172.16.1.3/32
no link-detect no link-detect
ipv6 nd suppress-ra ipv6 nd suppress-ra
! !
ip route 4.4.4.0/24 176.16.1.4 ip route 10.4.4.0/24 172.16.1.4
ip route 5.5.5.0/24 176.16.1.5 ip route 10.5.5.0/24 172.16.1.5

View File

@ -74,13 +74,13 @@ graph template {
]; ];
sw3 [ sw3 [
shape=oval, shape=oval,
label="sw3\n4.4.4.0/24", label="sw3\n10.4.4.0/24",
fillcolor="#d0e0d0", fillcolor="#d0e0d0",
style=filled, style=filled,
]; ];
sw4 [ sw4 [
shape=oval, shape=oval,
label="sw4\n5.5.5.0/24", label="sw4\n10.5.5.0/24",
fillcolor="#d0e0d0", fillcolor="#d0e0d0",
style=filled, style=filled,
]; ];

View File

@ -56,11 +56,11 @@ TOPOLOGY = """
+------------+ | +-------+----+ +------+-----+ | +------------+ | +-------+----+ +------+-----+ |
| | | | | | | | | | | | | | | |
| | +--------+ | | | | | | +--------+ | | | |
| Host |.7 | | NHC 1 | | NHC 2 +-----+5.5.5.0/24 | Host |.7 | | NHC 1 | | NHC 2 +-----+10.5.5.0/24
| +---------+ | | | | | | +---------+ | | | | |
+------------+ | +------------+ +------------+ | +------------+ | +------------+ +------------+ |
| | | |
4.4.4.0/24 10.4.4.0/24
""" """
# Save the Current Working Directory to find configuration files. # Save the Current Working Directory to find configuration files.
@ -237,8 +237,8 @@ def test_protocols_convergence():
# Test connectivity from 1 NHRP server to all clients # Test connectivity from 1 NHRP server to all clients
nhs1 = tgen.gears["nhs1"] nhs1 = tgen.gears["nhs1"]
logger.info("Check Ping IPv4 from nhs1 to nhc1 = 176.16.1.4)") logger.info("Check Ping IPv4 from nhs1 to nhc1 = 172.16.1.4)")
output = nhs1.run("ping 176.16.1.4 -f -c 1000") output = nhs1.run("ping 172.16.1.4 -f -c 1000")
logger.info(output) logger.info(output)
if "1000 packets transmitted, 1000 received" not in output: if "1000 packets transmitted, 1000 received" not in output:
assertmsg = "expected ping IPv4 from nhs1 to nhc1 should be ok" assertmsg = "expected ping IPv4 from nhs1 to nhc1 should be ok"
@ -246,8 +246,8 @@ def test_protocols_convergence():
else: else:
logger.info("Check Ping IPv4 from nhs1 to nhc1 OK") logger.info("Check Ping IPv4 from nhs1 to nhc1 OK")
logger.info("Check Ping IPv4 from nhs1 to nhc2 = 176.16.1.5)") logger.info("Check Ping IPv4 from nhs1 to nhc2 = 172.16.1.5)")
output = nhs1.run("ping 176.16.1.5 -f -c 1000") output = nhs1.run("ping 172.16.1.5 -f -c 1000")
logger.info(output) logger.info(output)
if "1000 packets transmitted, 1000 received" not in output: if "1000 packets transmitted, 1000 received" not in output:
assertmsg = "expected ping IPv4 from nhs1 to nhc2 should be ok" assertmsg = "expected ping IPv4 from nhs1 to nhc2 should be ok"
@ -257,8 +257,8 @@ def test_protocols_convergence():
# Test connectivity from 1 NHRP client to all servers # Test connectivity from 1 NHRP client to all servers
nhc1 = tgen.gears["nhc1"] nhc1 = tgen.gears["nhc1"]
logger.info("Check Ping IPv4 from nhc1 to nhs1 = 176.16.1.1)") logger.info("Check Ping IPv4 from nhc1 to nhs1 = 172.16.1.1)")
output = nhc1.run("ping 176.16.1.1 -f -c 1000") output = nhc1.run("ping 172.16.1.1 -f -c 1000")
logger.info(output) logger.info(output)
if "1000 packets transmitted, 1000 received" not in output: if "1000 packets transmitted, 1000 received" not in output:
assertmsg = "expected ping IPv4 from nhc1 to nhs1 should be ok" assertmsg = "expected ping IPv4 from nhc1 to nhs1 should be ok"
@ -266,8 +266,8 @@ def test_protocols_convergence():
else: else:
logger.info("Check Ping IPv4 from nhc1 to nhs1 OK") logger.info("Check Ping IPv4 from nhc1 to nhs1 OK")
logger.info("Check Ping IPv4 from nhc1 to nhs2 = 176.16.1.2)") logger.info("Check Ping IPv4 from nhc1 to nhs2 = 172.16.1.2)")
output = nhc1.run("ping 176.16.1.2 -f -c 1000") output = nhc1.run("ping 172.16.1.2 -f -c 1000")
logger.info(output) logger.info(output)
if "1000 packets transmitted, 1000 received" not in output: if "1000 packets transmitted, 1000 received" not in output:
assertmsg = "expected ping IPv4 from nhc1 to nhs2 should be ok" assertmsg = "expected ping IPv4 from nhc1 to nhs2 should be ok"
@ -275,8 +275,8 @@ def test_protocols_convergence():
else: else:
logger.info("Check Ping IPv4 from nhc1 to nhs2 OK") logger.info("Check Ping IPv4 from nhc1 to nhs2 OK")
logger.info("Check Ping IPv4 from nhc1 to nhs3 = 176.16.1.3)") logger.info("Check Ping IPv4 from nhc1 to nhs3 = 172.16.1.3)")
output = nhc1.run("ping 176.16.1.3 -f -c 1000") output = nhc1.run("ping 172.16.1.3 -f -c 1000")
logger.info(output) logger.info(output)
if "1000 packets transmitted, 1000 received" not in output: if "1000 packets transmitted, 1000 received" not in output:
assertmsg = "expected ping IPv4 from nhc1 to nhs3 should be ok" assertmsg = "expected ping IPv4 from nhc1 to nhs3 should be ok"
@ -292,9 +292,9 @@ def verify_shortcut_path():
""" """
tgen = get_topogen() tgen = get_topogen()
host = tgen.gears["host"] host = tgen.gears["host"]
logger.info("Check Ping IPv4 from host to nhc2 = 5.5.5.5") logger.info("Check Ping IPv4 from host to nhc2 = 10.5.5.5")
output = host.run("ping 5.5.5.5 -f -c 1000") output = host.run("ping 10.5.5.5 -f -c 1000")
logger.info(output) logger.info(output)
if "1000 packets transmitted, 1000 received" not in output: if "1000 packets transmitted, 1000 received" not in output:
assertmsg = "expected ping IPv4 from host to nhc2 should be ok" assertmsg = "expected ping IPv4 from host to nhc2 should be ok"
@ -336,9 +336,9 @@ def test_redundancy_shortcut():
# Initiate shortcut by pinging between clients # Initiate shortcut by pinging between clients
host = tgen.gears["host"] host = tgen.gears["host"]
logger.info("Check Ping IPv4 from host to nhc2 via shortcut = 5.5.5.5") logger.info("Check Ping IPv4 from host to nhc2 via shortcut = 10.5.5.5")
output = host.run("ping 5.5.5.5 -f -c 1000") output = host.run("ping 10.5.5.5 -f -c 1000")
logger.info(output) logger.info(output)
if "1000 packets transmitted, 1000 received" not in output: if "1000 packets transmitted, 1000 received" not in output:
assertmsg = "expected ping IPv4 from host to nhc2 via shortcut should be ok" assertmsg = "expected ping IPv4 from host to nhc2 via shortcut should be ok"
@ -452,9 +452,9 @@ def test_redundancy_shortcut_backup():
# Verify shortcut is still active # Verify shortcut is still active
host = tgen.gears["host"] host = tgen.gears["host"]
logger.info("Check Ping IPv4 from host to nhc2 via shortcut = 5.5.5.5") logger.info("Check Ping IPv4 from host to nhc2 via shortcut = 10.5.5.5")
output = host.run("ping 5.5.5.5 -f -c 1000") output = host.run("ping 10.5.5.5 -f -c 1000")
logger.info(output) logger.info(output)
if "1000 packets transmitted, 1000 received" not in output: if "1000 packets transmitted, 1000 received" not in output:
assertmsg = "expected ping IPv4 from host to nhc2 via shortcut should be ok" assertmsg = "expected ping IPv4 from host to nhc2 via shortcut should be ok"