Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nhrpd, test: fix nhrp_redundancy topotest (backport #16698) #16699

Merged
merged 10 commits into from
Sep 2, 2024
Prev Previous commit
Next Next commit
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 <louis.scalbert@6wind.com>
  • Loading branch information
louis-6wind committed Aug 30, 2024
commit 3f49c5026c3f6ebc1583951f145b77d479abb834
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"table": [
{
"interface": "r4-gre0",
"interface": "nhc1-gre0",
"type": "nhs",
"protocol": "176.16.1.2",
"nbma": "192.168.1.2",
Expand All @@ -15,7 +15,7 @@
"identity": ""
},
{
"interface": "r4-gre0",
"interface": "nhc1-gre0",
"type": "local",
"protocol": "176.16.1.4",
"nbma": "192.168.2.4",
Expand All @@ -26,7 +26,7 @@
"identity": "-"
},
{
"interface": "r4-gre0",
"interface": "nhc1-gre0",
"type": "nhs",
"protocol": "176.16.1.3",
"nbma": "192.168.1.3",
Expand All @@ -37,7 +37,7 @@
"identity": ""
},
{
"interface": "r4-gre0",
"interface": "nhc1-gre0",
"type": "nhs",
"protocol": "176.16.1.1",
"nbma": "192.168.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r5-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
Expand All @@ -39,7 +39,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r5-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
Expand All @@ -62,7 +62,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r5-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"fib": true,
"ip": "176.16.1.5",
"afi": "ipv4",
"interfaceName": "r4-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
Expand All @@ -40,7 +40,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r4-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
Expand All @@ -63,7 +63,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r4-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
Expand All @@ -86,7 +86,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r4-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
Expand All @@ -109,7 +109,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r4-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
!debug nhrp all
interface r4-gre0
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 r4-eth0
tunnel source nhc1-eth0
exit
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"table": [
{
"interface": "r5-gre0",
"interface": "nhc2-gre0",
"type": "nhs",
"protocol": "176.16.1.2",
"nbma": "192.168.1.2",
Expand All @@ -15,7 +15,7 @@
"identity": ""
},
{
"interface": "r5-gre0",
"interface": "nhc2-gre0",
"type": "nhs",
"protocol": "176.16.1.3",
"nbma": "192.168.1.3",
Expand All @@ -26,7 +26,7 @@
"identity": ""
},
{
"interface": "r5-gre0",
"interface": "nhc2-gre0",
"type": "nhs",
"protocol": "176.16.1.1",
"nbma": "192.168.1.1",
Expand All @@ -37,7 +37,7 @@
"identity": ""
},
{
"interface": "r5-gre0",
"interface": "nhc2-gre0",
"type": "local",
"protocol": "176.16.1.5",
"nbma": "192.168.2.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r4-gre0",
"interfaceName": "nhc2-gre0",
"active": true
}
]
Expand All @@ -39,7 +39,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r4-gre0",
"interfaceName": "nhc2-gre0",
"active": true
}
]
Expand All @@ -62,7 +62,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r4-gre0",
"interfaceName": "nhc2-gre0",
"active": true
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
!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
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
tunnel source nhc2-eth0
exit
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"table": [
{
"interface": "r1-gre0",
"interface": "nhs1-gre0",
"type": "dynamic",
"protocol": "176.16.1.4",
"nbma": "192.168.2.4",
Expand All @@ -15,7 +15,7 @@
"identity": ""
},
{
"interface": "r1-gre0",
"interface": "nhs1-gre0",
"type": "local",
"protocol": "176.16.1.1",
"nbma": "192.168.1.1",
Expand All @@ -26,7 +26,7 @@
"identity": "-"
},
{
"interface": "r1-gre0",
"interface": "nhs1-gre0",
"type": "dynamic",
"protocol": "176.16.1.5",
"nbma": "192.168.2.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r3-gre0",
"interfaceName": "nhs1-gre0",
"active": true
}
]
Expand All @@ -39,7 +39,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r3-gre0",
"interfaceName": "nhs1-gre0",
"active": true
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"table": [
{
"interface": "r2-gre0",
"interface": "nhs2-gre0",
"type": "local",
"protocol": "176.16.1.2",
"nbma": "192.168.1.2",
Expand All @@ -15,7 +15,7 @@
"identity": "-"
},
{
"interface": "r2-gre0",
"interface": "nhs2-gre0",
"type": "dynamic",
"protocol": "176.16.1.4",
"nbma": "192.168.2.4",
Expand All @@ -26,7 +26,7 @@
"identity": ""
},
{
"interface": "r2-gre0",
"interface": "nhs2-gre0",
"type": "dynamic",
"protocol": "176.16.1.5",
"nbma": "192.168.2.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r1-gre0",
"interfaceName": "nhs2-gre0",
"active": true
}
]
Expand All @@ -39,7 +39,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r1-gre0",
"interfaceName": "nhs2-gre0",
"active": true
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading