Skip to content

Commit e308339

Browse files
cscarpittacscarpitta
committed
tests: Change tests according to new alloc schema
Align SRv6 topotests to the new allocation schema. Signed-off-by: Carmine Scarpitta <[email protected]>
1 parent e562f1d commit e308339

File tree

147 files changed

+429
-643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+429
-643
lines changed

‎tests/topotests/bgp_isis_srv6_topo1/test_bgp_isis_srv6_topo1.py

+2
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ def test_isis_adjacencies_step3():
550550
locators
551551
locator loc1
552552
prefix fc00:0:1::/48
553+
format usid-f3216
553554
"""
554555
)
555556

@@ -1216,6 +1217,7 @@ def test_isis_adjacencies_step9():
12161217
locators
12171218
locator loc1
12181219
prefix fc00:0:1::/48
1220+
format usid-f3216
12191221
"""
12201222
)
12211223

‎tests/topotests/bgp_srv6_sid_reachability/r1/bgpd.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ router bgp 65001 vrf vrf10
3232
!
3333
address-family ipv4 unicast
3434
redistribute connected
35-
sid vpn export 1
35+
sid vpn export 65280
3636
rd vpn export 65001:10
3737
rt vpn both 0:10
3838
import vpn
@@ -45,7 +45,7 @@ router bgp 65001 vrf vrf20
4545
!
4646
address-family ipv4 unicast
4747
redistribute connected
48-
sid vpn export 2
48+
sid vpn export 65281
4949
rd vpn export 65001:20
5050
rt vpn both 0:20
5151
import vpn

‎tests/topotests/bgp_srv6_sid_reachability/r2/bgpd.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ router bgp 65002 vrf vrf10
2727
!
2828
address-family ipv4 unicast
2929
redistribute connected
30-
sid vpn export 1
30+
sid vpn export 65280
3131
rd vpn export 65002:10
3232
rt vpn both 0:10
3333
import vpn
@@ -40,7 +40,7 @@ router bgp 65002 vrf vrf20
4040
!
4141
address-family ipv4 unicast
4242
redistribute connected
43-
sid vpn export 2
43+
sid vpn export 65281
4444
rd vpn export 65002:20
4545
rt vpn both 0:20
4646
import vpn

‎tests/topotests/bgp_srv6_sid_reachability/r3/bgpd.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ router bgp 65001 vrf vrf10
2727
!
2828
address-family ipv4 unicast
2929
redistribute connected
30-
sid vpn export 1
30+
sid vpn export 65280
3131
rd vpn export 65001:10
3232
rt vpn both 0:10
3333
import vpn
@@ -40,7 +40,7 @@ router bgp 65001 vrf vrf20
4040
!
4141
address-family ipv4 unicast
4242
redistribute connected
43-
sid vpn export 2
43+
sid vpn export 65281
4444
rd vpn export 65001:20
4545
rt vpn both 0:20
4646
import vpn

‎tests/topotests/bgp_srv6_sid_reachability/test_bgp_srv6_sid_reachability.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def test_sid_unreachable_bgp_update():
141141
exit
142142
router bgp 65002 vrf vrf10
143143
address-family ipv4 unicast
144-
no sid vpn export 1
144+
no sid vpn export 65280
145145
"""
146146
)
147147
check_ping("c11", "192.168.2.1", False, 10, 1)
@@ -158,7 +158,7 @@ def test_sid_reachable_again_bgp_update():
158158
exit
159159
router bgp 65002 vrf vrf10
160160
address-family ipv4 unicast
161-
sid vpn export 1
161+
sid vpn export 65280
162162
"""
163163
)
164164
check_ping("c11", "192.168.2.1", True, 10, 1)

