diff --git a/tests/topotests/bgp_isis_srv6_topo1/test_bgp_isis_srv6_topo1.py b/tests/topotests/bgp_isis_srv6_topo1/test_bgp_isis_srv6_topo1.py
index 4412b7595d34..6c0f9d37be8c 100644
--- a/tests/topotests/bgp_isis_srv6_topo1/test_bgp_isis_srv6_topo1.py
+++ b/tests/topotests/bgp_isis_srv6_topo1/test_bgp_isis_srv6_topo1.py
@@ -550,6 +550,7 @@ def test_isis_adjacencies_step3():
            locators
             locator loc1
              prefix fc00:0:1::/48
+             format usid-f3216
         """
     )
 
@@ -1216,6 +1217,7 @@ def test_isis_adjacencies_step9():
            locators
             locator loc1
              prefix fc00:0:1::/48
+             format usid-f3216
         """
     )
 
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/bgpd.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/bgpd.conf
index 8079bb0c2a3f..d18c4c8047b8 100644
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/bgpd.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/bgpd.conf
@@ -9,14 +9,14 @@ 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 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 1
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..1512f3d1a53e 100644
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/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: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/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..82964817a0d2 100644
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/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_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::"
           }
         }
       ],
diff --git a/tests/topotests/isis_srv6_topo1/rt1/isisd.conf b/tests/topotests/isis_srv6_topo1/rt1/isisd.conf
index 29e1a3117165..b966ee0083eb 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_srv6_topo1/rt1/isisd.conf
@@ -5,7 +5,7 @@ log file isisd.log
 ! debug isis events
 ! debug isis route-events
 ! debug isis spf-events
-! debug isis sr-events
+debug isis sr-events
 ! debug isis lsp-gen
 !
 interface lo
diff --git a/tests/topotests/isis_srv6_topo1/rt1/step1/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt1/step1/show_ipv6_route.ref
index 2d30fc4d17e2..630608e3b699 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt1/step1/show_ipv6_route.ref
@@ -223,9 +223,9 @@
       ]
     }
   ],
-  "fc00:0:1:1::\/64":[
+  "fc00:0:1:e000::\/64":[
     {
-      "prefix":"fc00:0:1:1::\/64",
+      "prefix":"fc00:0:1:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -245,9 +245,9 @@
       ]
     }
   ],
-  "fc00:0:1:2::\/64":[
+  "fc00:0:1:e001::\/64":[
     {
-      "prefix":"fc00:0:1:2::\/64",
+      "prefix":"fc00:0:1:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt1/step1/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt1/step1/show_srv6_locator_table.ref
index bb10aba9424d..c4a5d7507b45 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/step1/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt1/step1/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:1::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt1/step3/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt1/step3/show_ipv6_route.ref
index 2d30fc4d17e2..630608e3b699 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt1/step3/show_ipv6_route.ref
@@ -223,9 +223,9 @@
       ]
     }
   ],
-  "fc00:0:1:1::\/64":[
+  "fc00:0:1:e000::\/64":[
     {
-      "prefix":"fc00:0:1:1::\/64",
+      "prefix":"fc00:0:1:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -245,9 +245,9 @@
       ]
     }
   ],
-  "fc00:0:1:2::\/64":[
+  "fc00:0:1:e001::\/64":[
     {
-      "prefix":"fc00:0:1:2::\/64",
+      "prefix":"fc00:0:1:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt1/step3/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt1/step3/show_srv6_locator_table.ref
index bb10aba9424d..c4a5d7507b45 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/step3/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt1/step3/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:1::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt1/step4/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt1/step4/show_srv6_locator_table.ref
index f9561be5f238..c4a5d7507b45 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/step4/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt1/step4/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:1::/48",
-          "proto":"system"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt1/step5/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt1/step5/show_ipv6_route.ref
index 2d30fc4d17e2..630608e3b699 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt1/step5/show_ipv6_route.ref
@@ -223,9 +223,9 @@
       ]
     }
   ],
-  "fc00:0:1:1::\/64":[
+  "fc00:0:1:e000::\/64":[
     {
-      "prefix":"fc00:0:1:1::\/64",
+      "prefix":"fc00:0:1:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -245,9 +245,9 @@
       ]
     }
   ],
-  "fc00:0:1:2::\/64":[
+  "fc00:0:1:e001::\/64":[
     {
-      "prefix":"fc00:0:1:2::\/64",
+      "prefix":"fc00:0:1:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt1/step5/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt1/step5/show_srv6_locator_table.ref
index bb10aba9424d..c4a5d7507b45 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/step5/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt1/step5/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:1::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt1/step6/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt1/step6/show_srv6_locator_table.ref
index f9561be5f238..c4a5d7507b45 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/step6/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt1/step6/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:1::/48",
-          "proto":"system"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt1/step7/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt1/step7/show_ipv6_route.ref
index 2d30fc4d17e2..630608e3b699 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/step7/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt1/step7/show_ipv6_route.ref
@@ -223,9 +223,9 @@
       ]
     }
   ],
-  "fc00:0:1:1::\/64":[
+  "fc00:0:1:e000::\/64":[
     {
-      "prefix":"fc00:0:1:1::\/64",
+      "prefix":"fc00:0:1:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -245,9 +245,9 @@
       ]
     }
   ],
-  "fc00:0:1:2::\/64":[
+  "fc00:0:1:e001::\/64":[
     {
-      "prefix":"fc00:0:1:2::\/64",
+      "prefix":"fc00:0:1:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt1/step7/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt1/step7/show_srv6_locator_table.ref
index bb10aba9424d..c4a5d7507b45 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/step7/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt1/step7/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:1::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt1/step9/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt1/step9/show_ipv6_route.ref
index 2d30fc4d17e2..630608e3b699 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/step9/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt1/step9/show_ipv6_route.ref
@@ -223,9 +223,9 @@
       ]
     }
   ],
-  "fc00:0:1:1::\/64":[
+  "fc00:0:1:e000::\/64":[
     {
-      "prefix":"fc00:0:1:1::\/64",
+      "prefix":"fc00:0:1:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -245,9 +245,9 @@
       ]
     }
   ],
