Skip to content

Commit 9cb2e35

Browse files
pguibert6WINDpguibert6WIND
committed
topotests: bgp_vpnv4_noretain, use ebgp connection to import mpls paths
The previous commit broke some IGP tests that were not using MPLS paths. Move the test to be an eBGP peering, and use the interAS option that allows bgp paths to be imported. Signed-off-by: Philippe Guibert <[email protected]>
1 parent b1dc67c commit 9cb2e35

13 files changed

+52
-70
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
interface r1-eth0
2+
mpls bgp forwarding
3+
exit
14
router bgp 65500
25
bgp router-id 192.0.2.1
3-
neighbor 10.125.0.2 remote-as 65500
6+
no bgp ebgp-requires-policy
7+
neighbor 10.125.0.2 remote-as 65501
48
address-family ipv4 unicast
59
no neighbor 10.125.0.2 activate
610
label vpn export 100

‎tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_advertised_10_125_0_2.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"announceNexthopSelf":true,
2323
"origin":"incomplete",
2424
"metric":0,
25-
"locPrf":100,
2625
"weight":32768,
2726
"valid":true,
2827
"sourced":true,
@@ -70,7 +69,6 @@
7069
"announceNexthopSelf":true,
7170
"origin":"incomplete",
7271
"metric":0,
73-
"locPrf":100,
7472
"weight":32768,
7573
"valid":true,
7674
"sourced":true,
@@ -100,6 +98,6 @@
10098
}
10199
}
102100
},
103-
"totalPrefixCounter":2,
101+
"totalPrefixCounter":6,
104102
"filteredPrefixCounter":0
105103
}

