topotests: router relative variables in bgp_vpnv4_noretain

Change IP addresses, label, RD and RT to match the router number
and VRF number.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>

diff --git a/tests/topotests/bgp_vpnv4_noretain/r1/bgpd.conf b/tests/topotests/bgp_vpnv4_noretain/r1/bgpd.conf
index 3d8773b8bf859996c3c3c2f8ae0a3d16971c3ed5..ba68e61ddf45cb8b2f77e3e65985039b8737c6a3 100644 (file)
--- a/tests/topotests/bgp_vpnv4_noretain/r1/bgpd.conf
+++ b/tests/topotests/bgp_vpnv4_noretain/r1/bgpd.conf
@@ -1,5 +1,5 @@
 router bgp 65500
- bgp router-id 1.1.1.1
+ bgp router-id 192.0.2.1
  neighbor 10.125.0.2 remote-as 65500
  address-family ipv4 unicast
   no neighbor 10.125.0.2 activate
@@ -10,13 +10,13 @@ router bgp 65500
  exit-address-family
 !
 router bgp 65500 vrf vrf1
- bgp router-id 1.1.1.1
+ bgp router-id 192.0.2.1
  address-family ipv4 unicast
   redistribute connected
   label vpn export 101
-  rd vpn export 444:1
-  rt vpn import 51:100 52:100
-  rt vpn export 51:100
+  rd vpn export 192.0.2.1:1
+  rt vpn import 192.0.2.1:100 192.0.2.2:100
+  rt vpn export 192.0.2.1:100
   export vpn
   import vpn
  exit-address-family