-  "fc00:0:1:2::\/64":[
+  "fc00:0:1:e001::\/64":[
     {
-      "prefix":"fc00:0:1:2::\/64",
+      "prefix":"fc00:0:1:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt1/step9/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt1/step9/show_srv6_locator_table.ref
index bb10aba9424d..c4a5d7507b45 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/step9/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt1/step9/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:1::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt1/zebra.conf b/tests/topotests/isis_srv6_topo1/rt1/zebra.conf
index 05f60fe82e62..cbe21503de66 100644
--- a/tests/topotests/isis_srv6_topo1/rt1/zebra.conf
+++ b/tests/topotests/isis_srv6_topo1/rt1/zebra.conf
@@ -2,6 +2,7 @@ log file zebra.log
 !
 hostname rt1
 !
+debug zebra packet
 ! debug zebra kernel
 ! debug zebra packet
 !
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step1/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt2/step1/show_ipv6_route.ref
index 150fa92241df..fc0f1d3bccd2 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step1/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:2:1::\/64":[
+  "fc00:0:2:e000::\/64":[
     {
-      "prefix":"fc00:0:2:1::\/64",
+      "prefix":"fc00:0:2:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:2:2::\/64":[
+  "fc00:0:2:e001::\/64":[
     {
-      "prefix":"fc00:0:2:2::\/64",
+      "prefix":"fc00:0:2:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:2:3::\/64":[
+  "fc00:0:2:e002::\/64":[
     {
-      "prefix":"fc00:0:2:3::\/64",
+      "prefix":"fc00:0:2:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:2:4::\/64":[
+  "fc00:0:2:e003::\/64":[
     {
-      "prefix":"fc00:0:2:4::\/64",
+      "prefix":"fc00:0:2:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step1/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt2/step1/show_srv6_locator_table.ref
index f3399319f3e5..f8a5d93f3c78 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step1/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step1/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:2::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step2/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt2/step2/show_ipv6_route.ref
index f9c2d098cc60..cd9b6b150431 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step2/show_ipv6_route.ref
@@ -240,9 +240,9 @@
       ]
     }
   ],
-  "fc00:0:2:1::\/64":[
+  "fc00:0:2:e000::\/64":[
     {
-      "prefix":"fc00:0:2:1::\/64",
+      "prefix":"fc00:0:2:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -261,9 +261,9 @@
       ]
     }
   ],
-  "fc00:0:2:2::\/64":[
+  "fc00:0:2:e001::\/64":[
     {
-      "prefix":"fc00:0:2:2::\/64",
+      "prefix":"fc00:0:2:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -282,9 +282,9 @@
       ]
     }
   ],
-  "fc00:0:2:3::\/64":[
+  "fc00:0:2:e002::\/64":[
     {
-      "prefix":"fc00:0:2:3::\/64",
+      "prefix":"fc00:0:2:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -303,9 +303,9 @@
       ]
     }
   ],
-  "fc00:0:2:4::\/64":[
+  "fc00:0:2:e003::\/64":[
     {
-      "prefix":"fc00:0:2:4::\/64",
+      "prefix":"fc00:0:2:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step2/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt2/step2/show_srv6_locator_table.ref
index f3399319f3e5..f8a5d93f3c78 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step2/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step2/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:2::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step3/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt2/step3/show_ipv6_route.ref
index 150fa92241df..fc0f1d3bccd2 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step3/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:2:1::\/64":[
+  "fc00:0:2:e000::\/64":[
     {
-      "prefix":"fc00:0:2:1::\/64",
+      "prefix":"fc00:0:2:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:2:2::\/64":[
+  "fc00:0:2:e001::\/64":[
     {
-      "prefix":"fc00:0:2:2::\/64",
+      "prefix":"fc00:0:2:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:2:3::\/64":[
+  "fc00:0:2:e002::\/64":[
     {
-      "prefix":"fc00:0:2:3::\/64",
+      "prefix":"fc00:0:2:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:2:4::\/64":[
+  "fc00:0:2:e003::\/64":[
     {
-      "prefix":"fc00:0:2:4::\/64",
+      "prefix":"fc00:0:2:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step3/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt2/step3/show_srv6_locator_table.ref
index f3399319f3e5..f8a5d93f3c78 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step3/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step3/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:2::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step4/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt2/step4/show_ipv6_route.ref
index f9c2d098cc60..cd9b6b150431 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step4/show_ipv6_route.ref
@@ -240,9 +240,9 @@
       ]
     }
   ],
-  "fc00:0:2:1::\/64":[
+  "fc00:0:2:e000::\/64":[
     {
-      "prefix":"fc00:0:2:1::\/64",
+      "prefix":"fc00:0:2:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -261,9 +261,9 @@
       ]
     }
   ],
-  "fc00:0:2:2::\/64":[
+  "fc00:0:2:e001::\/64":[
     {
-      "prefix":"fc00:0:2:2::\/64",
+      "prefix":"fc00:0:2:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -282,9 +282,9 @@
       ]
     }
   ],
-  "fc00:0:2:3::\/64":[
+  "fc00:0:2:e002::\/64":[
     {
-      "prefix":"fc00:0:2:3::\/64",
+      "prefix":"fc00:0:2:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -303,9 +303,9 @@
       ]
     }
   ],
-  "fc00:0:2:4::\/64":[
+  "fc00:0:2:e003::\/64":[
     {
-      "prefix":"fc00:0:2:4::\/64",
+      "prefix":"fc00:0:2:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step4/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt2/step4/show_srv6_locator_table.ref
index f3399319f3e5..f8a5d93f3c78 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step4/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step4/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:2::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step5/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt2/step5/show_ipv6_route.ref
index 150fa92241df..fc0f1d3bccd2 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step5/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:2:1::\/64":[
+  "fc00:0:2:e000::\/64":[
     {
-      "prefix":"fc00:0:2:1::\/64",
+      "prefix":"fc00:0:2:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:2:2::\/64":[
+  "fc00:0:2:e001::\/64":[
     {
-      "prefix":"fc00:0:2:2::\/64",
+      "prefix":"fc00:0:2:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:2:3::\/64":[
+  "fc00:0:2:e002::\/64":[
     {
-      "prefix":"fc00:0:2:3::\/64",
+      "prefix":"fc00:0:2:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:2:4::\/64":[
+  "fc00:0:2:e003::\/64":[
     {
-      "prefix":"fc00:0:2:4::\/64",
+      "prefix":"fc00:0:2:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step5/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt2/step5/show_srv6_locator_table.ref
index f3399319f3e5..f8a5d93f3c78 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step5/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step5/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:2::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step6/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt2/step6/show_ipv6_route.ref
index f9c2d098cc60..cd9b6b150431 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step6/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step6/show_ipv6_route.ref
@@ -240,9 +240,9 @@
       ]
     }
   ],
-  "fc00:0:2:1::\/64":[
+  "fc00:0:2:e000::\/64":[
     {
-      "prefix":"fc00:0:2:1::\/64",
+      "prefix":"fc00:0:2:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -261,9 +261,9 @@
       ]
     }
   ],
-  "fc00:0:2:2::\/64":[
+  "fc00:0:2:e001::\/64":[
     {
-      "prefix":"fc00:0:2:2::\/64",
+      "prefix":"fc00:0:2:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -282,9 +282,9 @@
       ]
     }
   ],
-  "fc00:0:2:3::\/64":[
+  "fc00:0:2:e002::\/64":[
     {
-      "prefix":"fc00:0:2:3::\/64",
+      "prefix":"fc00:0:2:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -303,9 +303,9 @@
       ]
     }
   ],
-  "fc00:0:2:4::\/64":[
+  "fc00:0:2:e003::\/64":[
     {
-      "prefix":"fc00:0:2:4::\/64",
+      "prefix":"fc00:0:2:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step6/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt2/step6/show_srv6_locator_table.ref
index f3399319f3e5..f8a5d93f3c78 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step6/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step6/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:2::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step7/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt2/step7/show_ipv6_route.ref
index 150fa92241df..fc0f1d3bccd2 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step7/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step7/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:2:1::\/64":[
+  "fc00:0:2:e000::\/64":[
     {
-      "prefix":"fc00:0:2:1::\/64",
+      "prefix":"fc00:0:2:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:2:2::\/64":[
+  "fc00:0:2:e001::\/64":[
     {
-      "prefix":"fc00:0:2:2::\/64",
+      "prefix":"fc00:0:2:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:2:3::\/64":[
+  "fc00:0:2:e002::\/64":[
     {
-      "prefix":"fc00:0:2:3::\/64",
+      "prefix":"fc00:0:2:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:2:4::\/64":[
+  "fc00:0:2:e003::\/64":[
     {
-      "prefix":"fc00:0:2:4::\/64",
+      "prefix":"fc00:0:2:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step7/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt2/step7/show_srv6_locator_table.ref
index f3399319f3e5..f8a5d93f3c78 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step7/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step7/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:2::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step8/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt2/step8/show_ipv6_route.ref
index f9c2d098cc60..cd9b6b150431 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step8/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step8/show_ipv6_route.ref
@@ -240,9 +240,9 @@
       ]
     }
   ],
-  "fc00:0:2:1::\/64":[
+  "fc00:0:2:e000::\/64":[
     {
-      "prefix":"fc00:0:2:1::\/64",
+      "prefix":"fc00:0:2:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -261,9 +261,9 @@
       ]
     }
   ],
-  "fc00:0:2:2::\/64":[
+  "fc00:0:2:e001::\/64":[
     {
-      "prefix":"fc00:0:2:2::\/64",
+      "prefix":"fc00:0:2:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -282,9 +282,9 @@
       ]
     }
   ],
-  "fc00:0:2:3::\/64":[
+  "fc00:0:2:e002::\/64":[
     {
-      "prefix":"fc00:0:2:3::\/64",
+      "prefix":"fc00:0:2:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -303,9 +303,9 @@
       ]
     }
   ],
-  "fc00:0:2:4::\/64":[
+  "fc00:0:2:e003::\/64":[
     {
-      "prefix":"fc00:0:2:4::\/64",
+      "prefix":"fc00:0:2:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step8/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt2/step8/show_srv6_locator_table.ref
index f3399319f3e5..f8a5d93f3c78 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step8/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step8/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:2::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step9/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt2/step9/show_ipv6_route.ref
index 150fa92241df..fc0f1d3bccd2 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step9/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step9/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:2:1::\/64":[
+  "fc00:0:2:e000::\/64":[
     {
-      "prefix":"fc00:0:2:1::\/64",
+      "prefix":"fc00:0:2:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:2:2::\/64":[
+  "fc00:0:2:e001::\/64":[
     {
-      "prefix":"fc00:0:2:2::\/64",
+      "prefix":"fc00:0:2:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:2:3::\/64":[
+  "fc00:0:2:e002::\/64":[
     {
-      "prefix":"fc00:0:2:3::\/64",
+      "prefix":"fc00:0:2:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:2:4::\/64":[
+  "fc00:0:2:e003::\/64":[
     {
-      "prefix":"fc00:0:2:4::\/64",
+      "prefix":"fc00:0:2:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt2/step9/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt2/step9/show_srv6_locator_table.ref
index f3399319f3e5..f8a5d93f3c78 100644
--- a/tests/topotests/isis_srv6_topo1/rt2/step9/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt2/step9/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:2::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step1/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt3/step1/show_ipv6_route.ref
index fc0e5161c221..c590fcfdbc4a 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step1/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:3:1::\/64":[
+  "fc00:0:3:e000::\/64":[
     {
-      "prefix":"fc00:0:3:1::\/64",
+      "prefix":"fc00:0:3:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:3:2::\/64":[
+  "fc00:0:3:e001::\/64":[
     {
-      "prefix":"fc00:0:3:2::\/64",
+      "prefix":"fc00:0:3:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:3:3::\/64":[
+  "fc00:0:3:e002::\/64":[
     {
-      "prefix":"fc00:0:3:3::\/64",
+      "prefix":"fc00:0:3:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:3:4::\/64":[
+  "fc00:0:3:e003::\/64":[
     {
-      "prefix":"fc00:0:3:4::\/64",
+      "prefix":"fc00:0:3:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step1/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt3/step1/show_srv6_locator_table.ref
index ffa626123da8..c62870587bf3 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step1/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step1/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:3::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step2/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt3/step2/show_ipv6_route.ref
index a24d95e78ed7..bf79b1c4017d 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step2/show_ipv6_route.ref
@@ -240,9 +240,9 @@
       ]
     }
   ],
-  "fc00:0:3:1::\/64":[
+  "fc00:0:3:e000::\/64":[
     {
-      "prefix":"fc00:0:3:1::\/64",
+      "prefix":"fc00:0:3:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -261,9 +261,9 @@
       ]
     }
   ],
-  "fc00:0:3:2::\/64":[
+  "fc00:0:3:e001::\/64":[
     {
-      "prefix":"fc00:0:3:2::\/64",
+      "prefix":"fc00:0:3:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -282,9 +282,9 @@
       ]
     }
   ],
-  "fc00:0:3:3::\/64":[
+  "fc00:0:3:e002::\/64":[
     {
-      "prefix":"fc00:0:3:3::\/64",
+      "prefix":"fc00:0:3:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -303,9 +303,9 @@
       ]
     }
   ],
-  "fc00:0:3:4::\/64":[
+  "fc00:0:3:e003::\/64":[
     {
-      "prefix":"fc00:0:3:4::\/64",
+      "prefix":"fc00:0:3:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step2/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt3/step2/show_srv6_locator_table.ref
index ffa626123da8..c62870587bf3 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step2/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step2/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:3::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step3/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt3/step3/show_ipv6_route.ref
index fc0e5161c221..c590fcfdbc4a 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step3/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:3:1::\/64":[
+  "fc00:0:3:e000::\/64":[
     {
-      "prefix":"fc00:0:3:1::\/64",
+      "prefix":"fc00:0:3:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:3:2::\/64":[
+  "fc00:0:3:e001::\/64":[
     {
-      "prefix":"fc00:0:3:2::\/64",
+      "prefix":"fc00:0:3:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:3:3::\/64":[
+  "fc00:0:3:e002::\/64":[
     {
-      "prefix":"fc00:0:3:3::\/64",
+      "prefix":"fc00:0:3:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:3:4::\/64":[
+  "fc00:0:3:e003::\/64":[
     {
-      "prefix":"fc00:0:3:4::\/64",
+      "prefix":"fc00:0:3:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step3/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt3/step3/show_srv6_locator_table.ref
index ffa626123da8..c62870587bf3 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step3/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step3/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:3::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step4/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt3/step4/show_ipv6_route.ref
index a24d95e78ed7..bf79b1c4017d 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step4/show_ipv6_route.ref
@@ -240,9 +240,9 @@
       ]
     }
   ],
-  "fc00:0:3:1::\/64":[
+  "fc00:0:3:e000::\/64":[
     {
-      "prefix":"fc00:0:3:1::\/64",
+      "prefix":"fc00:0:3:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -261,9 +261,9 @@
       ]
     }
   ],
-  "fc00:0:3:2::\/64":[
+  "fc00:0:3:e001::\/64":[
     {
-      "prefix":"fc00:0:3:2::\/64",
+      "prefix":"fc00:0:3:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -282,9 +282,9 @@
       ]
     }
   ],
-  "fc00:0:3:3::\/64":[
+  "fc00:0:3:e002::\/64":[
     {
-      "prefix":"fc00:0:3:3::\/64",
+      "prefix":"fc00:0:3:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -303,9 +303,9 @@
       ]
     }
   ],
-  "fc00:0:3:4::\/64":[
+  "fc00:0:3:e003::\/64":[
     {
-      "prefix":"fc00:0:3:4::\/64",
+      "prefix":"fc00:0:3:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step4/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt3/step4/show_srv6_locator_table.ref
index ffa626123da8..c62870587bf3 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step4/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step4/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:3::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step5/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt3/step5/show_ipv6_route.ref
index fc0e5161c221..c590fcfdbc4a 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step5/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:3:1::\/64":[
+  "fc00:0:3:e000::\/64":[
     {
-      "prefix":"fc00:0:3:1::\/64",
+      "prefix":"fc00:0:3:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:3:2::\/64":[
+  "fc00:0:3:e001::\/64":[
     {
-      "prefix":"fc00:0:3:2::\/64",
+      "prefix":"fc00:0:3:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:3:3::\/64":[
+  "fc00:0:3:e002::\/64":[
     {
-      "prefix":"fc00:0:3:3::\/64",
+      "prefix":"fc00:0:3:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:3:4::\/64":[
+  "fc00:0:3:e003::\/64":[
     {
-      "prefix":"fc00:0:3:4::\/64",
+      "prefix":"fc00:0:3:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step5/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt3/step5/show_srv6_locator_table.ref
index ffa626123da8..c62870587bf3 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step5/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step5/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:3::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step6/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt3/step6/show_ipv6_route.ref
index a24d95e78ed7..bf79b1c4017d 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step6/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step6/show_ipv6_route.ref
@@ -240,9 +240,9 @@
       ]
     }
   ],
-  "fc00:0:3:1::\/64":[
+  "fc00:0:3:e000::\/64":[
     {
-      "prefix":"fc00:0:3:1::\/64",
+      "prefix":"fc00:0:3:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -261,9 +261,9 @@
       ]
     }
   ],
-  "fc00:0:3:2::\/64":[
+  "fc00:0:3:e001::\/64":[
     {
-      "prefix":"fc00:0:3:2::\/64",
+      "prefix":"fc00:0:3:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -282,9 +282,9 @@
       ]
     }
   ],
-  "fc00:0:3:3::\/64":[
+  "fc00:0:3:e002::\/64":[
     {
-      "prefix":"fc00:0:3:3::\/64",
+      "prefix":"fc00:0:3:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -303,9 +303,9 @@
       ]
     }
   ],
-  "fc00:0:3:4::\/64":[
+  "fc00:0:3:e003::\/64":[
     {
-      "prefix":"fc00:0:3:4::\/64",
+      "prefix":"fc00:0:3:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step6/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt3/step6/show_srv6_locator_table.ref
index ffa626123da8..c62870587bf3 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step6/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step6/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:3::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step7/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt3/step7/show_ipv6_route.ref
index fc0e5161c221..c590fcfdbc4a 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step7/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step7/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:3:1::\/64":[
+  "fc00:0:3:e000::\/64":[
     {
-      "prefix":"fc00:0:3:1::\/64",
+      "prefix":"fc00:0:3:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:3:2::\/64":[
+  "fc00:0:3:e001::\/64":[
     {
-      "prefix":"fc00:0:3:2::\/64",
+      "prefix":"fc00:0:3:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:3:3::\/64":[
+  "fc00:0:3:e002::\/64":[
     {
-      "prefix":"fc00:0:3:3::\/64",
+      "prefix":"fc00:0:3:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:3:4::\/64":[
+  "fc00:0:3:e003::\/64":[
     {
-      "prefix":"fc00:0:3:4::\/64",
+      "prefix":"fc00:0:3:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step7/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt3/step7/show_srv6_locator_table.ref
index ffa626123da8..c62870587bf3 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step7/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step7/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:3::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step8/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt3/step8/show_ipv6_route.ref
index a24d95e78ed7..bf79b1c4017d 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step8/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step8/show_ipv6_route.ref
@@ -240,9 +240,9 @@
       ]
     }
   ],
-  "fc00:0:3:1::\/64":[
+  "fc00:0:3:e000::\/64":[
     {
-      "prefix":"fc00:0:3:1::\/64",
+      "prefix":"fc00:0:3:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -261,9 +261,9 @@
       ]
     }
   ],
-  "fc00:0:3:2::\/64":[
+  "fc00:0:3:e001::\/64":[
     {
-      "prefix":"fc00:0:3:2::\/64",
+      "prefix":"fc00:0:3:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -282,9 +282,9 @@
       ]
     }
   ],
-  "fc00:0:3:3::\/64":[
+  "fc00:0:3:e002::\/64":[
     {
-      "prefix":"fc00:0:3:3::\/64",
+      "prefix":"fc00:0:3:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -303,9 +303,9 @@
       ]
     }
   ],
-  "fc00:0:3:4::\/64":[
+  "fc00:0:3:e003::\/64":[
     {
-      "prefix":"fc00:0:3:4::\/64",
+      "prefix":"fc00:0:3:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step8/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt3/step8/show_srv6_locator_table.ref
index ffa626123da8..c62870587bf3 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step8/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step8/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:3::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step9/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt3/step9/show_ipv6_route.ref
index fc0e5161c221..c590fcfdbc4a 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step9/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step9/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:3:1::\/64":[
+  "fc00:0:3:e000::\/64":[
     {
-      "prefix":"fc00:0:3:1::\/64",
+      "prefix":"fc00:0:3:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:3:2::\/64":[
+  "fc00:0:3:e001::\/64":[
     {
-      "prefix":"fc00:0:3:2::\/64",
+      "prefix":"fc00:0:3:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:3:3::\/64":[
+  "fc00:0:3:e002::\/64":[
     {
-      "prefix":"fc00:0:3:3::\/64",
+      "prefix":"fc00:0:3:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:3:4::\/64":[
+  "fc00:0:3:e003::\/64":[
     {
-      "prefix":"fc00:0:3:4::\/64",
+      "prefix":"fc00:0:3:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt3/step9/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt3/step9/show_srv6_locator_table.ref
index ffa626123da8..c62870587bf3 100644
--- a/tests/topotests/isis_srv6_topo1/rt3/step9/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt3/step9/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:3::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step1/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt4/step1/show_ipv6_route.ref
index 2878c24cc85d..7b575f1888fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step1/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:4:1::\/64":[
+  "fc00:0:4:e000::\/64":[
     {
-      "prefix":"fc00:0:4:1::\/64",
+      "prefix":"fc00:0:4:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:4:2::\/64":[
+  "fc00:0:4:e001::\/64":[
     {
-      "prefix":"fc00:0:4:2::\/64",
+      "prefix":"fc00:0:4:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:4:3::\/64":[
+  "fc00:0:4:e002::\/64":[
     {
-      "prefix":"fc00:0:4:3::\/64",
+      "prefix":"fc00:0:4:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:4:4::\/64":[
+  "fc00:0:4:e003::\/64":[
     {
-      "prefix":"fc00:0:4:4::\/64",
+      "prefix":"fc00:0:4:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step1/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt4/step1/show_srv6_locator_table.ref
index 189943f737a5..cb052dbbb5fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step1/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step1/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:4::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step2/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt4/step2/show_ipv6_route.ref
index bea54ba6b282..bfae6fbce3d1 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step2/show_ipv6_route.ref
@@ -234,9 +234,9 @@
       ]
     }
   ],
-  "fc00:0:4:1::\/64":[
+  "fc00:0:4:e000::\/64":[
     {
-      "prefix":"fc00:0:4:1::\/64",
+      "prefix":"fc00:0:4:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -255,9 +255,9 @@
       ]
     }
   ],
-  "fc00:0:4:2::\/64":[
+  "fc00:0:4:e001::\/64":[
     {
-      "prefix":"fc00:0:4:2::\/64",
+      "prefix":"fc00:0:4:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -276,9 +276,9 @@
       ]
     }
   ],
-  "fc00:0:4:3::\/64":[
+  "fc00:0:4:e002::\/64":[
     {
-      "prefix":"fc00:0:4:3::\/64",
+      "prefix":"fc00:0:4:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -297,9 +297,9 @@
       ]
     }
   ],
-  "fc00:0:4:4::\/64":[
+  "fc00:0:4:e003::\/64":[
     {
-      "prefix":"fc00:0:4:4::\/64",
+      "prefix":"fc00:0:4:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step2/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt4/step2/show_srv6_locator_table.ref
index 189943f737a5..cb052dbbb5fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step2/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step2/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:4::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step3/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt4/step3/show_ipv6_route.ref
index 2878c24cc85d..7b575f1888fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step3/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:4:1::\/64":[
+  "fc00:0:4:e000::\/64":[
     {
-      "prefix":"fc00:0:4:1::\/64",
+      "prefix":"fc00:0:4:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:4:2::\/64":[
+  "fc00:0:4:e001::\/64":[
     {
-      "prefix":"fc00:0:4:2::\/64",
+      "prefix":"fc00:0:4:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:4:3::\/64":[
+  "fc00:0:4:e002::\/64":[
     {
-      "prefix":"fc00:0:4:3::\/64",
+      "prefix":"fc00:0:4:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:4:4::\/64":[
+  "fc00:0:4:e003::\/64":[
     {
-      "prefix":"fc00:0:4:4::\/64",
+      "prefix":"fc00:0:4:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step3/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt4/step3/show_srv6_locator_table.ref
index 189943f737a5..cb052dbbb5fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step3/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step3/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:4::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step4/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt4/step4/show_ipv6_route.ref
index bea54ba6b282..bfae6fbce3d1 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step4/show_ipv6_route.ref
@@ -234,9 +234,9 @@
       ]
     }
   ],
-  "fc00:0:4:1::\/64":[
+  "fc00:0:4:e000::\/64":[
     {
-      "prefix":"fc00:0:4:1::\/64",
+      "prefix":"fc00:0:4:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -255,9 +255,9 @@
       ]
     }
   ],
-  "fc00:0:4:2::\/64":[
+  "fc00:0:4:e001::\/64":[
     {
-      "prefix":"fc00:0:4:2::\/64",
+      "prefix":"fc00:0:4:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -276,9 +276,9 @@
       ]
     }
   ],
-  "fc00:0:4:3::\/64":[
+  "fc00:0:4:e002::\/64":[
     {
-      "prefix":"fc00:0:4:3::\/64",
+      "prefix":"fc00:0:4:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -297,9 +297,9 @@
       ]
     }
   ],
-  "fc00:0:4:4::\/64":[
+  "fc00:0:4:e003::\/64":[
     {
-      "prefix":"fc00:0:4:4::\/64",
+      "prefix":"fc00:0:4:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step4/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt4/step4/show_srv6_locator_table.ref
index 189943f737a5..cb052dbbb5fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step4/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step4/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:4::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step5/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt4/step5/show_ipv6_route.ref
index 2878c24cc85d..7b575f1888fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step5/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:4:1::\/64":[
+  "fc00:0:4:e000::\/64":[
     {
-      "prefix":"fc00:0:4:1::\/64",
+      "prefix":"fc00:0:4:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:4:2::\/64":[
+  "fc00:0:4:e001::\/64":[
     {
-      "prefix":"fc00:0:4:2::\/64",
+      "prefix":"fc00:0:4:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:4:3::\/64":[
+  "fc00:0:4:e002::\/64":[
     {
-      "prefix":"fc00:0:4:3::\/64",
+      "prefix":"fc00:0:4:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:4:4::\/64":[
+  "fc00:0:4:e003::\/64":[
     {
-      "prefix":"fc00:0:4:4::\/64",
+      "prefix":"fc00:0:4:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step5/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt4/step5/show_srv6_locator_table.ref
index 189943f737a5..cb052dbbb5fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step5/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step5/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:4::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step6/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt4/step6/show_ipv6_route.ref
index bea54ba6b282..bfae6fbce3d1 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step6/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step6/show_ipv6_route.ref
@@ -234,9 +234,9 @@
       ]
     }
   ],
-  "fc00:0:4:1::\/64":[
+  "fc00:0:4:e000::\/64":[
     {
-      "prefix":"fc00:0:4:1::\/64",
+      "prefix":"fc00:0:4:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -255,9 +255,9 @@
       ]
     }
   ],
-  "fc00:0:4:2::\/64":[
+  "fc00:0:4:e001::\/64":[
     {
-      "prefix":"fc00:0:4:2::\/64",
+      "prefix":"fc00:0:4:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -276,9 +276,9 @@
       ]
     }
   ],
-  "fc00:0:4:3::\/64":[
+  "fc00:0:4:e002::\/64":[
     {
-      "prefix":"fc00:0:4:3::\/64",
+      "prefix":"fc00:0:4:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -297,9 +297,9 @@
       ]
     }
   ],
-  "fc00:0:4:4::\/64":[
+  "fc00:0:4:e003::\/64":[
     {
-      "prefix":"fc00:0:4:4::\/64",
+      "prefix":"fc00:0:4:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step6/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt4/step6/show_srv6_locator_table.ref
index 189943f737a5..cb052dbbb5fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step6/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step6/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:4::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step7/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt4/step7/show_ipv6_route.ref
index 2878c24cc85d..7b575f1888fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step7/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step7/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:4:1::\/64":[
+  "fc00:0:4:e000::\/64":[
     {
-      "prefix":"fc00:0:4:1::\/64",
+      "prefix":"fc00:0:4:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:4:2::\/64":[
+  "fc00:0:4:e001::\/64":[
     {
-      "prefix":"fc00:0:4:2::\/64",
+      "prefix":"fc00:0:4:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:4:3::\/64":[
+  "fc00:0:4:e002::\/64":[
     {
-      "prefix":"fc00:0:4:3::\/64",
+      "prefix":"fc00:0:4:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:4:4::\/64":[
+  "fc00:0:4:e003::\/64":[
     {
-      "prefix":"fc00:0:4:4::\/64",
+      "prefix":"fc00:0:4:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step7/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt4/step7/show_srv6_locator_table.ref
index 189943f737a5..cb052dbbb5fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step7/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step7/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:4::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step8/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt4/step8/show_ipv6_route.ref
index bea54ba6b282..bfae6fbce3d1 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step8/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step8/show_ipv6_route.ref
@@ -234,9 +234,9 @@
       ]
     }
   ],
-  "fc00:0:4:1::\/64":[
+  "fc00:0:4:e000::\/64":[
     {
-      "prefix":"fc00:0:4:1::\/64",
+      "prefix":"fc00:0:4:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -255,9 +255,9 @@
       ]
     }
   ],
-  "fc00:0:4:2::\/64":[
+  "fc00:0:4:e001::\/64":[
     {
-      "prefix":"fc00:0:4:2::\/64",
+      "prefix":"fc00:0:4:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -276,9 +276,9 @@
       ]
     }
   ],
-  "fc00:0:4:3::\/64":[
+  "fc00:0:4:e002::\/64":[
     {
-      "prefix":"fc00:0:4:3::\/64",
+      "prefix":"fc00:0:4:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -297,9 +297,9 @@
       ]
     }
   ],
-  "fc00:0:4:4::\/64":[
+  "fc00:0:4:e003::\/64":[
     {
-      "prefix":"fc00:0:4:4::\/64",
+      "prefix":"fc00:0:4:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step8/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt4/step8/show_srv6_locator_table.ref
index 189943f737a5..cb052dbbb5fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step8/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step8/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:4::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step9/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt4/step9/show_ipv6_route.ref
index 2878c24cc85d..7b575f1888fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step9/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step9/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:4:1::\/64":[
+  "fc00:0:4:e000::\/64":[
     {
-      "prefix":"fc00:0:4:1::\/64",
+      "prefix":"fc00:0:4:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:4:2::\/64":[
+  "fc00:0:4:e001::\/64":[
     {
-      "prefix":"fc00:0:4:2::\/64",
+      "prefix":"fc00:0:4:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:4:3::\/64":[
+  "fc00:0:4:e002::\/64":[
     {
-      "prefix":"fc00:0:4:3::\/64",
+      "prefix":"fc00:0:4:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:4:4::\/64":[
+  "fc00:0:4:e003::\/64":[
     {
-      "prefix":"fc00:0:4:4::\/64",
+      "prefix":"fc00:0:4:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt4/step9/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt4/step9/show_srv6_locator_table.ref
index 189943f737a5..cb052dbbb5fb 100644
--- a/tests/topotests/isis_srv6_topo1/rt4/step9/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt4/step9/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:4::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step1/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt5/step1/show_ipv6_route.ref
index d6ad4c2aad24..a7b3262f8631 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step1/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:5:1::\/64":[
+  "fc00:0:5:e000::\/64":[
     {
-      "prefix":"fc00:0:5:1::\/64",
+      "prefix":"fc00:0:5:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:5:2::\/64":[
+  "fc00:0:5:e001::\/64":[
     {
-      "prefix":"fc00:0:5:2::\/64",
+      "prefix":"fc00:0:5:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:5:3::\/64":[
+  "fc00:0:5:e002::\/64":[
     {
-      "prefix":"fc00:0:5:3::\/64",
+      "prefix":"fc00:0:5:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:5:4::\/64":[
+  "fc00:0:5:e003::\/64":[
     {
-      "prefix":"fc00:0:5:4::\/64",
+      "prefix":"fc00:0:5:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step1/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt5/step1/show_srv6_locator_table.ref
index 54780fce8adc..ec55f24d7b95 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step1/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step1/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:5::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step2/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt5/step2/show_ipv6_route.ref
index c24527017709..aa3dea1662c4 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step2/show_ipv6_route.ref
@@ -234,9 +234,9 @@
       ]
     }
   ],
-  "fc00:0:5:1::\/64":[
+  "fc00:0:5:e000::\/64":[
     {
-      "prefix":"fc00:0:5:1::\/64",
+      "prefix":"fc00:0:5:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -255,9 +255,9 @@
       ]
     }
   ],
-  "fc00:0:5:2::\/64":[
+  "fc00:0:5:e001::\/64":[
     {
-      "prefix":"fc00:0:5:2::\/64",
+      "prefix":"fc00:0:5:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -276,9 +276,9 @@
       ]
     }
   ],
-  "fc00:0:5:3::\/64":[
+  "fc00:0:5:e002::\/64":[
     {
-      "prefix":"fc00:0:5:3::\/64",
+      "prefix":"fc00:0:5:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -297,9 +297,9 @@
       ]
     }
   ],
-  "fc00:0:5:4::\/64":[
+  "fc00:0:5:e003::\/64":[
     {
-      "prefix":"fc00:0:5:4::\/64",
+      "prefix":"fc00:0:5:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step2/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt5/step2/show_srv6_locator_table.ref
index 54780fce8adc..ec55f24d7b95 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step2/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step2/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:5::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step3/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt5/step3/show_ipv6_route.ref
index d6ad4c2aad24..a7b3262f8631 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step3/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:5:1::\/64":[
+  "fc00:0:5:e000::\/64":[
     {
-      "prefix":"fc00:0:5:1::\/64",
+      "prefix":"fc00:0:5:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:5:2::\/64":[
+  "fc00:0:5:e001::\/64":[
     {
-      "prefix":"fc00:0:5:2::\/64",
+      "prefix":"fc00:0:5:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:5:3::\/64":[
+  "fc00:0:5:e002::\/64":[
     {
-      "prefix":"fc00:0:5:3::\/64",
+      "prefix":"fc00:0:5:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:5:4::\/64":[
+  "fc00:0:5:e003::\/64":[
     {
-      "prefix":"fc00:0:5:4::\/64",
+      "prefix":"fc00:0:5:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step3/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt5/step3/show_srv6_locator_table.ref
index 54780fce8adc..ec55f24d7b95 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step3/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step3/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:5::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step4/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt5/step4/show_ipv6_route.ref
index c24527017709..aa3dea1662c4 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step4/show_ipv6_route.ref
@@ -234,9 +234,9 @@
       ]
     }
   ],
-  "fc00:0:5:1::\/64":[
+  "fc00:0:5:e000::\/64":[
     {
-      "prefix":"fc00:0:5:1::\/64",
+      "prefix":"fc00:0:5:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -255,9 +255,9 @@
       ]
     }
   ],
-  "fc00:0:5:2::\/64":[
+  "fc00:0:5:e001::\/64":[
     {
-      "prefix":"fc00:0:5:2::\/64",
+      "prefix":"fc00:0:5:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -276,9 +276,9 @@
       ]
     }
   ],
-  "fc00:0:5:3::\/64":[
+  "fc00:0:5:e002::\/64":[
     {
-      "prefix":"fc00:0:5:3::\/64",
+      "prefix":"fc00:0:5:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -297,9 +297,9 @@
       ]
     }
   ],
-  "fc00:0:5:4::\/64":[
+  "fc00:0:5:e003::\/64":[
     {
-      "prefix":"fc00:0:5:4::\/64",
+      "prefix":"fc00:0:5:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step4/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt5/step4/show_srv6_locator_table.ref
index 54780fce8adc..ec55f24d7b95 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step4/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step4/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:5::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step5/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt5/step5/show_ipv6_route.ref
index d6ad4c2aad24..a7b3262f8631 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step5/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:5:1::\/64":[
+  "fc00:0:5:e000::\/64":[
     {
-      "prefix":"fc00:0:5:1::\/64",
+      "prefix":"fc00:0:5:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:5:2::\/64":[
+  "fc00:0:5:e001::\/64":[
     {
-      "prefix":"fc00:0:5:2::\/64",
+      "prefix":"fc00:0:5:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:5:3::\/64":[
+  "fc00:0:5:e002::\/64":[
     {
-      "prefix":"fc00:0:5:3::\/64",
+      "prefix":"fc00:0:5:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:5:4::\/64":[
+  "fc00:0:5:e003::\/64":[
     {
-      "prefix":"fc00:0:5:4::\/64",
+      "prefix":"fc00:0:5:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step5/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt5/step5/show_srv6_locator_table.ref
index 54780fce8adc..ec55f24d7b95 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step5/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step5/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:5::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step6/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt5/step6/show_ipv6_route.ref
index c24527017709..aa3dea1662c4 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step6/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step6/show_ipv6_route.ref
@@ -234,9 +234,9 @@
       ]
     }
   ],
-  "fc00:0:5:1::\/64":[
+  "fc00:0:5:e000::\/64":[
     {
-      "prefix":"fc00:0:5:1::\/64",
+      "prefix":"fc00:0:5:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -255,9 +255,9 @@
       ]
     }
   ],
-  "fc00:0:5:2::\/64":[
+  "fc00:0:5:e001::\/64":[
     {
-      "prefix":"fc00:0:5:2::\/64",
+      "prefix":"fc00:0:5:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -276,9 +276,9 @@
       ]
     }
   ],
-  "fc00:0:5:3::\/64":[
+  "fc00:0:5:e002::\/64":[
     {
-      "prefix":"fc00:0:5:3::\/64",
+      "prefix":"fc00:0:5:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -297,9 +297,9 @@
       ]
     }
   ],
-  "fc00:0:5:4::\/64":[
+  "fc00:0:5:e003::\/64":[
     {
-      "prefix":"fc00:0:5:4::\/64",
+      "prefix":"fc00:0:5:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step6/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt5/step6/show_srv6_locator_table.ref
index 54780fce8adc..ec55f24d7b95 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step6/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step6/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:5::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step7/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt5/step7/show_ipv6_route.ref
index d6ad4c2aad24..a7b3262f8631 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step7/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step7/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:5:1::\/64":[
+  "fc00:0:5:e000::\/64":[
     {
-      "prefix":"fc00:0:5:1::\/64",
+      "prefix":"fc00:0:5:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:5:2::\/64":[
+  "fc00:0:5:e001::\/64":[
     {
-      "prefix":"fc00:0:5:2::\/64",
+      "prefix":"fc00:0:5:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:5:3::\/64":[
+  "fc00:0:5:e002::\/64":[
     {
-      "prefix":"fc00:0:5:3::\/64",
+      "prefix":"fc00:0:5:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:5:4::\/64":[
+  "fc00:0:5:e003::\/64":[
     {
-      "prefix":"fc00:0:5:4::\/64",
+      "prefix":"fc00:0:5:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step7/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt5/step7/show_srv6_locator_table.ref
index 54780fce8adc..ec55f24d7b95 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step7/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step7/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:5::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step8/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt5/step8/show_ipv6_route.ref
index c24527017709..aa3dea1662c4 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step8/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step8/show_ipv6_route.ref
@@ -234,9 +234,9 @@
       ]
     }
   ],
-  "fc00:0:5:1::\/64":[
+  "fc00:0:5:e000::\/64":[
     {
-      "prefix":"fc00:0:5:1::\/64",
+      "prefix":"fc00:0:5:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -255,9 +255,9 @@
       ]
     }
   ],
-  "fc00:0:5:2::\/64":[
+  "fc00:0:5:e001::\/64":[
     {
-      "prefix":"fc00:0:5:2::\/64",
+      "prefix":"fc00:0:5:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -276,9 +276,9 @@
       ]
     }
   ],
-  "fc00:0:5:3::\/64":[
+  "fc00:0:5:e002::\/64":[
     {
-      "prefix":"fc00:0:5:3::\/64",
+      "prefix":"fc00:0:5:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -297,9 +297,9 @@
       ]
     }
   ],
-  "fc00:0:5:4::\/64":[
+  "fc00:0:5:e003::\/64":[
     {
-      "prefix":"fc00:0:5:4::\/64",
+      "prefix":"fc00:0:5:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step8/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt5/step8/show_srv6_locator_table.ref
index 54780fce8adc..ec55f24d7b95 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step8/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step8/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:5::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step9/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt5/step9/show_ipv6_route.ref
index d6ad4c2aad24..a7b3262f8631 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step9/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step9/show_ipv6_route.ref
@@ -259,9 +259,9 @@
       ]
     }
   ],
-  "fc00:0:5:1::\/64":[
+  "fc00:0:5:e000::\/64":[
     {
-      "prefix":"fc00:0:5:1::\/64",
+      "prefix":"fc00:0:5:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -280,9 +280,9 @@
       ]
     }
   ],
-  "fc00:0:5:2::\/64":[
+  "fc00:0:5:e001::\/64":[
     {
-      "prefix":"fc00:0:5:2::\/64",
+      "prefix":"fc00:0:5:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -301,9 +301,9 @@
       ]
     }
   ],
-  "fc00:0:5:3::\/64":[
+  "fc00:0:5:e002::\/64":[
     {
-      "prefix":"fc00:0:5:3::\/64",
+      "prefix":"fc00:0:5:e002::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -322,9 +322,9 @@
       ]
     }
   ],
-  "fc00:0:5:4::\/64":[
+  "fc00:0:5:e003::\/64":[
     {
-      "prefix":"fc00:0:5:4::\/64",
+      "prefix":"fc00:0:5:e003::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt5/step9/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt5/step9/show_srv6_locator_table.ref
index 54780fce8adc..ec55f24d7b95 100644
--- a/tests/topotests/isis_srv6_topo1/rt5/step9/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt5/step9/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:5::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step1/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt6/step1/show_ipv6_route.ref
index 407e2d0f4cfe..4f0e0a75e55b 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step1/show_ipv6_route.ref
@@ -223,9 +223,9 @@
       ]
     }
   ],
-  "fc00:0:6:1::\/64":[
+  "fc00:0:6:e000::\/64":[
     {
-      "prefix":"fc00:0:6:1::\/64",
+      "prefix":"fc00:0:6:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -244,9 +244,9 @@
       ]
     }
   ],
-  "fc00:0:6:2::\/64":[
+  "fc00:0:6:e001::\/64":[
     {
-      "prefix":"fc00:0:6:2::\/64",
+      "prefix":"fc00:0:6:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step1/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt6/step1/show_srv6_locator_table.ref
index 35aa61d8e6d5..abcdeddea4ef 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step1/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step1/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:6::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step2/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt6/step2/show_ipv6_route.ref
index 6c64bd7d1eec..c52b81e6c70f 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step2/show_ipv6_route.ref
@@ -198,9 +198,9 @@
       ]
     }
   ],
-  "fc00:0:6:1::\/64":[
+  "fc00:0:6:e000::\/64":[
     {
-      "prefix":"fc00:0:6:1::\/64",
+      "prefix":"fc00:0:6:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -219,9 +219,9 @@
       ]
     }
   ],
-  "fc00:0:6:2::\/64":[
+  "fc00:0:6:e001::\/64":[
     {
-      "prefix":"fc00:0:6:2::\/64",
+      "prefix":"fc00:0:6:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step2/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt6/step2/show_srv6_locator_table.ref
index 35aa61d8e6d5..abcdeddea4ef 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step2/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step2/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:6::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step3/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt6/step3/show_ipv6_route.ref
index 407e2d0f4cfe..4f0e0a75e55b 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step3/show_ipv6_route.ref
@@ -223,9 +223,9 @@
       ]
     }
   ],
-  "fc00:0:6:1::\/64":[
+  "fc00:0:6:e000::\/64":[
     {
-      "prefix":"fc00:0:6:1::\/64",
+      "prefix":"fc00:0:6:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -244,9 +244,9 @@
       ]
     }
   ],
-  "fc00:0:6:2::\/64":[
+  "fc00:0:6:e001::\/64":[
     {
-      "prefix":"fc00:0:6:2::\/64",
+      "prefix":"fc00:0:6:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step3/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt6/step3/show_srv6_locator_table.ref
index 35aa61d8e6d5..abcdeddea4ef 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step3/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step3/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:6::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step4/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt6/step4/show_ipv6_route.ref
index 6c64bd7d1eec..c52b81e6c70f 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step4/show_ipv6_route.ref
@@ -198,9 +198,9 @@
       ]
     }
   ],
-  "fc00:0:6:1::\/64":[
+  "fc00:0:6:e000::\/64":[
     {
-      "prefix":"fc00:0:6:1::\/64",
+      "prefix":"fc00:0:6:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -219,9 +219,9 @@
       ]
     }
   ],
-  "fc00:0:6:2::\/64":[
+  "fc00:0:6:e001::\/64":[
     {
-      "prefix":"fc00:0:6:2::\/64",
+      "prefix":"fc00:0:6:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step4/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt6/step4/show_srv6_locator_table.ref
index 35aa61d8e6d5..abcdeddea4ef 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step4/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step4/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:6::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step5/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt6/step5/show_ipv6_route.ref
index 407e2d0f4cfe..4f0e0a75e55b 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step5/show_ipv6_route.ref
@@ -223,9 +223,9 @@
       ]
     }
   ],
-  "fc00:0:6:1::\/64":[
+  "fc00:0:6:e000::\/64":[
     {
-      "prefix":"fc00:0:6:1::\/64",
+      "prefix":"fc00:0:6:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -244,9 +244,9 @@
       ]
     }
   ],
-  "fc00:0:6:2::\/64":[
+  "fc00:0:6:e001::\/64":[
     {
-      "prefix":"fc00:0:6:2::\/64",
+      "prefix":"fc00:0:6:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step5/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt6/step5/show_srv6_locator_table.ref
index 35aa61d8e6d5..abcdeddea4ef 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step5/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step5/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:6::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step6/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt6/step6/show_ipv6_route.ref
index 6c64bd7d1eec..c52b81e6c70f 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step6/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step6/show_ipv6_route.ref
@@ -198,9 +198,9 @@
       ]
     }
   ],
-  "fc00:0:6:1::\/64":[
+  "fc00:0:6:e000::\/64":[
     {
-      "prefix":"fc00:0:6:1::\/64",
+      "prefix":"fc00:0:6:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -219,9 +219,9 @@
       ]
     }
   ],
-  "fc00:0:6:2::\/64":[
+  "fc00:0:6:e001::\/64":[
     {
-      "prefix":"fc00:0:6:2::\/64",
+      "prefix":"fc00:0:6:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step6/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt6/step6/show_srv6_locator_table.ref
index 35aa61d8e6d5..abcdeddea4ef 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step6/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step6/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:6::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step7/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt6/step7/show_ipv6_route.ref
index 407e2d0f4cfe..4f0e0a75e55b 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step7/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step7/show_ipv6_route.ref
@@ -223,9 +223,9 @@
       ]
     }
   ],
-  "fc00:0:6:1::\/64":[
+  "fc00:0:6:e000::\/64":[
     {
-      "prefix":"fc00:0:6:1::\/64",
+      "prefix":"fc00:0:6:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -244,9 +244,9 @@
       ]
     }
   ],
-  "fc00:0:6:2::\/64":[
+  "fc00:0:6:e001::\/64":[
     {
-      "prefix":"fc00:0:6:2::\/64",
+      "prefix":"fc00:0:6:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step7/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt6/step7/show_srv6_locator_table.ref
index 35aa61d8e6d5..abcdeddea4ef 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step7/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step7/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:6::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step8/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt6/step8/show_ipv6_route.ref
index 6c64bd7d1eec..c52b81e6c70f 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step8/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step8/show_ipv6_route.ref
@@ -198,9 +198,9 @@
       ]
     }
   ],
-  "fc00:0:6:1::\/64":[
+  "fc00:0:6:e000::\/64":[
     {
-      "prefix":"fc00:0:6:1::\/64",
+      "prefix":"fc00:0:6:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -219,9 +219,9 @@
       ]
     }
   ],
-  "fc00:0:6:2::\/64":[
+  "fc00:0:6:e001::\/64":[
     {
-      "prefix":"fc00:0:6:2::\/64",
+      "prefix":"fc00:0:6:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step8/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt6/step8/show_srv6_locator_table.ref
index 35aa61d8e6d5..abcdeddea4ef 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step8/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step8/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:6::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step9/show_ipv6_route.ref b/tests/topotests/isis_srv6_topo1/rt6/step9/show_ipv6_route.ref
index 407e2d0f4cfe..4f0e0a75e55b 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step9/show_ipv6_route.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step9/show_ipv6_route.ref
@@ -223,9 +223,9 @@
       ]
     }
   ],
-  "fc00:0:6:1::\/64":[
+  "fc00:0:6:e000::\/64":[
     {
-      "prefix":"fc00:0:6:1::\/64",
+      "prefix":"fc00:0:6:e000::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
@@ -244,9 +244,9 @@
       ]
     }
   ],
-  "fc00:0:6:2::\/64":[
+  "fc00:0:6:e001::\/64":[
     {
-      "prefix":"fc00:0:6:2::\/64",
+      "prefix":"fc00:0:6:e001::\/64",
       "protocol":"isis",
       "selected":true,
       "destSelected":true,
diff --git a/tests/topotests/isis_srv6_topo1/rt6/step9/show_srv6_locator_table.ref b/tests/topotests/isis_srv6_topo1/rt6/step9/show_srv6_locator_table.ref
index 35aa61d8e6d5..abcdeddea4ef 100644
--- a/tests/topotests/isis_srv6_topo1/rt6/step9/show_srv6_locator_table.ref
+++ b/tests/topotests/isis_srv6_topo1/rt6/step9/show_srv6_locator_table.ref
@@ -9,10 +9,6 @@
       "argumentBitsLength":0,
       "statusUp":true,
       "chunks":[
-        {
-          "prefix":"fc00:0:6::/48",
-          "proto":"isis"
-        }
       ]
     }
   ]