diff --git a/tests/topotests/bgp_srv6_sid_reachability/r1/bgpd.conf b/tests/topotests/bgp_srv6_sid_reachability/r1/bgpd.conf index 573dbe0951ee..0d52defb6770 100644 --- 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 index 723d6fca2f7b..a96b415cd745 100644 --- 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 index c412cb6d29eb..d0abe17e8dbe 100644 --- 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 index 92315bce04c7..c16b51bad4e2 100755 --- 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 index e8c14ab08f57..ff5fb91b4ff8 100644 --- 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 index 88de28108a91..b388e33edcc5 100644 --- 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 index 443a64aa0a73..779d972608b6 100644 --- 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 index 80c1acff8bb9..b8b6c8048e6f 100644 --- 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 index 07ca64b45bf5..e8a754b61d70 100644 --- 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 index fac3d1d5f3ad..6a2b2e4396db 100644 --- 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 index 04e230535ec0..199a28b7a8d7 100644 --- 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 index 3cac156bb287..26632b159956 100644 --- 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 index 163e9d626ac6..749f04b85cf3 100644 --- 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 index 1313f20c6cfe..b4f14685c5cd 100644 --- 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 index 51f249b184f3..b4f17655051c 100644 --- 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 index 9579bb15de7c..bb6c8c8137e9 100644 --- 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 index 25f146f4b730..4e5e2d753900 100644 --- 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 index 446bb8eb3c64..21bb0d29314e 100644 --- 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 index 8bc2fc23f147..41a498adbb56 100644 --- 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::" } } ] diff --git a/tests/topotests/bgp_srv6l3vpn_sid/test_bgp_srv6l3vpn_sid.py b/tests/topotests/bgp_srv6l3vpn_sid/test_bgp_srv6l3vpn_sid.py index 984cf97e288b..8a6dc1bba23b 100755 --- a/tests/topotests/bgp_srv6l3vpn_sid/test_bgp_srv6l3vpn_sid.py +++ b/tests/topotests/bgp_srv6l3vpn_sid/test_bgp_srv6l3vpn_sid.py @@ -264,7 +264,7 @@ def test_sid_per_afv6_manual(): configure terminal router bgp 2 vrf vrf10 address-family ipv6 unicast - sid vpn export 8 + sid vpn export 65280 """ ) @@ -278,7 +278,7 @@ def test_sid_per_afv6_manual(): configure terminal router bgp 2 vrf vrf10 address-family ipv6 unicast - no sid vpn export 8 + no sid vpn export 65280 """ ) check_rib( @@ -340,7 +340,7 @@ def test_sid_per_afv4_manual(): configure terminal router bgp 2 vrf vrf10 address-family ipv4 unicast - sid vpn export 8 + sid vpn export 65280 """ ) @@ -352,7 +352,7 @@ def test_sid_per_afv4_manual(): configure terminal router bgp 2 vrf vrf10 address-family ipv4 unicast - no sid vpn export 8 + no sid vpn export 65280 """ ) check_ping("ce1", "192.168.2.2", False, 10, 0.5) @@ -406,7 +406,7 @@ def test_sid_per_vrf_manual(): """ configure terminal router bgp 2 vrf vrf10 - sid vpn per-vrf export 8 + sid vpn per-vrf export 65280 """ ) @@ -423,7 +423,7 @@ def test_sid_per_vrf_manual(): """ configure terminal router bgp 2 vrf vrf10 - no sid vpn per-vrf export 8 + no sid vpn per-vrf export 65280 """ ) diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf10_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf10_rib.json index 141c1cb957a0..092d2b6f42c1 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf10_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf10_rib.json @@ -50,7 +50,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:2:2:100::" + "segs": "2001:db8:2:2:40::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf20_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf20_rib.json index e20998061ff4..74f940175971 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf20_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf20_rib.json @@ -24,7 +24,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:2:2:200::" + "segs": "2001:db8:2:2:41::" } } ], @@ -82,7 +82,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:2:2:200::" + "segs": "2001:db8:2:2:41::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf index c84106f2bbfa..26cf7d15a970 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf @@ -26,7 +26,7 @@ segment-routing srv6 locators locator loc1 - prefix 2001:db8:1:1::/64 func-bits 8 + prefix 2001:db8:1:1::/64 func-bits 16 ! ! ! diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/bgpd.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/bgpd.conf index c2e8530273c3..be14c1e4979e 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/bgpd.conf +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/bgpd.conf @@ -9,15 +9,15 @@ log stdout notifications log commands ! !debug bgp neighbor-events -!debug bgp zebra +debug bgp zebra !debug bgp vnc verbose !debug bgp update-groups !debug bgp updates in !debug bgp updates out !debug bgp updates -!debug bgp vpn label -!debug bgp vpn leak-from-vrf -!debug bgp vpn leak-to-vrf +debug bgp vpn label +debug bgp vpn leak-from-vrf +debug bgp vpn leak-to-vrf !debug bgp vpn rmap-event ! router bgp 2 diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf10_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf10_rib.json index 7f8a930d002e..5c69122c21cb 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf10_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf10_rib.json @@ -24,7 +24,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:1:1:100::" + "segs": "2001:db8:1:1:40::" } } ], @@ -82,7 +82,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:1:1:100::" + "segs": "2001:db8:1:1:40::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf20_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf20_rib.json index 104bdc30d2b7..081bb0c02d27 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf20_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf20_rib.json @@ -50,7 +50,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:1:1:200::" + "segs": "2001:db8:1:1:41::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf index 5c12429ff2b9..a8e63a3d8b01 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf @@ -6,7 +6,7 @@ password zebra log stdout notifications log commands ! -! debug zebra packet +debug zebra packet ! debug zebra dplane ! debug zebra kernel ! @@ -26,7 +26,7 @@ segment-routing srv6 locators locator loc1 - prefix 2001:db8:2:2::/64 func-bits 8 + prefix 2001:db8:2:2::/64 func-bits 16 ! ! ! diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/vrf10_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/vrf10_rib.json index 8daa9b15522d..d64d80e83621 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/vrf10_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/vrf10_rib.json @@ -50,7 +50,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:2:2:100::" + "segs": "2001:db8:2:2:40::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/vrf20_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/vrf20_rib.json index 6f123cf4f264..00395bc471bc 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/vrf20_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/vrf20_rib.json @@ -24,7 +24,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:2:2:200::" + "segs": "2001:db8:2:2:41::" } } ], @@ -82,7 +82,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:2:2:200::" + "segs": "2001:db8:2:2:41::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/zebra.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/zebra.conf index f202493c53b3..02384f1629f7 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/zebra.conf +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/zebra.conf @@ -27,7 +27,7 @@ segment-routing srv6 locators locator loc1 - prefix 2001:db8:1:1::/64 func-bits 8 + prefix 2001:db8:1:1::/64 func-bits 16 ! ! ! diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/vrf10_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/vrf10_rib.json index 626803187465..9196784980a0 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/vrf10_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/vrf10_rib.json @@ -24,7 +24,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:1:1:100::" + "segs": "2001:db8:1:1:40::" } } ], @@ -82,7 +82,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:1:1:100::" + "segs": "2001:db8:1:1:40::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/vrf20_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/vrf20_rib.json index ffe2e07c8cc7..8487128f1bfb 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/vrf20_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/vrf20_rib.json @@ -50,7 +50,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:1:1:200::" + "segs": "2001:db8:1:1:41::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/zebra.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/zebra.conf index 9dfed4f2d62f..87b8b3d20413 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/zebra.conf +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/zebra.conf @@ -26,7 +26,7 @@ segment-routing srv6 locators locator loc1 - prefix 2001:db8:2:2::/64 func-bits 8 + prefix 2001:db8:2:2::/64 func-bits 16 ! ! ! diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_locator_deleted.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_locator_deleted.json index 5645540fbb2f..dd9dcb464d40 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_locator_deleted.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_locator_deleted.json @@ -9,9 +9,6 @@ "1:10": { "192.168.1.0/24": [ { - "valid": true, - "bestpath": true, - "selectionReason": "First path received", "pathFrom": "external", "prefix": "192.168.1.0", "prefixLen": 24, @@ -34,9 +31,6 @@ ], "192.168.3.0/24": [ { - "valid": true, - "bestpath": true, - "selectionReason": "First path received", "pathFrom": "external", "prefix": "192.168.3.0", "prefixLen": 24, @@ -61,9 +55,6 @@ "1:20": { "192.168.5.0/24": [ { - "valid": true, - "bestpath": true, - "selectionReason": "First path received", "pathFrom": "external", "prefix": "192.168.5.0", "prefixLen": 24, diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf10v4_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf10v4_rib.json index cc96f4318696..d64d80e83621 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf10v4_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf10v4_rib.json @@ -50,7 +50,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:2:2:1::" + "segs": "2001:db8:2:2:40::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf10v6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf10v6_rib.json index 0c9ae73ef9a3..092d2b6f42c1 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf10v6_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf10v6_rib.json @@ -50,7 +50,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:2:2:1::" + "segs": "2001:db8:2:2:40::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf20v4_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf20v4_rib.json index cf0fd188e169..00395bc471bc 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf20v4_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf20v4_rib.json @@ -24,7 +24,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:2:2:2::" + "segs": "2001:db8:2:2:41::" } } ], @@ -82,7 +82,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:2:2:2::" + "segs": "2001:db8:2:2:41::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf20v6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf20v6_rib.json index e486e74548d3..74f940175971 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf20v6_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vrf20v6_rib.json @@ -24,7 +24,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:2:2:2::" + "segs": "2001:db8:2:2:41::" } } ], @@ -82,7 +82,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:2:2:2::" + "segs": "2001:db8:2:2:41::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf10v4_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf10v4_rib.json index 1534e984b5a9..9196784980a0 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf10v4_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf10v4_rib.json @@ -24,7 +24,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:1:1:1::" + "segs": "2001:db8:1:1:40::" } } ], @@ -82,7 +82,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:1:1:1::" + "segs": "2001:db8:1:1:40::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf10v6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf10v6_rib.json index a2e329d0de67..5c69122c21cb 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf10v6_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf10v6_rib.json @@ -24,7 +24,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:1:1:1::" + "segs": "2001:db8:1:1:40::" } } ], @@ -82,7 +82,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:1:1:1::" + "segs": "2001:db8:1:1:40::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf20v4_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf20v4_rib.json index 49d18614ad07..8487128f1bfb 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf20v4_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf20v4_rib.json @@ -50,7 +50,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:1:1:2::" + "segs": "2001:db8:1:1:41::" } } ], diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf20v6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf20v6_rib.json index f7433d5d7210..081bb0c02d27 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf20v6_rib.json +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vrf20v6_rib.json @@ -50,7 +50,7 @@ "active": true, "weight": 1, "seg6": { - "segs": "2001:db8:1:1:2::" + "segs": "2001:db8:1:1:41::" } } ],