‎tests/topotests/bgp_srv6l3vpn_over_ipv6/r1/bgpd.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ router bgp 65001 vrf vrf10
3333
!
3434
address-family ipv4 unicast
3535
redistribute connected
36-
sid vpn export 1
36+
sid vpn export 65280
3737
rd vpn export 65001:10
3838
rt vpn both 0:10
3939
import vpn
@@ -46,7 +46,7 @@ router bgp 65001 vrf vrf20
4646
!
4747
address-family ipv4 unicast
4848
redistribute connected
49-
sid vpn export 2
49+
sid vpn export 65281
5050
rd vpn export 65001:20
5151
rt vpn both 0:20
5252
import vpn

‎tests/topotests/bgp_srv6l3vpn_over_ipv6/r2/bgpd.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ router bgp 65002 vrf vrf10
2828
!
2929
address-family ipv4 unicast
3030
redistribute connected
31-
sid vpn export 1
31+
sid vpn export 65280
3232
rd vpn export 65002:10
3333
rt vpn both 0:10
3434
import vpn
@@ -41,7 +41,7 @@ router bgp 65002 vrf vrf20
4141
!
4242
address-family ipv4 unicast
4343
redistribute connected
44-
sid vpn export 2
44+
sid vpn export 65281
4545
rd vpn export 65002:20
4646
rt vpn both 0:20
4747
import vpn

‎tests/topotests/bgp_srv6l3vpn_over_ipv6/r3/bgpd.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ router bgp 65001 vrf vrf10
2828
!
2929
address-family ipv4 unicast
3030
redistribute connected
31-
sid vpn export 1
31+
sid vpn export 65280
3232
rd vpn export 65001:10
3333
rt vpn both 0:10
3434
import vpn
@@ -41,7 +41,7 @@ router bgp 65001 vrf vrf20
4141
!
4242
address-family ipv4 unicast
4343
redistribute connected
44-
sid vpn export 2
44+
sid vpn export 65281
4545
rd vpn export 65001:20
4646
rt vpn both 0:20
4747
import vpn

‎tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_auto_sid_rib.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
"fib":true,
3737
"afi":"ipv6",
3838
"labels":[
39-
16
39+
1024
4040
],
4141
"weight":1,
4242
"seg6local":{
4343
"action":"unspec"
4444
},
4545
"seg6":{
46-
"segs":"2001:db8:2:2:1::"
46+
"segs":"2001:db8:2:2:40::"
4747
}
4848
}
4949
]

‎tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_manual_sid_rib.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@
3737
"ip":"2001::2",
3838
"afi":"ipv6",
3939
"labels":[
40-
128
40+
1044480
4141
],
4242
"weight":1,
4343
"seg6local":{
4444
"action":"unspec"
4545
},
4646
"seg6":{
47-
"segs":"2001:db8:2:2:8::"
47+
"segs":"2001:db8:2:2:ff00::"
4848
}
4949
}
5050
]

‎tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_auto_sid_rib.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
"fib":true,
3737
"afi":"ipv6",
3838
"labels":[
39-
32
39+
1040
4040
],
4141
"weight":1,
4242
"seg6local":{
4343
"action":"unspec"
4444
},
4545
"seg6":{
46-
"segs":"2001:db8:2:2:2::"
46+
"segs":"2001:db8:2:2:41::"
4747
}
4848
}
4949
]

‎tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_manual_sid_rib.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
"fib":true,
3737
"afi":"ipv6",
3838
"labels":[
39-
128
39+
1044480
4040
],
4141
"weight":1,
4242
"seg6local":{
4343
"action":"unspec"
4444
},
4545
"seg6":{
46-
"segs":"2001:db8:2:2:8::"
46+
"segs":"2001:db8:2:2:ff00::"
4747
}
4848
}
4949
]

‎tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf4_auto_sid_rib.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@
3737
"ip":"2001::2",
3838
"afi":"ipv6",
3939
"labels":[
40-
16
40+
1024
4141
],
4242
"weight":1,
4343
"seg6local":{
4444
"action":"unspec"
4545
},
4646
"seg6":{
47-
"segs":"2001:db8:2:2:1::"
47+
"segs":"2001:db8:2:2:40::"
4848
}
4949
}
5050
]

