summaryrefslogtreecommitdiff
path: root/tests/topotests/isis_sr_topo1
diff options
context:
space:
mode:
authorOlivier Dugeon <olivier.dugeon@orange.com>2022-04-08 17:10:25 +0200
committerOlivier Dugeon <olivier.dugeon@orange.com>2022-05-25 17:29:21 +0200
commit7700a88aa5c5c038868750c5a4a0061d34d22214 (patch)
tree94a9685efe0e11409c88913d8b1a7a3d85056a74 /tests/topotests/isis_sr_topo1
parented074aa182fa38d2d7d6ef5ff5af56890d6ed49d (diff)
isisd: Stop fulfill MPLS table when SR is disabled
When Segment Routing is disabled, if isisd received LSP with Segment Routing information, in particular prefix SIDs, it installs corresponding MPLS entries while it should not as SR is disabled. This patch adds extra control to verify if SR is enabled or not before configuring MPLS LFIB & IP FIB with prefix SIDs and adjust SR & TI-LFA tests accordingly. Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
Diffstat (limited to 'tests/topotests/isis_sr_topo1')
-rw-r--r--tests/topotests/isis_sr_topo1/rt6/step5/show_ip_route.ref40
-rw-r--r--tests/topotests/isis_sr_topo1/rt6/step5/show_ipv6_route.ref40
-rw-r--r--tests/topotests/isis_sr_topo1/rt6/step5/show_mpls_table.ref168
3 files changed, 16 insertions, 232 deletions
diff --git a/tests/topotests/isis_sr_topo1/rt6/step5/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt6/step5/show_ip_route.ref
index 4b204dbc4c..3ccd57a6fd 100644
--- a/tests/topotests/isis_sr_topo1/rt6/step5/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step5/show_ip_route.ref
@@ -14,20 +14,14 @@
"ip":"10.0.7.4",
"afi":"ipv4",
"interfaceName":"eth-rt4",
- "active":true,
- "labels":[
- 16010
- ]
+ "active":true
},
{
"fib":true,
"ip":"10.0.8.5",
"afi":"ipv4",
"interfaceName":"eth-rt5",
- "active":true,
- "labels":[
- 16010
- ]
+ "active":true
}
]
}
@@ -47,10 +41,7 @@
"ip":"10.0.7.4",
"afi":"ipv4",
"interfaceName":"eth-rt4",
- "active":true,
- "labels":[
- 16020
- ]
+ "active":true
}
]
}
@@ -70,10 +61,7 @@
"ip":"10.0.8.5",
"afi":"ipv4",
"interfaceName":"eth-rt5",
- "active":true,
- "labels":[
- 16030
- ]
+ "active":true
}
]
}
@@ -93,10 +81,7 @@
"ip":"10.0.7.4",
"afi":"ipv4",
"interfaceName":"eth-rt4",
- "active":true,
- "labels":[
- 16040
- ]
+ "active":true
}
]
}
@@ -116,10 +101,7 @@
"ip":"10.0.8.5",
"afi":"ipv4",
"interfaceName":"eth-rt5",
- "active":true,
- "labels":[
- 16050
- ]
+ "active":true
}
]
}
@@ -296,20 +278,14 @@
"ip":"10.0.7.4",
"afi":"ipv4",
"interfaceName":"eth-rt4",
- "active":true,
- "labels":[
- 16100
- ]
+ "active":true
},
{
"fib":true,
"ip":"10.0.8.5",
"afi":"ipv4",
"interfaceName":"eth-rt5",
- "active":true,
- "labels":[
- 16100
- ]
+ "active":true
}
]
}
diff --git a/tests/topotests/isis_sr_topo1/rt6/step5/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt6/step5/show_ipv6_route.ref
index 834cdfe6ca..22d3f2a246 100644
--- a/tests/topotests/isis_sr_topo1/rt6/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step5/show_ipv6_route.ref
@@ -13,19 +13,13 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4",
- "active":true,
- "labels":[
- 16011
- ]
+ "active":true
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5",
- "active":true,
- "labels":[
- 16011
- ]
+ "active":true
}
]
}
@@ -44,10 +38,7 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4",
- "active":true,
- "labels":[
- 16021
- ]
+ "active":true
}
]
}
@@ -66,10 +57,7 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5",
- "active":true,
- "labels":[
- 16031
- ]
+ "active":true
}
]
}
@@ -88,10 +76,7 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4",
- "active":true,
- "labels":[
- 16041
- ]
+ "active":true
}
]
}
@@ -110,10 +95,7 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5",
- "active":true,
- "labels":[
- 16051
- ]
+ "active":true
}
]
}
@@ -132,19 +114,13 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4",
- "active":true,
- "labels":[
- 16101
- ]
+ "active":true
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5",
- "active":true,
- "labels":[
- 16101
- ]
+ "active":true
}
]
}
diff --git a/tests/topotests/isis_sr_topo1/rt6/step5/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt6/step5/show_mpls_table.ref
index be87ed90a0..2c63c08510 100644
--- a/tests/topotests/isis_sr_topo1/rt6/step5/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step5/show_mpls_table.ref
@@ -1,170 +1,2 @@
{
- "18010":{
- "inLabel":18010,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":16010,
- "installed":true,
- "nexthop":"10.0.8.5"
- },
- {
- "type":"SR (IS-IS)",
- "outLabel":16010,
- "installed":true,
- "nexthop":"10.0.7.4"
- }
- ]
- },
- "18011":{
- "inLabel":18011,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":16011,
- "installed":true,
- "interface":"eth-rt5"
- },
- {
- "type":"SR (IS-IS)",
- "outLabel":16011,
- "installed":true,
- "interface":"eth-rt4"
- }
- ]
- },
- "18020":{
- "inLabel":18020,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":16020,
- "installed":true,
- "nexthop":"10.0.7.4"
- }
- ]
- },
- "18021":{
- "inLabel":18021,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":16021,
- "installed":true,
- "interface":"eth-rt4"
- }
- ]
- },
- "18030":{
- "inLabel":18030,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":16030,
- "installed":true,
- "nexthop":"10.0.8.5"
- }
- ]
- },
- "18031":{
- "inLabel":18031,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":16031,
- "installed":true,
- "interface":"eth-rt5"
- }
- ]
- },
- "18040":{
- "inLabel":18040,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":16040,
- "installed":true,
- "nexthop":"10.0.7.4"
- }
- ]
- },
- "18041":{
- "inLabel":18041,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":16041,
- "installed":true,
- "interface":"eth-rt4"
- }
- ]
- },
- "18050":{
- "inLabel":18050,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":16050,
- "installed":true,
- "nexthop":"10.0.8.5"
- }
- ]
- },
- "18051":{
- "inLabel":18051,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":16051,
- "installed":true,
- "interface":"eth-rt5"
- }
- ]
- },
- "18100":{
- "inLabel":18100,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":16100,
- "installed":true,
- "nexthop":"10.0.8.5"
- },
- {
- "type":"SR (IS-IS)",
- "outLabel":16100,
- "installed":true,
- "nexthop":"10.0.7.4"
- }
- ]
- },
- "18101":{
- "inLabel":18101,
- "installed":true,
- "nexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":16101,
- "installed":true,
- "interface":"eth-rt5"
- },
- {
- "type":"SR (IS-IS)",
- "outLabel":16101,
- "installed":true,
- "interface":"eth-rt4"
- }
- ]
- }
}