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.

Sign up for GitHub

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

Jump to bottom

nhrpd, test: fix nhrp_redundancy topotest #16698

Merged
merged 11 commits into from
Sep 1, 2024
Merged

nhrpd, test: fix nhrp_redundancy topotest #16698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
43cc850
tests: fix prefix length in nhrp_redundancy
louis-6wind Aug 30, 2024
f04191f
tests: apply black nhrp_redundancy
louis-6wind Aug 30, 2024
5f058cd
tests: rename routers in nhrp_redundancy
louis-6wind Aug 30, 2024
76d8402
tests: rename router variables in nhrp_redundancy
louis-6wind Aug 30, 2024
7a082e0
tests: simplify nhrp_redundancy convergence
louis-6wind Aug 30, 2024
432b60d
tests: fix nhc1 route check after nhs1 down
louis-6wind Aug 30, 2024
2933d7f
tests: fix nhs1 down check in nhrp_redundancy
louis-6wind Aug 30, 2024
25e1081
tests: fix iptables command in nhrp_redundancy
louis-6wind Aug 30, 2024
cdd9dee
nhrpd: fix show nhrp shortcut json
louis-6wind Aug 30, 2024
94ba967
tests: check show ip nhrp shorcut in nhrp_redundancy
louis-6wind Aug 30, 2024
64ad1dc
tests: use private addresses in nhrp_redundancy
louis-6wind Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nhrpd/nhrp_vty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@ static void show_ip_nhrp_shortcut(struct nhrp_shortcut *s, void *pctx)
char buf1[PREFIX_STRLEN], buf2[SU_ADDRSTRLEN];
struct json_object *json = NULL;

if (!ctx->count) {
if (!ctx->count && !ctx->json) {
vty_out(vty, "%-8s %-24s %-24s %s\n", "Type", "Prefix", "Via",
"Identity");
}
Expand Down
4 changes: 4 additions & 0 deletions tests/topotests/nhrp_redundancy/host/zebra.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
interface host-eth0
ip address 10.4.4.7/24
!
ip route 0.0.0.0/0 10.4.4.4
16 changes: 8 additions & 8 deletions ...otests/nhrp_redundancy/r4/nhrp_cache.json → ...ests/nhrp_redundancy/nhc1/nhrp_cache.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
},
"table": [
{
"interface": "r4-gre0",
"interface": "nhc1-gre0",
"type": "nhs",
"protocol": "176.16.1.2",
"protocol": "172.16.1.2",
"nbma": "192.168.1.2",
"claimed_nbma": "192.168.1.2",
"used": false,
Expand All @@ -15,9 +15,9 @@
"identity": ""
},
{
"interface": "r4-gre0",
"interface": "nhc1-gre0",
"type": "local",
"protocol": "176.16.1.4",
"protocol": "172.16.1.4",
"nbma": "192.168.2.4",
"claimed_nbma": "192.168.2.4",
"used": false,
Expand All @@ -26,9 +26,9 @@
"identity": "-"
},
{
"interface": "r4-gre0",
"interface": "nhc1-gre0",
"type": "nhs",
"protocol": "176.16.1.3",
"protocol": "172.16.1.3",
"nbma": "192.168.1.3",
"claimed_nbma": "192.168.1.3",
"used": false,
Expand All @@ -37,9 +37,9 @@
"identity": ""
},
{
"interface": "r4-gre0",
"interface": "nhc1-gre0",
"type": "nhs",
"protocol": "176.16.1.1",
"protocol": "172.16.1.1",
"nbma": "192.168.1.1",
"claimed_nbma": "192.168.1.1",
"used": false,
Expand Down
40 changes: 40 additions & 0 deletions tests/topotests/nhrp_redundancy/nhc1/nhrp_cache_nhs1_down.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"attr": {
"entriesCount": 3
},
"table": [
{
"interface": "nhc1-gre0",
"type": "nhs",
"protocol": "172.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": "172.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": "172.16.1.3",
"nbma": "192.168.1.3",
"claimed_nbma": "192.168.1.3",
"used": false,
"timeout": true,
"auth": false,
"identity": ""
}
]
}
18 changes: 9 additions & 9 deletions ...otests/nhrp_redundancy/r5/nhrp_route.json → ...ests/nhrp_redundancy/nhc1/nhrp_route.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
"vrfId": 0,
"vrfName": "default",
Expand All @@ -16,15 +16,15 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r5-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
}
],
"176.16.1.2\/32": [
"172.16.1.2\/32": [
{
"prefix": "176.16.1.2\/32",
"prefix": "172.16.1.2\/32",
"protocol": "nhrp",
"vrfId": 0,
"vrfName": "default",
Expand All @@ -39,15 +39,15 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r5-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
}
],
"176.16.1.3\/32": [
"172.16.1.3\/32": [
{
"prefix": "176.16.1.3\/32",
"prefix": "172.16.1.3\/32",
"protocol": "nhrp",
"vrfId": 0,
"vrfName": "default",
Expand All @@ -62,7 +62,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r5-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
Expand Down
49 changes: 49 additions & 0 deletions tests/topotests/nhrp_redundancy/nhc1/nhrp_route_nhs1_down.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"172.16.1.1\/32": null,
"172.16.1.2\/32": [
{
"prefix": "172.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
}
]
}
],
"172.16.1.3\/32": [
{
"prefix": "172.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
}
]
}
]
}
32 changes: 16 additions & 16 deletions ...rp_redundancy/r4/nhrp_route_shortcut.json → ..._redundancy/nhc1/nhrp_route_shortcut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"5.5.5.5\/32": [
"10.5.5.0\/24": [
{
"prefix": "5.5.5.5\/32",
"prefix": "10.5.5.0\/24",
"protocol": "nhrp",
"vrfId": 0,
"vrfName": "default",
Expand All @@ -15,17 +15,17 @@
"nexthops": [
{
"fib": true,
"ip": "176.16.1.5",
"ip": "172.16.1.5",
"afi": "ipv4",
"interfaceName": "r4-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
}
],
"176.16.1.1\/32": [
"172.16.1.1\/32": [
{
"prefix": "176.16.1.1\/32",
"prefix": "172.16.1.1\/32",
"protocol": "nhrp",
"vrfId": 0,
"vrfName": "default",
Expand All @@ -40,15 +40,15 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r4-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
}
],
"176.16.1.2\/32": [
"172.16.1.2\/32": [
{
"prefix": "176.16.1.2\/32",
"prefix": "172.16.1.2\/32",
"protocol": "nhrp",
"vrfId": 0,
"vrfName": "default",
Expand All @@ -63,15 +63,15 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r4-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
}
],
"176.16.1.3\/32": [
"172.16.1.3\/32": [
{
"prefix": "176.16.1.3\/32",
"prefix": "172.16.1.3\/32",
"protocol": "nhrp",
"vrfId": 0,
"vrfName": "default",
Expand All @@ -86,15 +86,15 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r4-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
}
],
"176.16.1.5\/32": [
"172.16.1.5\/32": [
{
"prefix": "176.16.1.5\/32",
"prefix": "172.16.1.5\/32",
"protocol": "nhrp",
"vrfId": 0,
"vrfName": "default",
Expand All @@ -109,7 +109,7 @@
{
"fib": true,
"directlyConnected": true,
"interfaceName": "r4-gre0",
"interfaceName": "nhc1-gre0",
"active": true
}
]
Expand Down
Loading
Loading