‎tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf4_manual_sid_rib.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@
3737
"ip":"2001::2",
3838
"afi":"ipv6",
3939
"labels":[
40-
128
40+
1044480
4141
],
4242
"weight":1,
4343
"seg6local":{
4444
"action":"unspec"
4545
},
4646
"seg6":{
47-
"segs":"2001:db8:2:2:8::"
47+
"segs":"2001:db8:2:2:ff00::"
4848
}
4949
}
5050
]

‎tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf6_auto_sid_rib.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
"fib":true,
3737
"afi":"ipv6",
3838
"labels":[
39-
16
39+
1024
4040
],
4141
"weight":1,
4242
"seg6local":{
4343
"action":"unspec"
4444
},
4545
"seg6":{
46-
"segs":"2001:db8:2:2:1::"
46+
"segs":"2001:db8:2:2:40::"
4747
}
4848
}
4949
]

‎tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf6_manual_sid_rib.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
"fib":true,
3737
"afi":"ipv6",
3838
"labels":[
39-
128
39+
1044480
4040
],
4141
"weight":1,
4242
"seg6local":{
4343
"action":"unspec"
4444
},
4545
"seg6":{
46-
"segs":"2001:db8:2:2:8::"
46+
"segs":"2001:db8:2:2:ff00::"
4747
}
4848
}
4949
]

‎tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_rib.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
"vrf":"default",
4040
"active":true,
4141
"labels":[
42-
32
42+
1040
4343
],
4444
"weight":1,
4545
"seg6local":{
4646
"action":"unspec"
4747
},
4848
"seg6":{
49-
"segs":"2001:db8:2:2:2::"
49+
"segs":"2001:db8:2:2:41::"
5050
}
5151
}
5252
]

‎tests/topotests/bgp_srv6l3vpn_sid/r1/vrf20_rib.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
"vrf":"default",
1919
"active":true,
2020
"labels":[
21-
48
21+
1056
2222
],
2323
"weight":1,
2424
"seg6local":{
2525
"action":"unspec"
2626
},
2727
"seg6":{
28-
"segs":"2001:db8:2:2:3::"
28+
"segs":"2001:db8:2:2:42::"
2929
}
3030
}
3131
]
@@ -71,14 +71,14 @@
7171
"vrf":"default",
7272
"active":true,
7373
"labels":[
74-
48
74+
1056
7575
],
7676
"weight":1,
7777
"seg6local":{
7878
"action":"unspec"
7979
},
8080
"seg6":{
81-
"segs":"2001:db8:2:2:3::"
81+
"segs":"2001:db8:2:2:42::"
8282
}
8383
}
8484
]

‎tests/topotests/bgp_srv6l3vpn_sid/r2/vrf10_rib.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
"vrf":"default",
1919
"active":true,
2020
"labels":[
21-
32
21+
1040
2222
],
2323
"weight":1,
2424
"seg6local":{
2525
"action":"unspec"
2626
},
2727
"seg6":{
28-
"segs":"2001:db8:1:1:2::"
28+
"segs":"2001:db8:1:1:41::"
2929
}
3030
}
3131
]
@@ -71,14 +71,14 @@
7171
"vrf":"default",
7272
"active":true,
7373
"labels":[
74-
32
74+
1040
7575
],
7676
"weight":1,
7777
"seg6local":{
7878
"action":"unspec"
7979
},
8080
"seg6":{
81-
"segs":"2001:db8:1:1:2::"
81+
"segs":"2001:db8:1:1:41::"
8282
}
8383
}
8484
]

‎tests/topotests/bgp_srv6l3vpn_sid/r2/vrf20_rib.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
"vrf":"default",
4040
"active":true,
4141
"labels":[
42-
48
42+
1056
4343
],
4444
"weight":1,
4545
"seg6local":{
4646
"action":"unspec"
4747
},
4848
"seg6":{
49-
"segs":"2001:db8:1:1:3::"
49+
"segs":"2001:db8:1:1:42::"
5050
}
5151
}
5252
]

0 commit comments

Comments
 (0)