isisd: Align SRv6 topotests with new SID Manager

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

Hide file tree

Showing 103 changed files with 397 additions and 397 deletions.
diff --git 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
@@ -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
@@ -11,7 +11,7 @@
       "chunks":[
         {
           "prefix":"fc00:0:1::/48",
-          "proto":"isis"
+          "proto":"system"
         }
       ]
     }

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
@@ -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
@@ -11,7 +11,7 @@
       "chunks":[
         {
           "prefix":"fc00:0:1::/48",
-          "proto":"isis"
+          "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
@@ -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
@@ -11,7 +11,7 @@
       "chunks":[
         {
           "prefix":"fc00:0:1::/48",
-          "proto":"isis"
+          "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
@@ -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
@@ -11,7 +11,7 @@
       "chunks":[
         {
           "prefix":"fc00:0:1::/48",
-          "proto":"isis"
+          "proto":"system"
         }
       ]
     }

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
@@ -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
@@ -11,7 +11,7 @@
       "chunks":[
         {
           "prefix":"fc00:0:1::/48",
-          "proto":"isis"
+          "proto":"system"
         }
       ]
     }

diff --git a/tests/topotests/isis_srv6_topo1/rt1/zebra.conf b/tests/topotests/isis_srv6_topo1/rt1/zebra.conf
@@ -3,7 +3,7 @@ log file zebra.log
 hostname rt1
 !
 ! debug zebra kernel
-! debug zebra packet
+debug zebra packet
 !
 interface lo
  ip address 1.1.1.1/32

diff --git a/tests/topotests/isis_srv6_topo1/rt2/isisd.conf b/tests/topotests/isis_srv6_topo1/rt2/isisd.conf
@@ -4,7 +4,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/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
@@ -11,7 +11,7 @@
       "chunks":[
         {
           "prefix":"fc00:0:2::/48",
-          "proto":"isis"
+          "proto":"system"
         }
       ]
     }

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
@@ -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
@@ -11,7 +11,7 @@
       "chunks":[
         {
           "prefix":"fc00:0:2::/48",
-          "proto":"isis"
+          "proto":"system"
         }
       ]
     }

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
@@ -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
@@ -11,7 +11,7 @@
       "chunks":[
         {
           "prefix":"fc00:0:2::/48",
-          "proto":"isis"
+          "proto":"system"
         }
       ]
     }