bgpd: Align SRv6 topotests with new SID Manager

Signed-off-by: Carmine Scarpitta <[email protected]>
FRRouting · May 6, 2024 · eea365a · eea365a
1 parent 5219085
commit eea365a
Show file tree

Hide file tree

Showing 42 changed files with 81 additions and 90 deletions.
diff --git a/tests/topotests/bgp_srv6_sid_reachability/r1/bgpd.conf b/tests/topotests/bgp_srv6_sid_reachability/r1/bgpd.conf
@@ -32,7 +32,7 @@ router bgp 65001 vrf vrf10
  !
  address-family ipv4 unicast
   redistribute connected
-  sid vpn export 1
+  sid vpn export 65280
   rd vpn export 65001:10
   rt vpn both 0:10
   import vpn
@@ -45,7 +45,7 @@ router bgp 65001 vrf vrf20
  !
  address-family ipv4 unicast
   redistribute connected
-  sid vpn export 2
+  sid vpn export 65281
   rd vpn export 65001:20
   rt vpn both 0:20
   import vpn

diff --git a/tests/topotests/bgp_srv6_sid_reachability/r2/bgpd.conf b/tests/topotests/bgp_srv6_sid_reachability/r2/bgpd.conf
@@ -27,7 +27,7 @@ router bgp 65002 vrf vrf10
  !
  address-family ipv4 unicast
   redistribute connected
-  sid vpn export 1
+  sid vpn export 65280
   rd vpn export 65002:10
   rt vpn both 0:10
   import vpn
@@ -40,7 +40,7 @@ router bgp 65002 vrf vrf20
  !
  address-family ipv4 unicast
   redistribute connected
-  sid vpn export 2
+  sid vpn export 65281
   rd vpn export 65002:20
   rt vpn both 0:20
   import vpn

diff --git a/tests/topotests/bgp_srv6_sid_reachability/r3/bgpd.conf b/tests/topotests/bgp_srv6_sid_reachability/r3/bgpd.conf
@@ -27,7 +27,7 @@ router bgp 65001 vrf vrf10
  !
  address-family ipv4 unicast
   redistribute connected
-  sid vpn export 1
+  sid vpn export 65280
   rd vpn export 65001:10
   rt vpn both 0:10
   import vpn
@@ -40,7 +40,7 @@ router bgp 65001 vrf vrf20
  !
  address-family ipv4 unicast
   redistribute connected
-  sid vpn export 2
+  sid vpn export 65281
   rd vpn export 65001:20
   rt vpn both 0:20
   import vpn

diff --git a/tests/topotests/bgp_srv6_sid_reachability/test_bgp_srv6_sid_reachability.py b/tests/topotests/bgp_srv6_sid_reachability/test_bgp_srv6_sid_reachability.py
@@ -141,7 +141,7 @@ def test_sid_unreachable_bgp_update():
         exit
         router bgp 65002 vrf vrf10
          address-family ipv4 unicast
-          no sid vpn export 1
+          no sid vpn export 65280
         """
     )
     check_ping("c11", "192.168.2.1", False, 10, 1)
@@ -158,7 +158,7 @@ def test_sid_reachable_again_bgp_update():
         exit
         router bgp 65002 vrf vrf10
          address-family ipv4 unicast
-          sid vpn export 1
+          sid vpn export 65280
         """
     )
     check_ping("c11", "192.168.2.1", True, 10, 1)

diff --git a/tests/topotests/bgp_srv6l3vpn_over_ipv6/r1/bgpd.conf b/tests/topotests/bgp_srv6l3vpn_over_ipv6/r1/bgpd.conf
@@ -33,7 +33,7 @@ router bgp 65001 vrf vrf10
  !
  address-family ipv4 unicast
   redistribute connected
-  sid vpn export 1
+  sid vpn export 65280
   rd vpn export 65001:10
   rt vpn both 0:10
   import vpn
@@ -46,7 +46,7 @@ router bgp 65001 vrf vrf20
  !
  address-family ipv4 unicast
   redistribute connected
-  sid vpn export 2
+  sid vpn export 65281
   rd vpn export 65001:20
   rt vpn both 0:20
   import vpn

diff --git a/tests/topotests/bgp_srv6l3vpn_over_ipv6/r2/bgpd.conf b/tests/topotests/bgp_srv6l3vpn_over_ipv6/r2/bgpd.conf
@@ -28,7 +28,7 @@ router bgp 65002 vrf vrf10
  !
  address-family ipv4 unicast
   redistribute connected
-  sid vpn export 1
+  sid vpn export 65280
   rd vpn export 65002:10
   rt vpn both 0:10
   import vpn
@@ -41,7 +41,7 @@ router bgp 65002 vrf vrf20
  !
  address-family ipv4 unicast
   redistribute connected
