Merge pull request #16698 from louis-6wind/fix-nhrp-redundancy

nhrpd, test: fix nhrp_redundancy topotest
FRRouting · Sep 1, 2024 · 2931b78 · 2931b78
2 parents 3bf359b + 64ad1dc
commit 2931b78
Show file tree

Hide file tree

Showing 43 changed files with 864 additions and 288 deletions.
diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c
@@ -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");
 	}

diff --git a/tests/topotests/nhrp_redundancy/host/zebra.conf b/tests/topotests/nhrp_redundancy/host/zebra.conf
@@ -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
diff --git a/...otests/nhrp_redundancy/r4/nhrp_cache.json → ...ests/nhrp_redundancy/nhc1/nhrp_cache.json b/...otests/nhrp_redundancy/r4/nhrp_cache.json → ...ests/nhrp_redundancy/nhc1/nhrp_cache.json
@@ -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,
@@ -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,
@@ -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,
@@ -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,

diff --git a/tests/topotests/nhrp_redundancy/nhc1/nhrp_cache_nhs1_down.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_cache_nhs1_down.json
@@ -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": ""
+        }
+    ]
+}
diff --git a/...otests/nhrp_redundancy/r5/nhrp_route.json → ...ests/nhrp_redundancy/nhc1/nhrp_route.json b/...otests/nhrp_redundancy/r5/nhrp_route.json → ...ests/nhrp_redundancy/nhc1/nhrp_route.json
@@ -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",
@@ -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",
@@ -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",
@@ -62,7 +62,7 @@
                 {
                     "fib": true,
                     "directlyConnected": true,
-                    "interfaceName": "r5-gre0",
+                    "interfaceName": "nhc1-gre0",
                     "active": true
                 }
             ]

diff --git a/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_nhs1_down.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_nhs1_down.json
@@ -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
+                }
+            ]
+        }
+    ]
+}
diff --git a/...rp_redundancy/r4/nhrp_route_shortcut.json → ..._redundancy/nhc1/nhrp_route_shortcut.json b/...rp_redundancy/r4/nhrp_route_shortcut.json → ..._redundancy/nhc1/nhrp_route_shortcut.json
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -109,7 +109,7 @@
                 {
                     "fib": true,
                     "directlyConnected": true,
-                    "interfaceName": "r4-gre0",
+                    "interfaceName": "nhc1-gre0",
                     "active": true
                 }
             ]