summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/bgpd/test_peer_attr.c2
-rw-r--r--tests/helpers/c/main.c2
-rw-r--r--tests/lib/cli/common_cli.c2
-rw-r--r--tests/lib/cli/test_commands.c2
-rw-r--r--tests/lib/northbound/test_oper_data.c2
-rw-r--r--tests/topotests/ospf-sr-topo1/r1/ospf_srdb.json28
-rw-r--r--tests/topotests/ospf-sr-topo1/r1/ospfd.conf3
-rw-r--r--tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json37
-rw-r--r--tests/topotests/ospf-sr-topo1/r2/ospf_srdb.json34
-rw-r--r--tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json12
-rw-r--r--tests/topotests/ospf-sr-topo1/r3/ospf_srdb.json16
-rw-r--r--tests/topotests/ospf-sr-topo1/r3/ospfd.conf1
-rw-r--r--tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json8
-rw-r--r--tests/topotests/ospf-sr-topo1/r4/ospf_srdb.json27
-rw-r--r--tests/topotests/ospf-sr-topo1/r4/ospfd.conf1
-rw-r--r--tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json8
16 files changed, 109 insertions, 76 deletions
diff --git a/tests/bgpd/test_peer_attr.c b/tests/bgpd/test_peer_attr.c
index f6a892df42..0979622eb3 100644
--- a/tests/bgpd/test_peer_attr.c
+++ b/tests/bgpd/test_peer_attr.c
@@ -1387,7 +1387,7 @@ static void bgp_startup(void)
master = thread_master_create(NULL);
yang_init(true);
- nb_init(master, NULL, 0);
+ nb_init(master, NULL, 0, false);
bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE);
bgp_option_set(BGP_OPT_NO_LISTEN);
vrf_init(NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/helpers/c/main.c b/tests/helpers/c/main.c
index 68ed16d513..7f15996daa 100644
--- a/tests/helpers/c/main.c
+++ b/tests/helpers/c/main.c
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
vty_init(master, false);
lib_cmd_init();
yang_init(true);
- nb_init(master, NULL, 0);
+ nb_init(master, NULL, 0, false);
/* OSPF vty inits. */
test_vty_init();
diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index 3cade4a2c9..44cc6efe84 100644
--- a/tests/lib/cli/common_cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
vty_init(master, false);
lib_cmd_init();
yang_init(true);
- nb_init(master, NULL, 0);
+ nb_init(master, NULL, 0, false);
test_init(argc, argv);
diff --git a/tests/lib/cli/test_commands.c b/tests/lib/cli/test_commands.c
index 2b345c91e8..cb512211a4 100644
--- a/tests/lib/cli/test_commands.c
+++ b/tests/lib/cli/test_commands.c
@@ -209,7 +209,7 @@ static void test_init(void)
cmd_init(1);
yang_init(true);
- nb_init(master, NULL, 0);
+ nb_init(master, NULL, 0, false);
install_node(&bgp_node);
install_node(&rip_node);
diff --git a/tests/lib/northbound/test_oper_data.c b/tests/lib/northbound/test_oper_data.c
index 202a321e1a..b5f257fa2f 100644
--- a/tests/lib/northbound/test_oper_data.c
+++ b/tests/lib/northbound/test_oper_data.c
@@ -400,7 +400,7 @@ int main(int argc, char **argv)
vty_init(master, false);
lib_cmd_init();
yang_init(true);
- nb_init(master, modules, array_size(modules));
+ nb_init(master, modules, array_size(modules), false);
/* Create artificial data. */
create_data(num_vrfs, num_interfaces, num_routes);
diff --git a/tests/topotests/ospf-sr-topo1/r1/ospf_srdb.json b/tests/topotests/ospf-sr-topo1/r1/ospf_srdb.json
index 0416bd6ce2..952a26ed10 100644
--- a/tests/topotests/ospf-sr-topo1/r1/ospf_srdb.json
+++ b/tests/topotests/ospf-sr-topo1/r1/ospf_srdb.json
@@ -3,8 +3,10 @@
"srNodes":[
{
"routerID":"10.0.255.2",
- "srgbSize":20000,
- "srgbLabel":8000,
+ "srgbSize":8000,
+ "srgbLabel":16000,
+ "srlbSize":1000,
+ "srlbLabel":15000,
"algorithms":[
{
"0":"SPF"
@@ -34,6 +36,8 @@
"routerID":"10.0.255.4",
"srgbSize":10000,
"srgbLabel":10000,
+ "srlbSize":1000,
+ "srlbLabel":5000,
"algorithms":[
{
"0":"SPF"
@@ -47,12 +51,12 @@
"inputLabel":20400,
"prefixRoute":[
{
- "outputLabel":8400,
+ "outputLabel":16400,
"interface":"r1-eth0",
"nexthop":"10.0.0.2"
},
{
- "outputLabel":8400,
+ "outputLabel":16400,
"interface":"r1-eth1",
"nexthop":"10.0.1.2"
}
@@ -64,8 +68,14 @@
"routerID":"10.0.255.3",
"srgbSize":10000,
"srgbLabel":10000,
+ "srlbSize":1000,
+ "srlbLabel":5000,
"algorithms":[
+ {
+ "0":"SPF"
+ }
],
+ "nodeMsd":8,
"extendedPrefix":[
{
"prefix":"10.0.255.3\/32",
@@ -73,12 +83,12 @@
"inputLabel":20300,
"prefixRoute":[
{
- "outputLabel":8300,
+ "outputLabel":16300,
"interface":"r1-eth0",
"nexthop":"10.0.0.2"
},
{
- "outputLabel":8300,
+ "outputLabel":16300,
"interface":"r1-eth1",
"nexthop":"10.0.1.2"
}
@@ -90,6 +100,8 @@
"routerID":"10.0.255.1",
"srgbSize":10000,
"srgbLabel":20000,
+ "srlbSize":1000,
+ "srlbLabel":15000,
"algorithms":[
{
"0":"SPF"
@@ -100,10 +112,10 @@
{
"prefix":"10.0.255.1\/32",
"sid":100,
- "inputLabel":20100,
+ "inputLabel":0,
"prefixRoute":[
{
- "outputLabel":3,
+ "outputLabel":0,
"interface":"lo",
"nexthop":"10.0.255.1"
}
diff --git a/tests/topotests/ospf-sr-topo1/r1/ospfd.conf b/tests/topotests/ospf-sr-topo1/r1/ospfd.conf
index 292d4e6367..73a272786c 100644
--- a/tests/topotests/ospf-sr-topo1/r1/ospfd.conf
+++ b/tests/topotests/ospf-sr-topo1/r1/ospfd.conf
@@ -1,3 +1,4 @@
+debug ospf sr
!
interface lo
ip ospf area 0.0.0.0
@@ -17,6 +18,6 @@ router ospf
segment-routing on
segment-routing node-msd 16
segment-routing global-block 20000 29999
- segment-routing prefix 10.0.255.1/32 index 100 no-php-flag
+ segment-routing prefix 10.0.255.1/32 index 100 explicit-null
!
diff --git a/tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json b/tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json
index dd42e326ce..6c87596acb 100644
--- a/tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json
+++ b/tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json
@@ -1,20 +1,5 @@
[
{
- "inLabel":20100,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (OSPF)",
- "outLabel":3,
- "outLabelStack":[
- 3
- ],
- "distance":150,
- "installed":true
- }
- ]
- },
- {
"inLabel":20200,
"installed":true,
"nexthops":[
@@ -43,20 +28,13 @@
"nexthops":[
{
"type":"SR (OSPF)",
- "outLabel":8300,
+ "outLabel":16300,
"outLabelStack":[
- 8300
+ 16300
],
"distance":150,
"installed":true,
"nexthop":"10.0.1.2"
- },
- {
- "type":"SR (OSPF)",
- "outLabel":8300,
- "distance":150,
- "installed":true,
- "nexthop":"10.0.0.2"
}
]
},
@@ -66,20 +44,13 @@
"nexthops":[
{
"type":"SR (OSPF)",
- "outLabel":8400,
+ "outLabel":16400,
"outLabelStack":[
- 8400
+ 16400
],
"distance":150,
"installed":true,
"nexthop":"10.0.1.2"
- },
- {
- "type":"SR (OSPF)",
- "outLabel":8400,
- "distance":150,
- "installed":true,
- "nexthop":"10.0.0.2"
}
]
},
diff --git a/tests/topotests/ospf-sr-topo1/r2/ospf_srdb.json b/tests/topotests/ospf-sr-topo1/r2/ospf_srdb.json
index eb202b82cd..1de780d84e 100644
--- a/tests/topotests/ospf-sr-topo1/r2/ospf_srdb.json
+++ b/tests/topotests/ospf-sr-topo1/r2/ospf_srdb.json
@@ -3,8 +3,10 @@
"srNodes":[
{
"routerID":"10.0.255.2",
- "srgbSize":20000,
- "srgbLabel":8000,
+ "srgbSize":8000,
+ "srgbLabel":16000,
+ "srlbSize":1000,
+ "srlbLabel":15000,
"algorithms":[
{
"0":"SPF"
@@ -95,13 +97,19 @@
"routerID":"10.0.255.4",
"srgbSize":10000,
"srgbLabel":10000,
+ "srlbSize":1000,
+ "srlbLabel":5000,
"algorithms":[
+ {
+ "0":"SPF"
+ }
],
+ "nodeMsd":12,
"extendedPrefix":[
{
"prefix":"10.0.255.4\/32",
"sid":400,
- "inputLabel":8400,
+ "inputLabel":16400,
"prefixRoute":[
{
"outputLabel":10400,
@@ -116,13 +124,19 @@
"routerID":"10.0.255.3",
"srgbSize":10000,
"srgbLabel":10000,
+ "srlbSize":1000,
+ "srlbLabel":5000,
"algorithms":[
+ {
+ "0":"SPF"
+ }
],
+ "nodeMsd":8,
"extendedPrefix":[
{
"prefix":"10.0.255.3\/32",
"sid":300,
- "inputLabel":8300,
+ "inputLabel":16300,
"prefixRoute":[
{
"outputLabel":3,
@@ -137,21 +151,27 @@
"routerID":"10.0.255.1",
"srgbSize":10000,
"srgbLabel":20000,
+ "srlbSize":1000,
+ "srlbLabel":15000,
"algorithms":[
+ {
+ "0":"SPF"
+ }
],
+ "nodeMsd":16,
"extendedPrefix":[
{
"prefix":"10.0.255.1\/32",
"sid":100,
- "inputLabel":8100,
+ "inputLabel":16100,
"prefixRoute":[
{
- "outputLabel":20100,
+ "outputLabel":0,
"interface":"r2-eth0",
"nexthop":"10.0.0.1"
},
{
- "outputLabel":20100,
+ "outputLabel":0,
"interface":"r2-eth1",
"nexthop":"10.0.1.1"
}
diff --git a/tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json b/tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json
index f3462e239e..a885e88fc5 100644
--- a/tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json
+++ b/tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json
@@ -1,13 +1,13 @@
[
{
- "inLabel":8100,
+ "inLabel":16100,
"installed":true,
"nexthops":[
{
"type":"SR (OSPF)",
- "outLabel":20100,
+ "outLabel":0,
"outLabelStack":[
- 20100
+ 0
],
"distance":150,
"installed":true,
@@ -15,7 +15,7 @@
},
{
"type":"SR (OSPF)",
- "outLabel":20100,
+ "outLabel":0,
"distance":150,
"installed":true,
"nexthop":"10.0.0.1"
@@ -23,7 +23,7 @@
]
},
{
- "inLabel":8300,
+ "inLabel":16300,
"installed":true,
"nexthops":[
{
@@ -39,7 +39,7 @@
]
},
{
- "inLabel":8400,
+ "inLabel":16400,
"installed":true,
"nexthops":[
{
diff --git a/tests/topotests/ospf-sr-topo1/r3/ospf_srdb.json b/tests/topotests/ospf-sr-topo1/r3/ospf_srdb.json
index b36fe674ad..e7371ff593 100644
--- a/tests/topotests/ospf-sr-topo1/r3/ospf_srdb.json
+++ b/tests/topotests/ospf-sr-topo1/r3/ospf_srdb.json
@@ -3,8 +3,10 @@
"srNodes":[
{
"routerID":"10.0.255.2",
- "srgbSize":20000,
- "srgbLabel":8000,
+ "srgbSize":8000,
+ "srgbLabel":16000,
+ "srlbSize":1000,
+ "srlbLabel":15000,
"algorithms":[
{
"0":"SPF"
@@ -29,6 +31,8 @@
"routerID":"10.0.255.4",
"srgbSize":10000,
"srgbLabel":10000,
+ "srlbSize":1000,
+ "srlbLabel":5000,
"algorithms":[
{
"0":"SPF"
@@ -42,7 +46,7 @@
"inputLabel":10400,
"prefixRoute":[
{
- "outputLabel":8400,
+ "outputLabel":16400,
"interface":"r3-eth0",
"nexthop":"10.0.3.2"
}
@@ -54,6 +58,8 @@
"routerID":"10.0.255.3",
"srgbSize":10000,
"srgbLabel":10000,
+ "srlbSize":1000,
+ "srlbLabel":5000,
"algorithms":[
{
"0":"SPF"
@@ -97,6 +103,8 @@
"routerID":"10.0.255.1",
"srgbSize":10000,
"srgbLabel":20000,
+ "srlbSize":1000,
+ "srlbLabel":15000,
"algorithms":[
{
"0":"SPF"
@@ -110,7 +118,7 @@
"inputLabel":10100,
"prefixRoute":[
{
- "outputLabel":8100,
+ "outputLabel":16100,
"interface":"r3-eth0",
"nexthop":"10.0.3.2"
}
diff --git a/tests/topotests/ospf-sr-topo1/r3/ospfd.conf b/tests/topotests/ospf-sr-topo1/r3/ospfd.conf
index cf274bed2e..38d525f34f 100644
--- a/tests/topotests/ospf-sr-topo1/r3/ospfd.conf
+++ b/tests/topotests/ospf-sr-topo1/r3/ospfd.conf
@@ -11,6 +11,7 @@ router ospf
capability opaque
router-info area 0.0.0.0
segment-routing on
+ segment-routing local-block 5000 5999
segment-routing global-block 10000 19999
segment-routing node-msd 8
segment-routing prefix 10.0.255.3/32 index 300
diff --git a/tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json b/tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json
index 3d036801d5..1b98ff4756 100644
--- a/tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json
+++ b/tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json
@@ -5,9 +5,9 @@
"nexthops":[
{
"type":"SR (OSPF)",
- "outLabel":8100,
+ "outLabel":16100,
"outLabelStack":[
- 8100
+ 16100
],
"distance":150,
"installed":true,
@@ -37,9 +37,9 @@
"nexthops":[
{
"type":"SR (OSPF)",
- "outLabel":8400,
+ "outLabel":16400,
"outLabelStack":[
- 8400
+ 16400
],
"distance":150,
"installed":true,
diff --git a/tests/topotests/ospf-sr-topo1/r4/ospf_srdb.json b/tests/topotests/ospf-sr-topo1/r4/ospf_srdb.json
index d92ec91c72..a241b32607 100644
--- a/tests/topotests/ospf-sr-topo1/r4/ospf_srdb.json
+++ b/tests/topotests/ospf-sr-topo1/r4/ospf_srdb.json
@@ -3,9 +3,14 @@
"srNodes":[
{
"routerID":"10.0.255.2",
- "srgbSize":20000,
- "srgbLabel":8000,
+ "srgbSize":8000,
+ "srgbLabel":16000,
+ "srlbSize":1000,
+ "srlbLabel":15000,
"algorithms":[
+ {
+ "0":"SPF"
+ }
],
"extendedPrefix":[
{
@@ -26,6 +31,8 @@
"routerID":"10.0.255.4",
"srgbSize":10000,
"srgbLabel":10000,
+ "srlbSize":1000,
+ "srlbLabel":5000,
"algorithms":[
{
"0":"SPF"
@@ -69,8 +76,14 @@
"routerID":"10.0.255.3",
"srgbSize":10000,
"srgbLabel":10000,
+ "srlbSize":1000,
+ "srlbLabel":5000,
"algorithms":[
+ {
+ "0":"SPF"
+ }
],
+ "nodeMsd":8,
"extendedPrefix":[
{
"prefix":"10.0.255.3\/32",
@@ -78,7 +91,7 @@
"inputLabel":10300,
"prefixRoute":[
{
- "outputLabel":8300,
+ "outputLabel":16300,
"interface":"r4-eth0",
"nexthop":"10.0.4.2"
}
@@ -90,8 +103,14 @@
"routerID":"10.0.255.1",
"srgbSize":10000,
"srgbLabel":20000,
+ "srlbSize":1000,
+ "srlbLabel":15000,
"algorithms":[
+ {
+ "0":"SPF"
+ }
],
+ "nodeMsd":16,
"extendedPrefix":[
{
"prefix":"10.0.255.1\/32",
@@ -99,7 +118,7 @@
"inputLabel":10100,
"prefixRoute":[
{
- "outputLabel":8100,
+ "outputLabel":16100,
"interface":"r4-eth0",
"nexthop":"10.0.4.2"
}
diff --git a/tests/topotests/ospf-sr-topo1/r4/ospfd.conf b/tests/topotests/ospf-sr-topo1/r4/ospfd.conf
index 65fdce69f7..9d0d148812 100644
--- a/tests/topotests/ospf-sr-topo1/r4/ospfd.conf
+++ b/tests/topotests/ospf-sr-topo1/r4/ospfd.conf
@@ -12,6 +12,7 @@ router ospf
capability opaque
router-info area 0.0.0.0
segment-routing on
+ segment-routing local-block 5000 5999
segment-routing global-block 10000 19999
segment-routing node-msd 12
segment-routing prefix 10.0.255.4/32 index 400 no-php-flag
diff --git a/tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json b/tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json
index 86ad8721f8..b5758f29a0 100644
--- a/tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json
+++ b/tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json
@@ -5,9 +5,9 @@
"nexthops":[
{
"type":"SR (OSPF)",
- "outLabel":8100,
+ "outLabel":16100,
"outLabelStack":[
- 8100
+ 16100
],
"distance":150,
"installed":true,
@@ -37,9 +37,9 @@
"nexthops":[
{
"type":"SR (OSPF)",
- "outLabel":8300,
+ "outLabel":16300,
"outLabelStack":[
- 8300
+ 16300
],
"distance":150,
"installed":true,
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-09 15:39:32 +0000