diff --git a/tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_all.json b/tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_all.json
index 45f4acce6f95b1806199351c3d090c82c936bfcf..1926e86a8ca1bafb53b30664bc728ef4d988c399 100644 (file)
--- a/tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_all.json
+++ b/tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_all.json
@@ -1,21 +1,21 @@
 {
    "vrfId":0,
    "vrfName":"default",
-   "routerId":"1.1.1.1",
+   "routerId":"192.0.2.1",
    "defaultLocPrf":100,
    "localAS":65500,
    "routes":{
       "routeDistinguishers":{
-         "444:1":{
-            "10.201.0.0/24":[
+         "192.0.2.1:1":{
+            "10.101.0.0/24":[
                {
                   "valid":true,
                   "bestpath":true,
                   "selectionReason":"First path received",
                   "pathFrom":"external",
-                  "prefix":"10.201.0.0",
+                  "prefix":"10.101.0.0",
                   "prefixLen":24,
-                  "network":"10.201.0.0\/24",
+                  "network":"10.101.0.0\/24",
                   "metric":0,
                   "weight":32768,
                   "peerId":"(unspec)",
@@ -34,16 +34,16 @@
                }
             ]
          },
-         "444:2":{
-            "10.200.0.0/24":[
+         "192.0.2.2:1":{
+            "10.201.0.0/24":[
                {
                   "valid":true,
                   "bestpath":true,
                   "selectionReason":"First path received",
                   "pathFrom":"internal",
-                  "prefix":"10.200.0.0",
+                  "prefix":"10.201.0.0",
                   "prefixLen":24,
-                  "network":"10.200.0.0\/24",
+                  "network":"10.201.0.0\/24",
                   "metric":0,
                   "locPrf":100,
                   "weight":0,
@@ -61,16 +61,16 @@
                }
             ]
          },
-         "444:3":{
-            "10.210.0.0/24":[
+         "192.0.2.2:2":{
+            "10.202.0.0/24":[
                {
                   "valid":true,
                   "bestpath":true,
                   "selectionReason":"First path received",
                   "pathFrom":"internal",
-                  "prefix":"10.210.0.0",
+                  "prefix":"10.202.0.0",
                   "prefixLen":24,
-                  "network":"10.210.0.0\/24",
+                  "network":"10.202.0.0\/24",
                   "metric":0,
                   "locPrf":100,
                   "weight":0,

diff --git a/tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_no_retain_init.json b/tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_no_retain_init.json
index 28e153e3de89cadbeeb820de532c86ff8067aa1a..261dec9f9f9d1812433020625ecf5103abe128d6 100644 (file)
--- a/tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_no_retain_init.json
+++ b/tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_no_retain_init.json
@@ -1,21 +1,21 @@
 {
    "vrfId":0,
    "vrfName":"default",
-   "routerId":"1.1.1.1",
+   "routerId":"192.0.2.1",
    "defaultLocPrf":100,
    "localAS":65500,
    "routes":{
       "routeDistinguishers":{
-         "444:1":{
-            "10.201.0.0/24":[
+         "192.0.2.1:1":{
+            "10.101.0.0/24":[
                {
                   "valid":true,
                   "bestpath":true,
                   "selectionReason":"First path received",
                   "pathFrom":"external",
-                  "prefix":"10.201.0.0",
+                  "prefix":"10.101.0.0",
                   "prefixLen":24,
-                  "network":"10.201.0.0\/24",
+                  "network":"10.101.0.0\/24",
                   "metric":0,
                   "weight":32768,
                   "peerId":"(unspec)",
@@ -34,16 +34,16 @@
                }
             ]
          },
-         "444:2":{
-            "10.200.0.0/24":[
+         "192.0.2.2:1":{
+            "10.201.0.0/24":[
                {
                   "valid":true,
                   "bestpath":true,
                   "selectionReason":"First path received",
                   "pathFrom":"internal",
-                  "prefix":"10.200.0.0",
+                  "prefix":"10.201.0.0",
                   "prefixLen":24,
-                  "network":"10.200.0.0\/24",
+                  "network":"10.201.0.0\/24",
                   "metric":0,
                   "locPrf":100,
                   "weight":0,
@@ -61,7 +61,7 @@
                }
             ]
          },
-         "444:3":{
+         "192.0.2.2:2":{
          }
       }
    }

diff --git a/tests/topotests/bgp_vpnv4_noretain/r1/isisd.conf b/tests/topotests/bgp_vpnv4_noretain/r1/isisd.conf
index 6f5cb6ec68265213ef27dab25792bc94dbcde47c..233a6473b3ca343a8ad00c1d6dda5f19f0c2be55 100644 (file)
--- a/tests/topotests/bgp_vpnv4_noretain/r1/isisd.conf
+++ b/tests/topotests/bgp_vpnv4_noretain/r1/isisd.conf
@@ -10,5 +10,5 @@ router isis 1
  is-type level-1
  net 49.0002.0000.1994.00
  segment-routing on
- segment-routing prefix 1.1.1.1/32 index 11
+ segment-routing prefix 192.0.2.1/32 index 11
 !

diff --git a/tests/topotests/bgp_vpnv4_noretain/r1/zebra.conf b/tests/topotests/bgp_vpnv4_noretain/r1/zebra.conf
index 5b8b1e8ffb3bfc0ae337d07d92ea3c0ccde1a37b..4f641e512e8fdd0e1d60ed3cbfeadc7f2433fc98 100644 (file)
--- a/tests/topotests/bgp_vpnv4_noretain/r1/zebra.conf
+++ b/tests/topotests/bgp_vpnv4_noretain/r1/zebra.conf
@@ -1,13 +1,13 @@
 log stdout
 interface lo
- ip address 1.1.1.1/32
+ ip address 192.0.2.1/32
 !
 interface r1-gre0
  ip address 192.168.0.1/24
 !
-interface r1-eth1 vrf vrf1
- ip address 10.201.0.1/24
-!
 interface r1-eth0
  ip address 10.125.0.1/24
 !
+interface r1-eth1 vrf vrf1
+ ip address 10.101.0.1/24
+!

diff --git a/tests/topotests/bgp_vpnv4_noretain/r2/bgpd.conf b/tests/topotests/bgp_vpnv4_noretain/r2/bgpd.conf
index 235fb31177e0065ad4b4eef952995e4adea40c82..13de0e520f249df1aa1f78ac563027f4b01ca017 100644 (file)
--- a/tests/topotests/bgp_vpnv4_noretain/r2/bgpd.conf
+++ b/tests/topotests/bgp_vpnv4_noretain/r2/bgpd.conf
@@ -1,5 +1,5 @@
 router bgp 65500
- bgp router-id 2.2.2.2
+ bgp router-id 192.0.2.2
  neighbor 10.125.0.1 remote-as 65500
  address-family ipv4 unicast
   no neighbor 10.125.0.1 activate
@@ -10,25 +10,25 @@ router bgp 65500
  exit-address-family
 !
 router bgp 65500 vrf vrf1
- bgp router-id 2.2.2.2
+ bgp router-id 192.0.2.2
  address-family ipv4 unicast
   redistribute connected
-  label vpn export 102
-  rd vpn export 444:2
-  rt vpn import 53:100 52:100 51:100
-  rt vpn export 52:100
+  label vpn export 201
+  rd vpn export 192.0.2.2:1
+  rt vpn import 192.0.2.1:100 192.0.2.2:100 192.0.2.2:200
+  rt vpn export 192.0.2.2:100
   export vpn
   import vpn
  exit-address-family
 !
 router bgp 65500 vrf vrf2
- bgp router-id 2.2.2.2
+ bgp router-id 192.0.2.2
  address-family ipv4 unicast
   redistribute connected
-  label vpn export 102
-  rd vpn export 444:3
-  rt vpn both 53:100 52:100 51:100
-  rt vpn both 53:100
+  label vpn export 202
+  rd vpn export 192.0.2.2:2
+  rt vpn both 192.0.2.1:100 192.0.2.2:100 192.0.2.2:200
+  rt vpn both 192.0.2.2:200
   export vpn
   import vpn
  exit-address-family

diff --git a/tests/topotests/bgp_vpnv4_noretain/r2/isisd.conf b/tests/topotests/bgp_vpnv4_noretain/r2/isisd.conf
index cbec8c367453693e9a4b73bedde173c9a2bbc04c..547d10f2bca9a7f2e22f7aefe7cc718f4bad3ccf 100644 (file)
--- a/tests/topotests/bgp_vpnv4_noretain/r2/isisd.conf
+++ b/tests/topotests/bgp_vpnv4_noretain/r2/isisd.conf
@@ -10,5 +10,5 @@ router isis 1
  is-type level-1
  net 49.0002.0000.1995.00
  segment-routing on
- segment-routing prefix 2.2.2.2/32 index 22
+ segment-routing prefix 192.0.2.2/32 index 22
 !

diff --git a/tests/topotests/bgp_vpnv4_noretain/r2/zebra.conf b/tests/topotests/bgp_vpnv4_noretain/r2/zebra.conf
index 7ec644ac2a904199b49d4352b1e8bad1e96c7c3e..72cc10b6c2228c61989a1a7e0f1b95a3cf082c3f 100644 (file)
--- a/tests/topotests/bgp_vpnv4_noretain/r2/zebra.conf
+++ b/tests/topotests/bgp_vpnv4_noretain/r2/zebra.conf
@@ -1,16 +1,16 @@
 log stdout
 interface lo
- ip address 2.2.2.2/32
+ ip address 192.0.2.2/32
 !
 interface r2-gre0
  ip address 192.168.0.2/24
 !
+interface r2-eth0
+ ip address 10.125.0.2/24
+!
 interface r2-eth1 vrf vrf1
- ip address 10.200.0.2/24
+ ip address 10.201.0.2/24
 !
 interface r2-eth2 vrf vrf2
- ip address 10.210.0.2/24
-!
-interface r2-eth0
- ip address 10.125.0.2/24
+ ip address 10.202.0.2/24
 !