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>

diff --git a/tests/topotests/nhrp_redundancy/host/zebra.conf b/tests/topotests/nhrp_redundancy/host/zebra.conf
index 58c8cb2c4b263179332dd02e857e4bbe9b782d0d..8bb7da0ad658266217e0256ddbc9c6fa3cca77b6 100644 (file)
--- 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
index 5d2cf6fb5e1856b2ab799262570d82e5cb0d6c24..9e8a5c999d04d0a0dd6f3515a41fb44178ff32f9 100644 (file)
--- 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
index 7ceebc321e2609f2db370a3700e478a931c7e06e..5b91f3bcfbea950dcfee0268c842f4e004f4f03d 100644 (file)
--- 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
index 2af62dd4d6f6c1e038edecb924d1d5160c2f67ab..083675651f76fc57618a013bb4e642a455d2827d 100644 (file)
--- 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
index a8fd1934d60e91dd2dd73a88015d47b85669365b..bfb468b0fbd79b7016942c12623b36627f22fd2b 100644 (file)
--- 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
index 2111e2758300eacc940c212811337a6c36cf62f3..3a91f1baaaaf41a42e02ca2c240580006622fbad 100644 (file)
--- 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,7 +15,7 @@
             "nexthops": [
                 {
                     "fib": true,
-                    "ip": "176.16.1.5",
+                    "ip": "172.16.1.5",
                     "afi": "ipv4",
                     "interfaceName": "nhc1-gre0",
                     "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",
             "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
index 38e5000324bf0f46d7245f612fd355af1e73efbf..0f38feb6a89ad87da1911874f2bf39457e6c403a 100644 (file)
--- 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,7 +15,7 @@
             "nexthops": [
                 {
                     "fib": true,
-                    "ip": "176.16.1.5",
+                    "ip": "172.16.1.5",
                     "afi": "ipv4",
                     "interfaceName": "nhc1-gre0",
                     "active": true
@@ -23,10 +23,10 @@
             ]
         }
     ],
-    "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
index 40a7086b1c60483dfa39038851e6468a24068ce7..4547c59c88f561022eff55c2c971c8c5a4e5aef2 100644 (file)
--- 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
index db25964ee4a296bf5584f6e1509d049fddfb25a6..07d9175418ad7bcbfaf1654c42a9d872bf38044c 100644 (file)
--- 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
\ No newline at end of file
+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
\ No newline at end of file

diff --git a/tests/topotests/nhrp_redundancy/nhc2/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhc2/nhrp_cache.json
index fa0f07aacfdd8e6f6598181cf32a9ee947c3bc01..8ee02a7cbf4f92335d687cc4ef4a304cb2f87a2e 100644 (file)
--- 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
index a76c85231de601cb13a935e585cb30ce845201b1..bb1c4837186dc17af79baf880335d1c74ba543ed 100644 (file)
--- 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
index a8f61861bc4e3a758f2bc98dcb86a120f3bff03d..a69c0caec3ceb471054c61115c3a1c0d4c9cb877 100644 (file)
--- 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",

diff --git a/tests/topotests/nhrp_redundancy/nhc2/nhrp_route_nhs1_down.json b/tests/topotests/nhrp_redundancy/nhc2/nhrp_route_nhs1_down.json
index fd7c4c8f39c649af29776578d2a47af5589fe54b..e2dd9dde2398c7d86a98ada5d6c89f5d357a4fc7 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhc2/nhrp_route_nhs1_down.json
+++ b/tests/topotests/nhrp_redundancy/nhc2/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/nhc2/zebra.conf b/tests/topotests/nhrp_redundancy/nhc2/zebra.conf
index be22fc0ae568d365270a26e40c91ad25d5a1332a..30ea6d4d1d5614c2e6687456b5bd8bbbce8b5978 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhc2/zebra.conf
+++ b/tests/topotests/nhrp_redundancy/nhc2/zebra.conf
@@ -4,13 +4,13 @@ interface nhc2-eth0
 !
 ip route 192.168.1.0/24 192.168.2.6
 interface nhc2-gre0
- ip address 176.16.1.5/32
+ ip address 172.16.1.5/32
  no link-detect
  ipv6 nd suppress-ra
 !
 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 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/nhs1/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhs1/nhrp_cache.json
index 920644e67d53178634c402acc34777008a6a32fb..11d41d1b83bccd0b1528ce0fc3e767f1b4a245b1 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs1/nhrp_cache.json
+++ b/tests/topotests/nhrp_redundancy/nhs1/nhrp_cache.json
@@ -6,7 +6,7 @@
         {
             "interface": "nhs1-gre0",
             "type": "dynamic",
-            "protocol": "176.16.1.4",
+            "protocol": "172.16.1.4",
             "nbma": "192.168.2.4",
             "claimed_nbma": "192.168.2.4",
             "used": false,
@@ -17,7 +17,7 @@
         {
             "interface": "nhs1-gre0",
             "type": "local",
-            "protocol": "176.16.1.1",
+            "protocol": "172.16.1.1",
             "nbma": "192.168.1.1",
             "claimed_nbma": "192.168.1.1",
             "used": false,
@@ -28,7 +28,7 @@
         {
             "interface": "nhs1-gre0",
             "type": "dynamic",
-            "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/nhs1/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhs1/nhrp_route.json
index d89719c80202bbdc1887ea6c792959241a0a6984..2574b1a5d2b599f8b137a206f7d74e868a816102 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs1/nhrp_route.json
+++ b/tests/topotests/nhrp_redundancy/nhs1/nhrp_route.json
@@ -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",
             "vrfId": 0,
             "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",
             "vrfId": 0,
             "vrfName": "default",

diff --git a/tests/topotests/nhrp_redundancy/nhs1/zebra.conf b/tests/topotests/nhrp_redundancy/nhs1/zebra.conf
index d116612c4f07e5c208cb5889f91cef2ee6b47d88..718e01b99184f9a3ba46f7f4f0f12560452190ce 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs1/zebra.conf
+++ b/tests/topotests/nhrp_redundancy/nhs1/zebra.conf
@@ -4,9 +4,9 @@ interface nhs1-eth0
 !
 ip route 192.168.2.0/24 192.168.1.6
 interface nhs1-gre0
- ip address 176.16.1.1/32
+ ip address 172.16.1.1/32
  no link-detect
  ipv6 nd suppress-ra
 !
-ip route 4.4.4.0/24 176.16.1.4
-ip route 5.5.5.0/24 176.16.1.5
+ip route 10.4.4.0/24 172.16.1.4
+ip route 10.5.5.0/24 172.16.1.5

diff --git a/tests/topotests/nhrp_redundancy/nhs2/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhs2/nhrp_cache.json
index c0538203c737f7ff71aefc747b837062a69319e9..6343c4deb935e018126bd945955086ac143a2c3d 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs2/nhrp_cache.json
+++ b/tests/topotests/nhrp_redundancy/nhs2/nhrp_cache.json
@@ -6,7 +6,7 @@
         {
             "interface": "nhs2-gre0",
             "type": "local",
-            "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": "nhs2-gre0",
             "type": "dynamic",
-            "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": "nhs2-gre0",
             "type": "dynamic",
-            "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/nhs2/nhrp_cache_nhs1_down.json b/tests/topotests/nhrp_redundancy/nhs2/nhrp_cache_nhs1_down.json
index c0538203c737f7ff71aefc747b837062a69319e9..6343c4deb935e018126bd945955086ac143a2c3d 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs2/nhrp_cache_nhs1_down.json
+++ b/tests/topotests/nhrp_redundancy/nhs2/nhrp_cache_nhs1_down.json
@@ -6,7 +6,7 @@
         {
             "interface": "nhs2-gre0",
             "type": "local",
-            "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": "nhs2-gre0",
             "type": "dynamic",
-            "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": "nhs2-gre0",
             "type": "dynamic",
-            "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/nhs2/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhs2/nhrp_route.json
index 25086be7e8a47cc0005618f653b4db21606dab23..0ad37fc319709e305b5a517433dc8fba2364a624 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs2/nhrp_route.json
+++ b/tests/topotests/nhrp_redundancy/nhs2/nhrp_route.json
@@ -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",
             "vrfId": 0,
             "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",
             "vrfId": 0,
             "vrfName": "default",

diff --git a/tests/topotests/nhrp_redundancy/nhs2/nhrp_route_nhs1_down.json b/tests/topotests/nhrp_redundancy/nhs2/nhrp_route_nhs1_down.json
index 25086be7e8a47cc0005618f653b4db21606dab23..0ad37fc319709e305b5a517433dc8fba2364a624 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs2/nhrp_route_nhs1_down.json
+++ b/tests/topotests/nhrp_redundancy/nhs2/nhrp_route_nhs1_down.json
@@ -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",
             "vrfId": 0,
             "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",
             "vrfId": 0,
             "vrfName": "default",

diff --git a/tests/topotests/nhrp_redundancy/nhs2/zebra.conf b/tests/topotests/nhrp_redundancy/nhs2/zebra.conf
index bf482b5837f8807faf2a0bbd8f6fd3ef8b0831a9..6001bf21c0cea7e7e9290fe5a83bec1527677370 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs2/zebra.conf
+++ b/tests/topotests/nhrp_redundancy/nhs2/zebra.conf
@@ -4,9 +4,9 @@ interface nhs2-eth0
 !
 ip route 192.168.2.0/24 192.168.1.6
 interface nhs2-gre0
- ip address 176.16.1.2/32
+ ip address 172.16.1.2/32
  no link-detect
  ipv6 nd suppress-ra
 !
-ip route 4.4.4.0/24 176.16.1.4
-ip route 5.5.5.0/24 176.16.1.5
+ip route 10.4.4.0/24 172.16.1.4
+ip route 10.5.5.0/24 172.16.1.5

diff --git a/tests/topotests/nhrp_redundancy/nhs3/nhrp_cache.json b/tests/topotests/nhrp_redundancy/nhs3/nhrp_cache.json
index 9bcf0f78c2345551459140976407733ac1ad5f36..d911de348b01cb0626f8ed90fcfdfac6777de165 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs3/nhrp_cache.json
+++ b/tests/topotests/nhrp_redundancy/nhs3/nhrp_cache.json
@@ -6,7 +6,7 @@
         {
             "interface": "nhs3-gre0",
             "type": "dynamic",
-            "protocol": "176.16.1.4",
+            "protocol": "172.16.1.4",
             "nbma": "192.168.2.4",
             "claimed_nbma": "192.168.2.4",
             "used": false,
@@ -17,7 +17,7 @@
         {
             "interface": "nhs3-gre0",
             "type": "local",
-            "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": "nhs3-gre0",
             "type": "dynamic",
-            "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/nhs3/nhrp_cache_nhs1_down.json b/tests/topotests/nhrp_redundancy/nhs3/nhrp_cache_nhs1_down.json
index 9bcf0f78c2345551459140976407733ac1ad5f36..d911de348b01cb0626f8ed90fcfdfac6777de165 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs3/nhrp_cache_nhs1_down.json
+++ b/tests/topotests/nhrp_redundancy/nhs3/nhrp_cache_nhs1_down.json
@@ -6,7 +6,7 @@
         {
             "interface": "nhs3-gre0",
             "type": "dynamic",
-            "protocol": "176.16.1.4",
+            "protocol": "172.16.1.4",
             "nbma": "192.168.2.4",
             "claimed_nbma": "192.168.2.4",
             "used": false,
@@ -17,7 +17,7 @@
         {
             "interface": "nhs3-gre0",
             "type": "local",
-            "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": "nhs3-gre0",
             "type": "dynamic",
-            "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/nhs3/nhrp_route.json b/tests/topotests/nhrp_redundancy/nhs3/nhrp_route.json
index a5a493c973293b94f573a2e1ab1899f0e63825e6..29a4f8f11b60eb0065a858af0aa74aa8ac1b6a8e 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs3/nhrp_route.json
+++ b/tests/topotests/nhrp_redundancy/nhs3/nhrp_route.json
@@ -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",
             "vrfId": 0,
             "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",
             "vrfId": 0,
             "vrfName": "default",

diff --git a/tests/topotests/nhrp_redundancy/nhs3/nhrp_route_nhs1_down.json b/tests/topotests/nhrp_redundancy/nhs3/nhrp_route_nhs1_down.json
index a5a493c973293b94f573a2e1ab1899f0e63825e6..29a4f8f11b60eb0065a858af0aa74aa8ac1b6a8e 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs3/nhrp_route_nhs1_down.json
+++ b/tests/topotests/nhrp_redundancy/nhs3/nhrp_route_nhs1_down.json
@@ -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",
             "vrfId": 0,
             "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",
             "vrfId": 0,
             "vrfName": "default",

diff --git a/tests/topotests/nhrp_redundancy/nhs3/zebra.conf b/tests/topotests/nhrp_redundancy/nhs3/zebra.conf
index 2aac2eabbfd11de0148f76447d7479f157528f50..7c1543881785ae287e590ba59806c9e3c93aa1ef 100644 (file)
--- a/tests/topotests/nhrp_redundancy/nhs3/zebra.conf
+++ b/tests/topotests/nhrp_redundancy/nhs3/zebra.conf
@@ -4,9 +4,9 @@ interface nhs3-eth0
 !
 ip route 192.168.2.0/24 192.168.1.6
 interface nhs3-gre0
- ip address 176.16.1.3/32
+ ip address 172.16.1.3/32
  no link-detect
  ipv6 nd suppress-ra
 !
-ip route 4.4.4.0/24 176.16.1.4
-ip route 5.5.5.0/24 176.16.1.5
\ No newline at end of file
+ip route 10.4.4.0/24 172.16.1.4
+ip route 10.5.5.0/24 172.16.1.5
\ No newline at end of file

diff --git a/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.dot b/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.dot
index 8a3363d1ae32c0eecc861d8ec7be6e2570abdc01..e94e1d0734cd1e6a2eb848a57423040841d4c8c9 100644 (file)
--- a/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.dot
+++ b/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.dot
@@ -74,13 +74,13 @@ graph template {
   ];
   sw3 [
     shape=oval,
-    label="sw3\n4.4.4.0/24",
+    label="sw3\n10.4.4.0/24",
     fillcolor="#d0e0d0",
     style=filled,
   ];
   sw4 [
     shape=oval,
-    label="sw4\n5.5.5.0/24",
+    label="sw4\n10.5.5.0/24",
     fillcolor="#d0e0d0",
     style=filled,
   ];

diff --git a/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py b/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py
index 9b4933e43d587c55e8c982090606bdd126ef5ef5..06777aaa23ddf8f3f31780ceba8149892dba28ad 100644 (file)
--- a/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py
+++ b/tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py
@@ -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.
@@ -237,8 +237,8 @@ def test_protocols_convergence():
 
     # Test connectivity from 1 NHRP server to all clients
     nhs1 = tgen.gears["nhs1"]
-    logger.info("Check Ping IPv4 from  nhs1 to nhc1 = 176.16.1.4)")
-    output = nhs1.run("ping 176.16.1.4 -f -c 1000")
+    logger.info("Check Ping IPv4 from  nhs1 to nhc1 = 172.16.1.4)")
+    output = nhs1.run("ping 172.16.1.4 -f -c 1000")
     logger.info(output)
     if "1000 packets transmitted, 1000 received" not in output:
         assertmsg = "expected ping IPv4 from nhs1 to nhc1 should be ok"
@@ -246,8 +246,8 @@ def test_protocols_convergence():
     else:
         logger.info("Check Ping IPv4 from nhs1 to nhc1 OK")
 
-    logger.info("Check Ping IPv4 from  nhs1 to nhc2 = 176.16.1.5)")
-    output = nhs1.run("ping 176.16.1.5 -f -c 1000")
+    logger.info("Check Ping IPv4 from  nhs1 to nhc2 = 172.16.1.5)")
+    output = nhs1.run("ping 172.16.1.5 -f -c 1000")
     logger.info(output)
     if "1000 packets transmitted, 1000 received" not in output:
         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
     nhc1 = tgen.gears["nhc1"]
-    logger.info("Check Ping IPv4 from  nhc1 to nhs1 = 176.16.1.1)")
-    output = nhc1.run("ping 176.16.1.1 -f -c 1000")
+    logger.info("Check Ping IPv4 from  nhc1 to nhs1 = 172.16.1.1)")
+    output = nhc1.run("ping 172.16.1.1 -f -c 1000")
     logger.info(output)
     if "1000 packets transmitted, 1000 received" not in output:
         assertmsg = "expected ping IPv4 from nhc1 to nhs1 should be ok"
@@ -266,8 +266,8 @@ def test_protocols_convergence():
     else:
         logger.info("Check Ping IPv4 from nhc1 to nhs1 OK")
 
-    logger.info("Check Ping IPv4 from  nhc1 to nhs2 = 176.16.1.2)")
-    output = nhc1.run("ping 176.16.1.2 -f -c 1000")
+    logger.info("Check Ping IPv4 from  nhc1 to nhs2 = 172.16.1.2)")
+    output = nhc1.run("ping 172.16.1.2 -f -c 1000")
     logger.info(output)
     if "1000 packets transmitted, 1000 received" not in output:
         assertmsg = "expected ping IPv4 from nhc1 to nhs2 should be ok"
@@ -275,8 +275,8 @@ def test_protocols_convergence():
     else:
         logger.info("Check Ping IPv4 from nhc1 to nhs2 OK")
 
-    logger.info("Check Ping IPv4 from  nhc1 to nhs3 = 176.16.1.3)")
-    output = nhc1.run("ping 176.16.1.3 -f -c 1000")
+    logger.info("Check Ping IPv4 from  nhc1 to nhs3 = 172.16.1.3)")
+    output = nhc1.run("ping 172.16.1.3 -f -c 1000")
     logger.info(output)
     if "1000 packets transmitted, 1000 received" not in output:
         assertmsg = "expected ping IPv4 from nhc1 to nhs3 should be ok"
@@ -292,9 +292,9 @@ def verify_shortcut_path():
     """
     tgen = get_topogen()
     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)
     if "1000 packets transmitted, 1000 received" not in output:
         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
     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)
     if "1000 packets transmitted, 1000 received" not in output:
         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
     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)
     if "1000 packets transmitted, 1000 received" not in output:
         assertmsg = "expected ping IPv4 from host to nhc2 via shortcut should be ok"