topotests: bgp_srv6l3vpn_to_bgp_vrf, change AS values

Use experimental AS values to play the test.
Add BGP peering on CEs, and use the default-originate functionality on
each PE facing CPEs.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce1/frr.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce1/frr.conf
index e48629cdac8da0e8d6afd46615659e7537c30e8f..c70ad42437b5f0fd00a95f627b23c88576c695aa 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce1/frr.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce1/frr.conf
@@ -6,4 +6,11 @@ interface eth0
 ip forwarding
 ipv6 forwarding
 !
-ipv6 route ::/0 2001:1::1
+router bgp 65500
+ bgp router-id 1.1.2.1
+ neighbor 2001:1::1 remote-as 65500
+ address-family ipv6 unicast
+  neighbor 2001:1::1 activate
+ exit-address-family
+exit
+ 

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce1/ipv6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce1/ipv6_rib.json
index d19e3157723d48320ddfcd7c772af9fdea147ca5..b68f1a1112ce49b154d632faf7da9cc8f02612b6 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce1/ipv6_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce1/ipv6_rib.json
@@ -2,24 +2,23 @@
   "::/0": [
     {
       "prefix": "::/0",
-      "protocol": "static",
+      "protocol": "bgp",
       "vrfId": 0,
       "vrfName": "default",
       "selected": true,
       "destSelected": true,
-      "distance": 1,
+      "distance": 200,
       "metric": 0,
       "installed": true,
       "table": 254,
       "internalStatus": 16,
-      "internalFlags": 73,
+      "internalFlags": 13,
       "internalNextHopNum": 1,
       "internalNextHopActiveNum": 1,
       "nexthops": [
         {
           "flags": 3,
           "fib": true,
-          "ip": "2001:1::1",
           "afi": "ipv6",
           "interfaceName": "eth0",
           "active": true,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce2/frr.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce2/frr.conf
index 36dc3bd8e9efbce57f9f374d729f3cd0a6ba1da6..a15c5b48e0984b75d42310a0d4d9d6a594765d6b 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce2/frr.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce2/frr.conf
@@ -6,4 +6,12 @@ interface eth0
 ip forwarding
 ipv6 forwarding
 !
-ipv6 route ::/0 2001:2::1
+router bgp 65501
+ bgp router-id 1.1.20.1
+ neighbor 2001:2::1 remote-as 65501
+ address-family ipv6 unicast
+  neighbor 2001:2::1 activate
+ exit-address-family
+exit
+ 
+

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce2/ipv6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce2/ipv6_rib.json
index 35ff14efadc31e0cc9fcd926bee6a31108591f3b..1f425952715dfd9a3264dd478a453f7f3180cd99 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce2/ipv6_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce2/ipv6_rib.json
@@ -2,24 +2,23 @@
   "::/0": [
     {
       "prefix": "::/0",
-      "protocol": "static",
+      "protocol": "bgp",
       "vrfId": 0,
       "vrfName": "default",
       "selected": true,
       "destSelected": true,
-      "distance": 1,
+      "distance": 200,
       "metric": 0,
       "installed": true,
       "table": 254,
       "internalStatus": 16,
-      "internalFlags": 73,
+      "internalFlags": 13,
       "internalNextHopNum": 1,
       "internalNextHopActiveNum": 1,
       "nexthops": [
         {
           "flags": 3,
           "fib": true,
-          "ip": "2001:2::1",
           "afi": "ipv6",
           "interfaceName": "eth0",
           "active": true,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce3/frr.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce3/frr.conf
index 65e08ce23d0be185378e0b9d01aed2955cd56862..947a4a25515f5fa2691e7d62c75e99192669ee75 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce3/frr.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce3/frr.conf
@@ -6,4 +6,11 @@ interface eth0
 ip forwarding
 ipv6 forwarding
 !
-ipv6 route ::/0 2001:3::1
+router bgp 65500
+ bgp router-id 1.1.3.1
+ neighbor 2001:3::1 remote-as 65500
+ address-family ipv6 unicast
+  neighbor 2001:3::1 activate
+ exit-address-family
+exit
+

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce3/ipv6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce3/ipv6_rib.json
index 2f2931f80f4d4df6e9a9d228ff3b0eff81443dfa..6a373a80b82bce222e3070eae339ce6ef7c20c0d 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce3/ipv6_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce3/ipv6_rib.json
@@ -2,24 +2,23 @@
   "::/0": [
     {
       "prefix": "::/0",
-      "protocol": "static",
+      "protocol": "bgp",
       "vrfId": 0,
       "vrfName": "default",
       "selected": true,
       "destSelected": true,
-      "distance": 1,
+      "distance": 200,
       "metric": 0,
       "installed": true,
       "table": 254,
       "internalStatus": 16,
-      "internalFlags": 73,
+      "internalFlags": 13,
       "internalNextHopNum": 1,
       "internalNextHopActiveNum": 1,
       "nexthops": [
         {
           "flags": 3,
           "fib": true,
-          "ip": "2001:3::1",
           "afi": "ipv6",
           "interfaceName": "eth0",
           "active": true,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce4/frr.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce4/frr.conf
index 00d1f076e0356eca3b813525c2a3e3ae12d13900..3eaf47961e77c342c999307269201ae8f6b7dde7 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce4/frr.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce4/frr.conf
@@ -6,4 +6,11 @@ interface eth0
 ip forwarding
 ipv6 forwarding
 !
-ipv6 route ::/0 2001:4::1
+router bgp 65501
+ bgp router-id 1.1.4.1
+ neighbor 2001:4::1 remote-as 65501
+ address-family ipv6 unicast
+  neighbor 2001:4::1 activate
+ exit-address-family
+exit
+

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce4/ipv6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce4/ipv6_rib.json
index 8a98768e0d0d9dacd5f716164abed73c0fcc4dfe..da6bd552316303f3a8cda9a681b807a8828066de 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce4/ipv6_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce4/ipv6_rib.json
@@ -2,24 +2,23 @@
   "::/0": [
     {
       "prefix": "::/0",
-      "protocol": "static",
+      "protocol": "bgp",
       "vrfId": 0,
       "vrfName": "default",
       "selected": true,
       "destSelected": true,
-      "distance": 1,
+      "distance": 200,
       "metric": 0,
       "installed": true,
       "table": 254,
       "internalStatus": 16,
-      "internalFlags": 73,
+      "internalFlags": 13,
       "internalNextHopNum": 1,
       "internalNextHopActiveNum": 1,
       "nexthops": [
         {
           "flags": 3,
           "fib": true,
-          "ip": "2001:4::1",
           "afi": "ipv6",
           "interfaceName": "eth0",
           "active": true,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce5/frr.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce5/frr.conf
index dd5144bce5741b84ad1d045510eeccbb072ca4be..5adfc7cfebc43730a956790075b7a3758b9beb10 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce5/frr.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce5/frr.conf
@@ -6,4 +6,11 @@ interface eth0
 ip forwarding
 ipv6 forwarding
 !
-ipv6 route ::/0 2001:5::1
+router bgp 65500
+ bgp router-id 1.1.5.1
+ neighbor 2001:5::1 remote-as 65500
+ address-family ipv6 unicast
+  neighbor 2001:5::1 activate
+ exit-address-family
+exit
+

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce5/ipv6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce5/ipv6_rib.json
index 80ff52ad6eb2863c7ca146f8e5eab9bd9cc4d5ab..f8ab84d17a8c917fd18d30a9c18083e29437382d 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce5/ipv6_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce5/ipv6_rib.json
@@ -2,24 +2,23 @@
   "::/0": [
     {
       "prefix": "::/0",
-      "protocol": "static",
+      "protocol": "bgp",
       "vrfId": 0,
       "vrfName": "default",
       "selected": true,
       "destSelected": true,
-      "distance": 1,
+      "distance": 200,
       "metric": 0,
       "installed": true,
       "table": 254,
       "internalStatus": 16,
-      "internalFlags": 73,
+      "internalFlags": 13,
       "internalNextHopNum": 1,
       "internalNextHopActiveNum": 1,
       "nexthops": [
         {
           "flags": 3,
           "fib": true,
-          "ip": "2001:5::1",
           "afi": "ipv6",
           "interfaceName": "eth0",
           "active": true,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce6/frr.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce6/frr.conf
index 47947dce851c1cdb35f897153e861e371ad9c659..3870bd84a364112eafcd39b31e64430e1c7b9d06 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce6/frr.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce6/frr.conf
@@ -6,4 +6,11 @@ interface eth0
 ip forwarding
 ipv6 forwarding
 !
-ipv6 route ::/0 2001:6::1
+router bgp 65501
+ bgp router-id 1.1.6.1
+ neighbor 2001:6::1 remote-as 65501
+ address-family ipv6 unicast
+  neighbor 2001:6::1 activate
+ exit-address-family
+exit
+

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce6/ipv6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce6/ipv6_rib.json
index ace6136f068bf1aca9629ce8333c69eba63ba48d..71ca42e396ee85213bc68a53e0b090d3cdbf6d6f 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce6/ipv6_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/ce6/ipv6_rib.json
@@ -2,24 +2,23 @@
   "::/0": [
     {
       "prefix": "::/0",
-      "protocol": "static",
+      "protocol": "bgp",
       "vrfId": 0,
       "vrfName": "default",
       "selected": true,
       "destSelected": true,
-      "distance": 1,
+      "distance": 200,
       "metric": 0,
       "installed": true,
       "table": 254,
       "internalStatus": 16,
-      "internalFlags": 73,
+      "internalFlags": 13,
       "internalNextHopNum": 1,
       "internalNextHopActiveNum": 1,
       "nexthops": [
         {
           "flags": 3,
           "fib": true,
-          "ip": "2001:6::1",
           "afi": "ipv6",
           "interfaceName": "eth0",
           "active": true,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/frr.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/frr.conf
index e46ab948e66a028b79eaa2d0a51fbdda6b5fb54c..ef05460b2258d4024ab33a934d2a198cfbebf17e 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/frr.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/frr.conf
@@ -42,11 +42,11 @@ ipv6 route 2001:db8:2:3::/64 2001::2
 line vty
 !
 no bgp send-extra-data-zebra
-router bgp 1
+router bgp 65500
  bgp router-id 1.1.1.1
  no bgp ebgp-requires-policy
  no bgp default ipv4-unicast
- neighbor 2001::2 remote-as 2
+ neighbor 2001::2 remote-as 65501
  neighbor 2001::2 timers 3 10
  neighbor 2001::2 timers connect 1
  !
@@ -58,12 +58,18 @@ router bgp 1
   locator loc1
  !
 !
-router bgp 1 vrf vrf10
+router bgp 65500 vrf vrf10
  bgp router-id 1.1.1.1
  no bgp ebgp-requires-policy
  no bgp default ipv4-unicast
  !
+ neighbor 2001:1::2 remote-as 65500
+ neighbor 2001:3::2 remote-as 65500
  address-family ipv6 unicast
+  neighbor 2001:1::2 activate
+  neighbor 2001:1::2 default-originate
+  neighbor 2001:3::2 activate
+  neighbor 2001:3::2 default-originate
   sid vpn export auto
   rd vpn export 1:10
   rt vpn both 99:99
@@ -72,12 +78,15 @@ router bgp 1 vrf vrf10
   redistribute connected
  exit-address-family
 !
-router bgp 1 vrf vrf20
+router bgp 65500 vrf vrf20
  bgp router-id 1.1.1.1
  no bgp ebgp-requires-policy
  no bgp default ipv4-unicast
+ neighbor 2001:5::2 remote-as 65500
  !
  address-family ipv6 unicast
+  neighbor 2001:5::2 activate
+  neighbor 2001:5::2 default-originate
   sid vpn export auto
   rd vpn export 1:20
   rt vpn both 88:88

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vpnv6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vpnv6_rib.json
index 0fdd3d6dc06081ee84920015f699d1378de1c1aa..d67a3e1cc547eb936c3a7b54a7153459458d10ff 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vpnv6_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vpnv6_rib.json
@@ -3,7 +3,7 @@
   "vrfName": "default",
   "routerId": "1.1.1.1",
   "defaultLocPrf": 100,
-  "localAS": 1,
+  "localAS": 65500,
   "routes": {
     "routeDistinguishers": {
       "1:10": {
@@ -101,7 +101,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::2",
-            "path": "2",
+            "path": "65501",
             "origin": "incomplete",
             "nexthops": [
               {
@@ -127,7 +127,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::2",
-            "path": "2",
+            "path": "65501",
             "origin": "incomplete",
             "nexthops": [
               {
@@ -151,7 +151,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::2",
-            "path": "2",
+            "path": "65501",
             "origin": "incomplete",
             "nexthops": [
               {

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vpnv6_rib_locator_deleted.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vpnv6_rib_locator_deleted.json
index f2df9be49d9f35c053fed99303109594f37c2101..5a7407480ba09c31e0092e4501a37d1827c14326 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vpnv6_rib_locator_deleted.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vpnv6_rib_locator_deleted.json
@@ -3,7 +3,7 @@
   "vrfName": "default",
   "routerId": "1.1.1.1",
   "defaultLocPrf": 100,
-  "localAS": 1,
+  "localAS": 65500,
   "routes": {
     "routeDistinguishers": {
       "1:10": {
@@ -92,7 +92,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::2",
-            "path": "2",
+            "path": "65501",
             "origin": "incomplete",
             "nexthops": [
               {
@@ -118,7 +118,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::2",
-            "path": "2",
+            "path": "65501",
             "origin": "incomplete",
             "nexthops": [
               {
@@ -142,7 +142,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::2",
-            "path": "2",
+            "path": "65501",
             "origin": "incomplete",
             "nexthops": [
               {

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vpnv6_rib_locator_recreated.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vpnv6_rib_locator_recreated.json
index 0fdd3d6dc06081ee84920015f699d1378de1c1aa..d67a3e1cc547eb936c3a7b54a7153459458d10ff 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vpnv6_rib_locator_recreated.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vpnv6_rib_locator_recreated.json
@@ -3,7 +3,7 @@
   "vrfName": "default",
   "routerId": "1.1.1.1",
   "defaultLocPrf": 100,
-  "localAS": 1,
+  "localAS": 65500,
   "routes": {
     "routeDistinguishers": {
       "1:10": {
@@ -101,7 +101,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::2",
-            "path": "2",
+            "path": "65501",
             "origin": "incomplete",
             "nexthops": [
               {
@@ -127,7 +127,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::2",
-            "path": "2",
+            "path": "65501",
             "origin": "incomplete",
             "nexthops": [
               {
@@ -151,7 +151,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::2",
-            "path": "2",
+            "path": "65501",
             "origin": "incomplete",
             "nexthops": [
               {

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/frr.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/frr.conf
index f5729dd8eee6377902643187fb7d8f6cdb9973bd..1bef01d0b38823b585d055427f9f9aaa4be3d9f7 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/frr.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/frr.conf
@@ -43,11 +43,11 @@ ipv6 route 2001:db8:1:3::/64 2001::1
 line vty
 !
 no bgp send-extra-data-zebra
-router bgp 2
+router bgp 65501
  bgp router-id 2.2.2.2
  no bgp ebgp-requires-policy
  no bgp default ipv4-unicast
- neighbor 2001::1 remote-as 1
+ neighbor 2001::1 remote-as 65500
  neighbor 2001::1 timers 3 10
  neighbor 2001::1 timers connect 1
  !
@@ -59,12 +59,15 @@ router bgp 2
   locator loc1
  !
 !
-router bgp 2 vrf vrf10
+router bgp 65501 vrf vrf10
  bgp router-id 2.2.2.2
  no bgp ebgp-requires-policy
  no bgp default ipv4-unicast
  !
+ neighbor 2001:2::2 remote-as 65501
  address-family ipv6 unicast
+  neighbor 2001:2::2 activate
+  neighbor 2001:2::2 default-originate
   sid vpn export auto
   rd vpn export 2:10
   rt vpn both 99:99
@@ -73,12 +76,18 @@ router bgp 2 vrf vrf10
   redistribute connected
  exit-address-family
 !
-router bgp 2 vrf vrf20
+router bgp 65501 vrf vrf20
  bgp router-id 2.2.2.2
  no bgp ebgp-requires-policy
  no bgp default ipv4-unicast
+ neighbor 2001:4::2 remote-as 65501
+ neighbor 2001:6::2 remote-as 65501
  !
  address-family ipv6 unicast
+  neighbor 2001:4::2 activate
+  neighbor 2001:4::2 default-originate
+  neighbor 2001:6::2 activate
+  neighbor 2001:6::2 default-originate
   sid vpn export auto
   rd vpn export 2:20
   rt vpn both 88:88

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vpnv6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vpnv6_rib.json
index 03bbcc008d9008456e5356767b566161b293c980..114fe1ca2532f8d689761968efc9785e3e92b062 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vpnv6_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vpnv6_rib.json
@@ -3,7 +3,7 @@
   "vrfName": "default",
   "routerId": "2.2.2.2",
   "defaultLocPrf": 100,
-  "localAS": 2,
+  "localAS": 65501,
   "routes": {
     "routeDistinguishers": {
       "1:10": {
@@ -19,7 +19,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::1",
-            "path": "1",
+            "path": "65500",
             "origin": "incomplete",
             "nexthops": [
               {
@@ -43,7 +43,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::1",
-            "path": "1",
+            "path": "65500",
             "origin": "incomplete",
             "nexthops": [
               {
@@ -69,7 +69,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::1",
-            "path": "1",
+            "path": "65500",
             "origin": "incomplete",
             "nexthops": [
               {

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vpnv6_rib_locator_deleted.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vpnv6_rib_locator_deleted.json
index 25cdf031c3de50a5e6f537732f3c80b852292b19..f0b764dcb281608f4514f9261717b58184e05d0c 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vpnv6_rib_locator_deleted.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vpnv6_rib_locator_deleted.json
@@ -3,7 +3,7 @@
   "vrfName": "default",
   "routerId": "2.2.2.2",
   "defaultLocPrf": 100,
-  "localAS": 2,
+  "localAS": 65501,
   "routes": {
     "routeDistinguishers": {
       "2:10": {

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vpnv6_rib_locator_recreated.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vpnv6_rib_locator_recreated.json
index 03bbcc008d9008456e5356767b566161b293c980..114fe1ca2532f8d689761968efc9785e3e92b062 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vpnv6_rib_locator_recreated.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vpnv6_rib_locator_recreated.json
@@ -3,7 +3,7 @@
   "vrfName": "default",
   "routerId": "2.2.2.2",
   "defaultLocPrf": 100,
-  "localAS": 2,
+  "localAS": 65501,
   "routes": {
     "routeDistinguishers": {
       "1:10": {
@@ -19,7 +19,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::1",
-            "path": "1",
+            "path": "65500",
             "origin": "incomplete",
             "nexthops": [
               {
@@ -43,7 +43,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::1",
-            "path": "1",
+            "path": "65500",
             "origin": "incomplete",
             "nexthops": [
               {
@@ -69,7 +69,7 @@
             "metric": 0,
             "weight": 0,
             "peerId": "2001::1",
-            "path": "1",
+            "path": "65500",
             "origin": "incomplete",
             "nexthops": [
               {

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/test_bgp_srv6l3vpn_to_bgp_vrf.py b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/test_bgp_srv6l3vpn_to_bgp_vrf.py
index 1010bb7bd0485c03c62bc9d977687af79e0da569..c30410d4dcccd2a10b791b5f4db65d4039d6b714 100755 (executable)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/test_bgp_srv6l3vpn_to_bgp_vrf.py
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/test_bgp_srv6l3vpn_to_bgp_vrf.py
@@ -212,7 +212,7 @@ def test_bgp_locator_unset():
     get_topogen().gears["r1"].vtysh_cmd(
         """
         configure terminal
-         router bgp 1
+         router bgp 65500
           segment-routing srv6
            no locator loc1
         """
@@ -227,7 +227,7 @@ def test_bgp_locator_reset():
     get_topogen().gears["r1"].vtysh_cmd(
         """
         configure terminal
-         router bgp 1
+         router bgp 65500
           segment-routing srv6
            locator loc1
         """
@@ -242,7 +242,7 @@ def test_bgp_srv6_unset():
     get_topogen().gears["r1"].vtysh_cmd(
         """
         configure terminal
-         router bgp 1
+         router bgp 65500
           no segment-routing srv6
         """
     )
@@ -256,7 +256,7 @@ def test_bgp_srv6_reset():
     get_topogen().gears["r1"].vtysh_cmd(
         """
         configure terminal
-         router bgp 1
+         router bgp 65500
           segment-routing srv6
            locator loc1
         """