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 <[email protected]>
FRRouting · Aug 30, 2024 · 64ad1dc · 64ad1dc
1 parent 94ba967
commit 64ad1dc
Show file tree

Hide file tree

Showing 29 changed files with 135 additions and 135 deletions.
diff --git a/tests/topotests/nhrp_redundancy/host/zebra.conf b/tests/topotests/nhrp_redundancy/host/zebra.conf
@@ -1,4 +1,4 @@
 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
diff --git a/tests/topotests/nhrp_redundancy/nhc1/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_cache.json
@@ -6,7 +6,7 @@
         {
             "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,
@@ -17,7 +17,7 @@
         {
             "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,
@@ -28,7 +28,7 @@
         {
             "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,
@@ -39,7 +39,7 @@
         {
             "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
@@ -6,7 +6,7 @@
         {
             "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,
@@ -17,7 +17,7 @@
         {
             "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,
@@ -28,7 +28,7 @@
         {
             "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,

diff --git a/tests/topotests/nhrp_redundancy/nhc1/nhrp_route.json b/tests/topotests/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",
@@ -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",
             "vrfId": 0,
             "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",
             "vrfId": 0,
             "vrfName": "default",

diff --git a/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_nhs1_down.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_nhs1_down.json
@@ -1,8 +1,8 @@
 {
-    "176.16.1.1\/32": null,
-    "176.16.1.2\/32": [
+    "172.16.1.1\/32": null,
+    "172.16.1.2\/32": [
         {
-            "prefix": "176.16.1.2\/32",
+            "prefix": "172.16.1.2\/32",
             "protocol": "nhrp",
             "vrfId": 0,
             "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",
             "vrfId": 0,
             "vrfName": "default",

diff --git a/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_shortcut.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_shortcut.json
@@ -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",
             "vrfId": 0,
             "vrfName": "default",
@@ -15,17 +15,17 @@
             "nexthops": [
                 {
                     "fib": true,
-                    "ip": "176.16.1.5",
+                    "ip": "172.16.1.5",
                     "afi": "ipv4",
                     "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",
@@ -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",
             "vrfId": 0,
             "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",
             "vrfId": 0,
             "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",
             "vrfId": 0,
             "vrfName": "default",

diff --git a/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_shortcut_nhs1_down.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_route_shortcut_nhs1_down.json
@@ -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",
             "vrfId": 0,
             "vrfName": "default",
@@ -15,18 +15,18 @@
             "nexthops": [
                 {
                     "fib": true,
-                    "ip": "176.16.1.5",
+                    "ip": "172.16.1.5",
                     "afi": "ipv4",
                     "interfaceName": "nhc1-gre0",
                     "active": true
                 }
             ]
         }
     ],
-    "176.16.1.1\/32": null,
-    "176.16.1.2\/32": [
+    "172.16.1.1\/32": null,
+    "172.16.1.2\/32": [
         {
-            "prefix": "176.16.1.2\/32",
+            "prefix": "172.16.1.2\/32",
             "protocol": "nhrp",
             "vrfId": 0,
             "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",
             "vrfId": 0,
             "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",
             "vrfId": 0,
             "vrfName": "default",

diff --git a/tests/topotests/nhrp_redundancy/nhc1/nhrp_shortcut_present.json b/tests/topotests/nhrp_redundancy/nhc1/nhrp_shortcut_present.json
@@ -2,8 +2,8 @@
   "table":[
     {
       "type":"dynamic",
-      "prefix":"5.5.5.0/24",
-      "via":"176.16.1.5"
+      "prefix":"10.5.5.0/24",
+      "via":"172.16.1.5"
     }
   ]
 }
diff --git a/tests/topotests/nhrp_redundancy/nhc1/zebra.conf b/tests/topotests/nhrp_redundancy/nhc1/zebra.conf
@@ -4,13 +4,13 @@ interface nhc1-eth0
 !
 ip route 192.168.1.0/24 192.168.2.6
 interface nhc1-gre0
- ip address 176.16.1.4/32
+ ip address 172.16.1.4/32
  no link-detect
  ipv6 nd suppress-ra
 !
 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 176.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.1 50
+ip route 0.0.0.0/0 172.16.1.2 60
+ip route 0.0.0.0/0 172.16.1.3 70
diff --git a/tests/topotests/nhrp_redundancy/nhc2/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhc2/nhrp_cache.json
@@ -6,7 +6,7 @@
         {
             "interface": "nhc2-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,
@@ -17,7 +17,7 @@
         {
             "interface": "nhc2-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,
@@ -28,7 +28,7 @@
         {
             "interface": "nhc2-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,
@@ -39,7 +39,7 @@
         {
             "interface": "nhc2-gre0",
             "type": "local",
-            "protocol": "176.16.1.5",
+            "protocol": "172.16.1.5",
             "nbma": "192.168.2.5",
             "claimed_nbma": "192.168.2.5",
             "used": false,

diff --git a/tests/topotests/nhrp_redundancy/nhc2/nhrp_cache_nhs1_down.json b/tests/topotests/nhrp_redundancy/nhc2/nhrp_cache_nhs1_down.json
@@ -6,7 +6,7 @@
         {
             "interface": "nhc2-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,
@@ -17,7 +17,7 @@
         {
             "interface": "nhc2-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,
@@ -28,7 +28,7 @@
         {
             "interface": "nhc2-gre0",
             "type": "local",
-            "protocol": "176.16.1.5",
+            "protocol": "172.16.1.5",
             "nbma": "192.168.2.5",
             "claimed_nbma": "192.168.2.5",
             "used": false,

diff --git a/tests/topotests/nhrp_redundancy/nhc2/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhc2/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",
@@ -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",
             "vrfId": 0,
             "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",
             "vrfId": 0,
             "vrfName": "default",