-  sid vpn export 2 
+  sid vpn export 65281
   rd vpn export 65002:20
   rt vpn both 0:20
   import vpn

diff --git a/tests/topotests/bgp_srv6l3vpn_over_ipv6/r3/bgpd.conf b/tests/topotests/bgp_srv6l3vpn_over_ipv6/r3/bgpd.conf
@@ -28,7 +28,7 @@ router bgp 65001 vrf vrf10
  !
  address-family ipv4 unicast
   redistribute connected
-  sid vpn export 1
+  sid vpn export 65280
   rd vpn export 65001:10
   rt vpn both 0:10
   import vpn
@@ -41,7 +41,7 @@ router bgp 65001 vrf vrf20
  !
  address-family ipv4 unicast
   redistribute connected
-  sid vpn export 2 
+  sid vpn export 65281
   rd vpn export 65001:20
   rt vpn both 0:20
   import vpn

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_auto_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_auto_sid_rib.json
@@ -36,14 +36,14 @@
           "fib":true,
           "afi":"ipv6",
           "labels":[
-            16
+            1024
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:2:2:1::"
+            "segs":"2001:db8:2:2:40::"
           }
         }
       ]

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_manual_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_manual_sid_rib.json
@@ -37,14 +37,14 @@
           "ip":"2001::2",
           "afi":"ipv6",
           "labels":[
-            128
+            1044480
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:2:2:8::"
+            "segs":"2001:db8:2:2:ff00::"
           }
         }
       ]

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_auto_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_auto_sid_rib.json
@@ -36,14 +36,14 @@
           "fib":true,
           "afi":"ipv6",
           "labels":[
-            32
+            1040
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:2:2:2::"
+            "segs":"2001:db8:2:2:41::"
           }
         }
       ]

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_manual_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_manual_sid_rib.json
@@ -36,14 +36,14 @@
           "fib":true,
           "afi":"ipv6",
           "labels":[
-            128
+            1044480
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:2:2:8::"
+            "segs":"2001:db8:2:2:ff00::"
           }
         }
       ]

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf4_auto_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf4_auto_sid_rib.json
@@ -37,14 +37,14 @@
           "ip":"2001::2",
           "afi":"ipv6",
           "labels":[
-            16
+            1024
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:2:2:1::"
+            "segs":"2001:db8:2:2:40::"
           }
         }
       ]

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf4_manual_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf4_manual_sid_rib.json
@@ -37,14 +37,14 @@
           "ip":"2001::2",
           "afi":"ipv6",
           "labels":[
-            128
+            1044480
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:2:2:8::"
+            "segs":"2001:db8:2:2:ff00::"
           }
         }
       ]

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf6_auto_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf6_auto_sid_rib.json
@@ -36,14 +36,14 @@
           "fib":true,
           "afi":"ipv6",
           "labels":[
-            16
+            1024
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:2:2:1::"
+            "segs":"2001:db8:2:2:40::"
           }
         }
       ]

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf6_manual_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf6_manual_sid_rib.json
@@ -36,14 +36,14 @@
           "fib":true,
           "afi":"ipv6",
           "labels":[
-            128
+            1044480
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:2:2:8::"
+            "segs":"2001:db8:2:2:ff00::"
           }
         }
       ]

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_rib.json
@@ -39,14 +39,14 @@
           "vrf":"default",
           "active":true,
           "labels":[
-            32
+            1040
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:2:2:2::"
+            "segs":"2001:db8:2:2:41::"
           }
         }
       ]

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf20_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf20_rib.json
@@ -18,14 +18,14 @@
           "vrf":"default",
           "active":true,
           "labels":[
-            48
+            1056
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:2:2:3::"
+            "segs":"2001:db8:2:2:42::"
           }
         }
       ]
@@ -71,14 +71,14 @@
           "vrf":"default",
           "active":true,
           "labels":[
-            48
+            1056
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:2:2:3::"
+            "segs":"2001:db8:2:2:42::"
           }
         }
       ]

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r2/vrf10_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r2/vrf10_rib.json
@@ -18,14 +18,14 @@
           "vrf":"default",
           "active":true,
           "labels":[
-            32
+            1040
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:1:1:2::"
+            "segs":"2001:db8:1:1:41::"
           }
         }
       ]
@@ -71,14 +71,14 @@
           "vrf":"default",
           "active":true,
           "labels":[
-            32
+            1040
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:1:1:2::"
+            "segs":"2001:db8:1:1:41::"
           }
         }
       ]

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r2/vrf20_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r2/vrf20_rib.json
@@ -39,14 +39,14 @@
           "vrf":"default",
           "active":true,
           "labels":[
-            48
+            1056
           ],
           "weight":1,
           "seg6local":{
             "action":"unspec"
           },
           "seg6":{
-            "segs":"2001:db8:1:1:3::"
+            "segs":"2001:db8:1:1:42::"
           }
         }
       ]