‎tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_all.json‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,14 @@
6868
"valid":true,
6969
"bestpath":true,
7070
"selectionReason":"First path received",
71-
"pathFrom":"internal",
71+
"pathFrom":"external",
7272
"prefix":"10.201.0.0",
7373
"prefixLen":24,
7474
"network":"10.201.0.0\/24",
7575
"metric":0,
76-
"locPrf":100,
7776
"weight":0,
7877
"peerId":"10.125.0.2",
79-
"path":"",
78+
"path":"65501",
8079
"origin":"incomplete",
8180
"nexthops":[
8281
{
@@ -95,15 +94,14 @@
9594
"valid":true,
9695
"bestpath":true,
9796
"selectionReason":"First path received",
98-
"pathFrom":"internal",
97+
"pathFrom":"external",
9998
"prefix":"10.202.0.0",
10099
"prefixLen":24,
101100
"network":"10.202.0.0\/24",
102101
"metric":0,
103-
"locPrf":100,
104102
"weight":0,
105103
"peerId":"10.125.0.2",
106-
"path":"",
104+
"path":"65501",
107105
"origin":"incomplete",
108106
"nexthops":[
109107
{
@@ -122,15 +120,14 @@
122120
"valid":true,
123121
"bestpath":true,
124122
"selectionReason":"First path received",
125-
"pathFrom":"internal",
123+
"pathFrom":"external",
126124
"prefix":"10.203.0.0",
127125
"prefixLen":24,
128126
"network":"10.203.0.0\/24",
129127
"metric":0,
130-
"locPrf":100,
131128
"weight":0,
132129
"peerId":"10.125.0.2",
133-
"path":"",
130+
"path":"65501",
134131
"origin":"incomplete",
135132
"nexthops":[
136133
{
@@ -149,15 +146,14 @@
149146
"valid":true,
150147
"bestpath":true,
151148
"selectionReason":"First path received",
152-
"pathFrom":"internal",
149+
"pathFrom":"external",
153150
"prefix":"10.204.0.0",
154151
"prefixLen":24,
155152
"network":"10.204.0.0\/24",
156153
"metric":0,
157-
"locPrf":100,
158154
"weight":0,
159155
"peerId":"10.125.0.2",
160-
"path":"",
156+
"path":"65501",
161157
"origin":"incomplete",
162158
"nexthops":[
163159
{

‎tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_no_retain_init.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,14 @@
6868
"valid":true,
6969
"bestpath":true,
7070
"selectionReason":"First path received",
71-
"pathFrom":"internal",
71+
"pathFrom":"external",
7272
"prefix":"10.201.0.0",
7373
"prefixLen":24,
7474
"network":"10.201.0.0\/24",
7575
"metric":0,
76-
"locPrf":100,
7776
"weight":0,
7877
"peerId":"10.125.0.2",
79-
"path":"",
78+
"path":"65501",
8079
"origin":"incomplete",
8180
"nexthops":[
8281
{
@@ -95,15 +94,14 @@
9594
"valid":true,
9695
"bestpath":true,
9796
"selectionReason":"First path received",
98-
"pathFrom":"internal",
97+
"pathFrom":"external",
9998
"prefix":"10.204.0.0",
10099
"prefixLen":24,
101100
"network":"10.204.0.0\/24",
102101
"metric":0,
103-
"locPrf":100,
104102
"weight":0,
105103
"peerId":"10.125.0.2",
106-
"path":"",
104+
"path":"65501",
107105
"origin":"incomplete",
108106
"nexthops":[
109107
{

‎tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_no_retain_init_plus_r2_vrf2.json‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,14 @@
6868
"valid":true,
6969
"bestpath":true,
7070
"selectionReason":"First path received",
71-
"pathFrom":"internal",
71+
"pathFrom":"external",
7272
"prefix":"10.201.0.0",
7373
"prefixLen":24,
7474
"network":"10.201.0.0\/24",
7575
"metric":0,
76-
"locPrf":100,
7776
"weight":0,
7877
"peerId":"10.125.0.2",
79-
"path":"",
78+
"path":"65501",
8079
"origin":"incomplete",
8180
"nexthops":[
8281
{
@@ -95,15 +94,14 @@
9594
"valid":true,
9695
"bestpath":true,
9796
"selectionReason":"First path received",
98-
"pathFrom":"internal",
97+
"pathFrom":"external",
9998
"prefix":"10.202.0.0",
10099
"prefixLen":24,
101100
"network":"10.202.0.0\/24",
102101
"metric":0,
103-
"locPrf":100,
104102
"weight":0,
105103
"peerId":"10.125.0.2",
106-
"path":"",
104+
"path":"65501",
107105
"origin":"incomplete",
108106
"nexthops":[
109107
{
@@ -122,15 +120,14 @@
122120
"valid":true,
123121
"bestpath":true,
124122
"selectionReason":"First path received",
125-
"pathFrom":"internal",
123+
"pathFrom":"external",
126124
"prefix":"10.204.0.0",
127125
"prefixLen":24,
128126
"network":"10.204.0.0\/24",
129127
"metric":0,
130-
"locPrf":100,
131128
"weight":0,
132129
"peerId":"10.125.0.2",
133-
"path":"",
130+
"path":"65501",
134131
"origin":"incomplete",
135132
"nexthops":[
136133
{

‎tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vpn_routes_no_retain_init_plus_r2_vrf3.json‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,14 @@
6868
"valid":true,
6969
"bestpath":true,
7070
"selectionReason":"First path received",
71-
"pathFrom":"internal",
71+
"pathFrom":"external",
7272
"prefix":"10.201.0.0",
7373
"prefixLen":24,
7474
"network":"10.201.0.0\/24",
7575
"metric":0,
76-
"locPrf":100,
7776
"weight":0,
7877
"peerId":"10.125.0.2",
79-
"path":"",
78+
"path":"65501",
8079
"origin":"incomplete",
8180
"nexthops":[
8281
{
@@ -95,15 +94,14 @@
9594
"valid":true,
9695
"bestpath":true,
9796
"selectionReason":"First path received",
98-
"pathFrom":"internal",
97+
"pathFrom":"external",
9998
"prefix":"10.203.0.0",
10099
"prefixLen":24,
101100
"network":"10.203.0.0\/24",
102101
"metric":0,
103-
"locPrf":100,
104102
"weight":0,
105103
"peerId":"10.125.0.2",
106-
"path":"",
104+
"path":"65501",
107105
"origin":"incomplete",
108106
"nexthops":[
109107
{
@@ -122,15 +120,14 @@
122120
"valid":true,
123121
"bestpath":true,
124122
"selectionReason":"First path received",
125-
"pathFrom":"internal",
123+
"pathFrom":"external",
126124
"prefix":"10.204.0.0",
127125
"prefixLen":24,
128126
"network":"10.204.0.0\/24",
129127
"metric":0,
130-
"locPrf":100,
131128
"weight":0,
132129
"peerId":"10.125.0.2",
133-
"path":"",
130+
"path":"65501",
134131
"origin":"incomplete",
135132
"nexthops":[
136133
{

‎tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vrf_all_routes_init.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
"prefixLen": 24,
1616
"network": "10.204.0.0/24",
1717
"metric": 0,
18-
"locPrf": 100,
1918
"weight": 0,
2019
"peerId": "(unspec)",
21-
"path": "",
20+
"path": "65501",
2221
"origin": "incomplete",
2322
"announceNexthopSelf": true,
2423
"nhVrfName": "default",
@@ -74,10 +73,9 @@
7473
"prefixLen": 24,
7574
"network": "10.201.0.0/24",
7675
"metric": 0,
77-
"locPrf": 100,
7876
"weight": 0,
7977
"peerId": "(unspec)",
80-
"path": "",
78+
"path": "65501",
8179
"origin": "incomplete",
8280
"announceNexthopSelf": true,
8381
"nhVrfName": "default",

‎tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vrf_all_routes_plus_r1_vrf1.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
"prefixLen": 24,
1616
"network": "10.204.0.0/24",
1717
"metric": 0,
18-
"locPrf": 100,
1918
"weight": 0,
2019
"peerId": "(unspec)",
21-
"path": "",
20+
"path": "65501",
2221
"origin": "incomplete",
2322
"announceNexthopSelf": true,
2423
"nhVrfName": "default",
@@ -74,10 +73,9 @@
7473
"prefixLen": 24,
7574
"network": "10.201.0.0/24",
7675
"metric": 0,
77-
"locPrf": 100,
7876
"weight": 0,
7977
"peerId": "(unspec)",
80-
"path": "",
78+
"path": "65501",
8179
"origin": "incomplete",
8280
"announceNexthopSelf": true,
8381
"nhVrfName": "default",

‎tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vrf_all_routes_plus_r2_vrf2.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
"prefixLen": 24,
1616
"network": "10.204.0.0/24",
1717
"metric": 0,
18-
"locPrf": 100,
1918
"weight": 0,
2019
"peerId": "(unspec)",
21-
"path": "",
20+
"path": "65501",
2221
"origin": "incomplete",
2322
"announceNexthopSelf": true,
2423
"nhVrfName": "default",
@@ -74,10 +73,9 @@
7473
"prefixLen": 24,
7574
"network": "10.201.0.0/24",
7675
"metric": 0,
77-
"locPrf": 100,
7876
"weight": 0,
7977
"peerId": "(unspec)",
80-
"path": "",
78+
"path": "65501",
8179
"origin": "incomplete",
8280
"announceNexthopSelf": true,
8381
"nhVrfName": "default",
@@ -175,10 +173,9 @@
175173
"prefixLen": 24,
176174
"network": "10.202.0.0/24",
177175
"metric": 0,
178-
"locPrf": 100,
179176
"weight": 0,
180177
"peerId": "(unspec)",
181-
"path": "",
178+
"path": "65501",
182179
"origin": "incomplete",
183180
"announceNexthopSelf": true,
184181
"nhVrfName": "default",

‎tests/topotests/bgp_vpnv4_noretain/r1/ipv4_vrf_all_routes_plus_r2_vrf3.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
"prefixLen": 24,
1616
"network": "10.204.0.0/24",
1717
"metric": 0,
18-
"locPrf": 100,
1918
"weight": 0,
2019
"peerId": "(unspec)",
21-
"path": "",
20+
"path": "65501",
2221
"origin": "incomplete",
2322
"announceNexthopSelf": true,
2423
"nhVrfName": "default",
@@ -74,10 +73,9 @@
7473
"prefixLen": 24,
7574
"network": "10.201.0.0/24",
7675
"metric": 0,
77-
"locPrf": 100,
7876
"weight": 0,
7977
"peerId": "(unspec)",
80-
"path": "",
78+
"path": "65501",
8179
"origin": "incomplete",
8280
"announceNexthopSelf": true,
8381
"nhVrfName": "default",
@@ -175,10 +173,9 @@
175173
"prefixLen": 24,
176174
"network": "10.203.0.0/24",
177175
"metric": 0,
178-
"locPrf": 100,
179176
"weight": 0,
180177
"peerId": "(unspec)",
181-
"path": "",
178+
"path": "65501",
182179
"origin": "incomplete",
183180
"announceNexthopSelf": true,
184181
"nhVrfName": "default",

0 commit comments

Comments
 (0)