proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-04 02:31:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra, tests: Connected and Local routes should have a weight of 1

Browse Source 
All routes received by zebra from upper level protocols have a weight
of 1.  Let's just make everything extremely consistent in our code.
Lot's of tests needed to be fixed up to make this work.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2024-02-22 15:53:45 -05:00
parent db87ab3d86
commit b62de7de2e
50 changed files with 478 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/topotests/all_protocol_startup/r1/ip_nht.ref
View File

@ -55,19 +55,19 @@ VRF default:
Client list: pbr(fd XX)
192.168.0.2
resolved via connected
is directly connected, r1-eth0 (vrf default)
is directly connected, r1-eth0 (vrf default), weight 1
Client list: static(fd XX)
192.168.0.4
resolved via connected
is directly connected, r1-eth0 (vrf default)
is directly connected, r1-eth0 (vrf default), weight 1
Client list: static(fd XX)
192.168.7.10
resolved via connected
is directly connected, r1-eth7 (vrf default)
is directly connected, r1-eth7 (vrf default), weight 1
Client list: bgp(fd XX)
192.168.7.20(Connected)
resolved via connected
is directly connected, r1-eth7 (vrf default)
is directly connected, r1-eth7 (vrf default), weight 1
Client list: bgp(fd XX)
192.168.161.4
unresolved

40
tests/topotests/all_protocol_startup/r1/ipv4_routes.ref
View File

@ -1,23 +1,23 @@
C>* 192.168.0.0/24 is directly connected, r1-eth0, XX:XX:XX
C>* 192.168.1.0/26 is directly connected, r1-eth1, XX:XX:XX
C>* 192.168.2.0/26 is directly connected, r1-eth2, XX:XX:XX
C>* 192.168.3.0/26 is directly connected, r1-eth3, XX:XX:XX
C>* 192.168.4.0/26 is directly connected, r1-eth4, XX:XX:XX
C>* 192.168.5.0/26 is directly connected, r1-eth5, XX:XX:XX
C>* 192.168.6.0/26 is directly connected, r1-eth6, XX:XX:XX
C>* 192.168.7.0/26 is directly connected, r1-eth7, XX:XX:XX
C>* 192.168.8.0/26 is directly connected, r1-eth8, XX:XX:XX
C>* 192.168.9.0/26 is directly connected, r1-eth9, XX:XX:XX
L>* 192.168.0.1/32 is directly connected, r1-eth0, XX:XX:XX
L>* 192.168.1.1/32 is directly connected, r1-eth1, XX:XX:XX
L>* 192.168.2.1/32 is directly connected, r1-eth2, XX:XX:XX
L>* 192.168.3.1/32 is directly connected, r1-eth3, XX:XX:XX
L>* 192.168.4.1/32 is directly connected, r1-eth4, XX:XX:XX
L>* 192.168.5.1/32 is directly connected, r1-eth5, XX:XX:XX
L>* 192.168.6.1/32 is directly connected, r1-eth6, XX:XX:XX
L>* 192.168.7.1/32 is directly connected, r1-eth7, XX:XX:XX
L>* 192.168.8.1/32 is directly connected, r1-eth8, XX:XX:XX
L>* 192.168.9.1/32 is directly connected, r1-eth9, XX:XX:XX
C>* 192.168.0.0/24 is directly connected, r1-eth0, weight 1, XX:XX:XX
C>* 192.168.1.0/26 is directly connected, r1-eth1, weight 1, XX:XX:XX
C>* 192.168.2.0/26 is directly connected, r1-eth2, weight 1, XX:XX:XX
C>* 192.168.3.0/26 is directly connected, r1-eth3, weight 1, XX:XX:XX
C>* 192.168.4.0/26 is directly connected, r1-eth4, weight 1, XX:XX:XX
C>* 192.168.5.0/26 is directly connected, r1-eth5, weight 1, XX:XX:XX
C>* 192.168.6.0/26 is directly connected, r1-eth6, weight 1, XX:XX:XX
C>* 192.168.7.0/26 is directly connected, r1-eth7, weight 1, XX:XX:XX
C>* 192.168.8.0/26 is directly connected, r1-eth8, weight 1, XX:XX:XX
C>* 192.168.9.0/26 is directly connected, r1-eth9, weight 1, XX:XX:XX
L>* 192.168.0.1/32 is directly connected, r1-eth0, weight 1, XX:XX:XX
L>* 192.168.1.1/32 is directly connected, r1-eth1, weight 1, XX:XX:XX
L>* 192.168.2.1/32 is directly connected, r1-eth2, weight 1, XX:XX:XX
L>* 192.168.3.1/32 is directly connected, r1-eth3, weight 1, XX:XX:XX
L>* 192.168.4.1/32 is directly connected, r1-eth4, weight 1, XX:XX:XX
L>* 192.168.5.1/32 is directly connected, r1-eth5, weight 1, XX:XX:XX
L>* 192.168.6.1/32 is directly connected, r1-eth6, weight 1, XX:XX:XX
L>* 192.168.7.1/32 is directly connected, r1-eth7, weight 1, XX:XX:XX
L>* 192.168.8.1/32 is directly connected, r1-eth8, weight 1, XX:XX:XX
L>* 192.168.9.1/32 is directly connected, r1-eth9, weight 1, XX:XX:XX
O 192.168.0.0/24 [110/10] is directly connected, r1-eth0, weight 1, XX:XX:XX
O 192.168.3.0/26 [110/10] is directly connected, r1-eth3, weight 1, XX:XX:XX
S>* 1.1.1.1/32 [1/0] is directly connected, r1-eth1, weight 1, XX:XX:XX

6
tests/topotests/all_protocol_startup/r1/ipv6_nht.ref
View File

@ -2,14 +2,14 @@ VRF default:
Resolve via default: on
fc00::2
resolved via connected
is directly connected, r1-eth0 (vrf default)
is directly connected, r1-eth0 (vrf default), weight 1
Client list: static(fd XX)
fc00:0:0:8::1000
resolved via connected
is directly connected, r1-eth8 (vrf default)
is directly connected, r1-eth8 (vrf default), weight 1
Client list: bgp(fd XX)
fc00:0:0:8::2000(Connected)
resolved via connected
is directly connected, r1-eth8 (vrf default)
is directly connected, r1-eth8 (vrf default), weight 1
Client list: bgp(fd XX)

62
tests/topotests/all_protocol_startup/r1/ipv6_routes.ref
View File

@ -1,34 +1,34 @@
C>* fc00:0:0:1::/64 is directly connected, r1-eth1, XX:XX:XX
C>* fc00:0:0:2::/64 is directly connected, r1-eth2, XX:XX:XX
C>* fc00:0:0:3::/64 is directly connected, r1-eth3, XX:XX:XX
C>* fc00:0:0:4::/64 is directly connected, r1-eth4, XX:XX:XX
C>* fc00:0:0:5::/64 is directly connected, r1-eth5, XX:XX:XX
C>* fc00:0:0:6::/64 is directly connected, r1-eth6, XX:XX:XX
C>* fc00:0:0:7::/64 is directly connected, r1-eth7, XX:XX:XX
C>* fc00:0:0:8::/64 is directly connected, r1-eth8, XX:XX:XX
C>* fc00:0:0:9::/64 is directly connected, r1-eth9, XX:XX:XX
C>* fc00::/64 is directly connected, r1-eth0, XX:XX:XX
C>* fe80::/64 is directly connected, lo, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth0, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth1, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth2, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth3, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth4, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth5, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth6, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth7, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth8, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth9, XX:XX:XX
L>* fc00:0:0:1::1/128 is directly connected, r1-eth1, XX:XX:XX
L>* fc00:0:0:2::1/128 is directly connected, r1-eth2, XX:XX:XX
L>* fc00:0:0:3::1/128 is directly connected, r1-eth3, XX:XX:XX
L>* fc00:0:0:4::1/128 is directly connected, r1-eth4, XX:XX:XX
L>* fc00:0:0:5::1/128 is directly connected, r1-eth5, XX:XX:XX
L>* fc00:0:0:6::1/128 is directly connected, r1-eth6, XX:XX:XX
L>* fc00:0:0:7::1/128 is directly connected, r1-eth7, XX:XX:XX
L>* fc00:0:0:8::1/128 is directly connected, r1-eth8, XX:XX:XX
L>* fc00:0:0:9::1/128 is directly connected, r1-eth9, XX:XX:XX
L>* fc00::1/128 is directly connected, r1-eth0, XX:XX:XX
C>* fc00:0:0:1::/64 is directly connected, r1-eth1, weight 1, XX:XX:XX
C>* fc00:0:0:2::/64 is directly connected, r1-eth2, weight 1, XX:XX:XX
C>* fc00:0:0:3::/64 is directly connected, r1-eth3, weight 1, XX:XX:XX
C>* fc00:0:0:4::/64 is directly connected, r1-eth4, weight 1, XX:XX:XX
C>* fc00:0:0:5::/64 is directly connected, r1-eth5, weight 1, XX:XX:XX
C>* fc00:0:0:6::/64 is directly connected, r1-eth6, weight 1, XX:XX:XX
C>* fc00:0:0:7::/64 is directly connected, r1-eth7, weight 1, XX:XX:XX
C>* fc00:0:0:8::/64 is directly connected, r1-eth8, weight 1, XX:XX:XX
C>* fc00:0:0:9::/64 is directly connected, r1-eth9, weight 1, XX:XX:XX
C>* fc00::/64 is directly connected, r1-eth0, weight 1, XX:XX:XX
C>* fe80::/64 is directly connected, lo, weight 1, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth0, weight 1, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth1, weight 1, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth2, weight 1, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth3, weight 1, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth4, weight 1, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth5, weight 1, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth6, weight 1, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth7, weight 1, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth8, weight 1, XX:XX:XX
C * fe80::/64 is directly connected, r1-eth9, weight 1, XX:XX:XX
L>* fc00:0:0:1::1/128 is directly connected, r1-eth1, weight 1, XX:XX:XX
L>* fc00:0:0:2::1/128 is directly connected, r1-eth2, weight 1, XX:XX:XX
L>* fc00:0:0:3::1/128 is directly connected, r1-eth3, weight 1, XX:XX:XX
L>* fc00:0:0:4::1/128 is directly connected, r1-eth4, weight 1, XX:XX:XX
L>* fc00:0:0:5::1/128 is directly connected, r1-eth5, weight 1, XX:XX:XX
L>* fc00:0:0:6::1/128 is directly connected, r1-eth6, weight 1, XX:XX:XX
L>* fc00:0:0:7::1/128 is directly connected, r1-eth7, weight 1, XX:XX:XX
L>* fc00:0:0:8::1/128 is directly connected, r1-eth8, weight 1, XX:XX:XX
L>* fc00:0:0:9::1/128 is directly connected, r1-eth9, weight 1, XX:XX:XX
L>* fc00::1/128 is directly connected, r1-eth0, weight 1, XX:XX:XX
O fc00:0:0:4::/64 [110/10] is directly connected, r1-eth4, weight 1, XX:XX:XX
S>* 4:5::6:10/128 [1/0] via fc00::2, r1-eth0, weight 1, XX:XX:XX
S>* 4:5::6:11/128 [1/0] via fc00::2, r1-eth0, weight 1, XX:XX:XX

8
tests/topotests/bgp_features/r1/ip_route.json
View File

@ -29,7 +29,7 @@
"metric":0,
"nexthops":[
{
"flags":1,
"flags":3,
"directlyConnected":true,
"interfaceName":"lo",
"active":true,
@ -109,7 +109,7 @@
"table":254,
"nexthops":[
{
"flags":1,
"flags":3,
"directlyConnected":true,
"interfaceName":"r1-eth1",
"active":true,
@ -175,7 +175,7 @@
"metric":10,
"nexthops":[
{
"flags":1,
"flags":3,
"directlyConnected":true,
"interfaceName":"r1-eth2",
"active":true,
@ -210,7 +210,7 @@
"metric":10,
"nexthops":[
{
"flags":1,
"flags":3,
"directlyConnected":true,
"interfaceName":"r1-eth0",
"active":true,

8
tests/topotests/bgp_features/r1/ip_route_norib.json
View File

@ -7,7 +7,7 @@
"metric":0,
"nexthops":[
{
"flags":1,
"flags":3,
"directlyConnected":true,
"interfaceName":"lo",
"active":true,
@ -86,7 +86,7 @@
"metric":10,
"nexthops":[
{
"flags":1,
"flags":3,
"directlyConnected":true,
"interfaceName":"r1-eth1",
"active":true,
@ -152,7 +152,7 @@
"metric":10,
"nexthops":[
{
"flags":1,
"flags":3,
"directlyConnected":true,
"interfaceName":"r1-eth2",
"active":true,
@ -187,7 +187,7 @@
"metric":10,
"nexthops":[
{
"flags":1,
"flags":3,
"directlyConnected":true,
"interfaceName":"r1-eth0",
"active":true,

4
tests/topotests/bgp_link_bw_ip/r1/ip-route-1.json
View File

@ -7,12 +7,12 @@
{
"fib":true,
"ip":"11.1.1.6",
"weight":85
"weight":84
},
{
"fib":true,
"ip":"11.1.1.2",
"weight":255
"weight":254
}
]
}

2
tests/topotests/bgp_link_bw_ip/r1/ip-route-2.json
View File

@ -12,7 +12,7 @@
{
"fib":true,
"ip":"11.1.1.2",
"weight":255
"weight":254
}
]
}

2
tests/topotests/bgp_link_bw_ip/r1/ip-route-3.json
View File

@ -12,7 +12,7 @@
{
"fib":true,
"ip":"11.1.1.2",
"weight":255
"weight":254
}
]
}

2
tests/topotests/bgp_link_bw_ip/r1/ip-route-6.json
View File

@ -7,7 +7,7 @@
{
"fib":true,
"ip":"11.1.1.2",
"weight":255
"weight":254
}
]
}

2
tests/topotests/bgp_link_bw_ip/r1/ip-route-7.json
View File

@ -7,7 +7,7 @@
{
"fib":true,
"ip":"11.1.1.2",
"weight":255
"weight":254
}
]
}

2
tests/topotests/bgp_link_bw_ip/r1/ip-route-8.json
View File

@ -12,7 +12,7 @@
{
"fib":true,
"ip":"11.1.1.2",
"weight":255
"weight":254
}
]
}

2
tests/topotests/bgp_link_bw_ip/r1/ip-route-9.json
View File

@ -12,7 +12,7 @@
{
"fib":true,
"ip":"11.1.1.2",
"weight":255
"weight":254
}
]
}

2
tests/topotests/bgp_link_bw_ip/r2/ip-route-2.json
View File

@ -12,7 +12,7 @@
{
"fib":true,
"ip":"11.1.2.2",
"weight":255
"weight":254
}
]
}

8
tests/topotests/bgp_weighted_ecmp_recursive/test_bgp_weighted_ecmp_recursive.py
View File

@ -71,25 +71,25 @@ def test_bgp_weighted_ecmp_recursive():
"ip": "192.168.24.4",
"active": True,
"recursive": True,
"weight": 204,
"weight": 203,
},
{
"ip": "192.168.12.2",
"active": True,
"resolver": True,
"weight": 204,
"weight": 203,
},
{
"ip": "192.168.35.5",
"active": True,
"recursive": True,
"weight": 255,
"weight": 254,
},
{
"ip": "192.168.13.3",
"active": True,
"resolver": True,
"weight": 255,
"weight": 254,
},
],
}

49
tests/topotests/mgmt_oper/oper-results/result-lib-vrf-default.json
View File

@ -38,7 +38,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -66,7 +67,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -94,7 +96,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -122,7 +125,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -245,7 +249,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -271,7 +276,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -297,7 +303,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -323,7 +330,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -360,7 +368,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -388,7 +397,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -416,7 +426,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -444,7 +455,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -479,7 +491,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -505,7 +518,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -531,7 +545,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -557,7 +572,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -573,4 +589,3 @@
]
}
}

96
tests/topotests/mgmt_oper/oper-results/result-lib-vrf-nokey.json
View File

@ -38,7 +38,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -66,7 +67,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -94,7 +96,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -122,7 +125,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -245,7 +249,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -271,7 +276,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -297,7 +303,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -323,7 +330,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -360,7 +368,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -388,7 +397,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -416,7 +426,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -444,7 +455,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -479,7 +491,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -505,7 +518,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -531,7 +545,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -557,7 +572,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -607,7 +623,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -635,7 +652,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -663,7 +681,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -691,7 +710,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -814,7 +834,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -840,7 +861,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -866,7 +888,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -892,7 +915,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -929,7 +953,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -957,7 +982,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -985,7 +1011,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -1013,7 +1040,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -1048,7 +1076,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -1074,7 +1103,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -1100,7 +1130,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -1126,7 +1157,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}

48
tests/topotests/mgmt_oper/oper-results/result-lib-vrf-zebra-ribs.json
View File

@ -34,7 +34,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -62,7 +63,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -90,7 +92,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -118,7 +121,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -241,7 +245,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -267,7 +272,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -293,7 +299,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -319,7 +326,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -356,7 +364,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -384,7 +393,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -412,7 +422,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -440,7 +451,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -475,7 +487,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -501,7 +514,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -527,7 +541,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -553,7 +568,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}

48
tests/topotests/mgmt_oper/oper-results/result-lib-vrf-zebra.json
View File

@ -34,7 +34,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -62,7 +63,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -90,7 +92,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -118,7 +121,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -241,7 +245,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -267,7 +272,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -293,7 +299,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -319,7 +326,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -356,7 +364,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -384,7 +393,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -412,7 +422,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -440,7 +451,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -475,7 +487,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -501,7 +514,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -527,7 +541,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -553,7 +568,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}

96
tests/topotests/mgmt_oper/oper-results/result-lib.json
View File

@ -38,7 +38,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -66,7 +67,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -94,7 +96,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -122,7 +125,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -245,7 +249,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -271,7 +276,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -297,7 +303,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -323,7 +330,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -360,7 +368,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -388,7 +397,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -416,7 +426,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -444,7 +455,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -479,7 +491,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -505,7 +518,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -531,7 +545,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -557,7 +572,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -607,7 +623,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -635,7 +652,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -663,7 +681,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -691,7 +710,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -814,7 +834,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -840,7 +861,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -866,7 +888,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -892,7 +915,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -929,7 +953,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -957,7 +982,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -985,7 +1011,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -1013,7 +1040,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -1048,7 +1076,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -1074,7 +1103,8 @@
"gateway": "",
"interface": "r1-eth2",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -1100,7 +1130,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -1126,7 +1157,8 @@
"gateway": "",
"interface": "r1-eth3",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}

12
tests/topotests/mgmt_oper/oper-results/result-ribs-rib-ipv4-unicast.json
View File

@ -34,7 +34,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -62,7 +63,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -90,7 +92,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -118,7 +121,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}

48
tests/topotests/mgmt_oper/oper-results/result-ribs-rib-nokeys.json
View File

@ -34,7 +34,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -62,7 +63,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -90,7 +92,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -118,7 +121,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -241,7 +245,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -267,7 +272,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -293,7 +299,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -319,7 +326,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -356,7 +364,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -384,7 +393,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -412,7 +422,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -440,7 +451,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -475,7 +487,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -501,7 +514,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -527,7 +541,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}
@ -553,7 +568,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}

5
tests/topotests/mgmt_oper/oper.py
View File

@ -92,6 +92,7 @@ def _do_oper_test(tgen, qr):
logging.error(
"Error decoding json exp result: %s\noutput:\n%s", error, expected
)
logging.warning("FILE: {}".format(qr[1]))
raise
if dd_json_cmp:
@ -112,7 +113,9 @@ def _do_oper_test(tgen, qr):
"--------GOT----------\n%s\n-------END-GOT--------",
json.dumps(ojson, indent=4),
)
logging.warning("----diff---\n{}".format(cmpout))
logging.warning("Command: {}".format(qcmd.format(qr[0], qr[2] if len(qr) > 2 else "")))
logging.warning("File: {}".format(qr[1]))
assert cmpout is None

1
tests/topotests/mgmt_oper/simple-results/result-intf-state-mtu.json
View File

@ -10,3 +10,4 @@
]
}
}

1
tests/topotests/mgmt_oper/simple-results/result-intf-state.json
View File

@ -15,3 +15,4 @@
]
}
}

12
tests/topotests/mgmt_oper/simple-results/result-lib-vrf-default.json
View File

@ -38,7 +38,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -66,7 +67,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -130,7 +132,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -156,7 +159,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}

24
tests/topotests/mgmt_oper/simple-results/result-lib-vrf-nokey.json
View File

@ -38,7 +38,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -66,7 +67,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -130,7 +132,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -156,7 +159,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -224,7 +228,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -252,7 +257,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -287,7 +293,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -313,7 +320,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}

12
tests/topotests/mgmt_oper/simple-results/result-lib-vrf-red.json
View File

@ -38,7 +38,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -66,7 +67,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -101,7 +103,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -127,7 +130,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}

12
tests/topotests/mgmt_oper/simple-results/result-lib-vrf-zebra-ribs.json
View File

@ -34,7 +34,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -62,7 +63,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -126,7 +128,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -152,7 +155,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}

12
tests/topotests/mgmt_oper/simple-results/result-lib-vrf-zebra.json
View File

@ -34,7 +34,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -62,7 +63,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -126,7 +128,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -152,7 +155,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}

24
tests/topotests/mgmt_oper/simple-results/result-lib.json
View File

@ -38,7 +38,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -66,7 +67,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -130,7 +132,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -156,7 +159,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -224,7 +228,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -252,7 +257,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -287,7 +293,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -313,7 +320,8 @@
"gateway": "",
"interface": "r1-eth1",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}

6
tests/topotests/mgmt_oper/simple-results/result-ribs-rib-ipv4-unicast.json
View File

@ -34,7 +34,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -62,7 +63,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}

12
tests/topotests/mgmt_oper/simple-results/result-ribs-rib-nokeys.json
View File

@ -34,7 +34,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -62,7 +63,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -126,7 +128,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -152,7 +155,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}

6
tests/topotests/mgmt_oper/simple-results/result-ribs-rib-route-nokey.json
View File

@ -34,7 +34,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}
@ -62,7 +63,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight": 1
}
]
}

3
tests/topotests/mgmt_oper/simple-results/result-ribs-rib-route-prefix.json
View File

@ -31,7 +31,8 @@
"gateway": "",
"interface": "r1-eth0",
"active": [null],
"fib": [null]
"fib": [null],
"weight":1
}
]
}

2
tests/topotests/mgmt_oper/test_simple.py
View File

@ -181,7 +181,7 @@ vtysh -c 'show mgmt get-data /frr-vrf:lib' > ${resdir}/result-lib.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf' > ${resdir}/result-lib-vrf-nokey.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="default"]' > ${resdir}/result-lib-vrf-default.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="red"]' > ${resdir}/result-lib-vrf-red.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="default"]/frr-zebra:zebra' > ${resdir}/result-lib-vrf-zebra.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="default"]/frr-zebra:zebra' > ${resdir}/result-lib-vrf-ebra.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="default"]/frr-zebra:zebra/ribs' > ${resdir}/result-lib-vrf-zebra-ribs.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="default"]/frr-zebra:zebra/ribs/rib' > ${resdir}/result-ribs-rib-nokeys.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="default"]/frr-zebra:zebra/ribs/rib[afi-safi-name="frr-routing:ipv4-unicast"][table-id="254"]' > ${resdir}/result-ribs-rib-ipv4-unicast.json

8
tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-default.txt
View File

@ -1,11 +1,11 @@
O 10.0.1.0/24 [110/10] is directly connected, r1-eth0, weight 1, XX:XX:XX
C>* 10.0.1.0/24 is directly connected, r1-eth0, XX:XX:XX
L>* 10.0.1.1/32 is directly connected, r1-eth0, XX:XX:XX
C>* 10.0.1.0/24 is directly connected, r1-eth0, weight 1, XX:XX:XX
L>* 10.0.1.1/32 is directly connected, r1-eth0, weight 1, XX:XX:XX
O>* 10.0.2.0/24 [110/20] via 10.0.20.2, r1-eth1, weight 1, XX:XX:XX
B>* 10.0.3.0/24 [20/20] via 10.0.30.3, r1-eth2 (vrf neno), weight 1, XX:XX:XX
O>* 10.0.4.0/24 [110/20] via 10.0.20.2, r1-eth1, weight 1, XX:XX:XX
O 10.0.20.0/24 [110/10] is directly connected, r1-eth1, weight 1, XX:XX:XX
C>* 10.0.20.0/24 is directly connected, r1-eth1, XX:XX:XX
L>* 10.0.20.1/32 is directly connected, r1-eth1, XX:XX:XX
C>* 10.0.20.0/24 is directly connected, r1-eth1, weight 1, XX:XX:XX
L>* 10.0.20.1/32 is directly connected, r1-eth1, weight 1, XX:XX:XX
B>* 10.0.30.0/24 [20/0] is directly connected, neno (vrf neno), weight 1, XX:XX:XX
O>* 10.0.40.0/24 [110/20] via 10.0.20.2, r1-eth1, weight 1, XX:XX:XX

4
tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-neno.txt
View File

@ -2,6 +2,6 @@ VRF neno:
O>* 10.0.3.0/24 [110/20] via 10.0.30.3, r1-eth2, weight 1, XX:XX:XX
B>* 10.0.4.0/24 [20/20] via 10.0.20.2, r1-eth1 (vrf default), weight 1, XX:XX:XX
O 10.0.30.0/24 [110/10] is directly connected, r1-eth2, weight 1, XX:XX:XX
C>* 10.0.30.0/24 is directly connected, r1-eth2, XX:XX:XX
L>* 10.0.30.1/32 is directly connected, r1-eth2, XX:XX:XX
C>* 10.0.30.0/24 is directly connected, r1-eth2, weight 1, XX:XX:XX
L>* 10.0.30.1/32 is directly connected, r1-eth2, weight 1, XX:XX:XX
B>* 10.0.40.0/24 [20/20] via 10.0.20.2, r1-eth1 (vrf default), weight 1, XX:XX:XX

8
tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-default.txt
View File

@ -1,12 +1,12 @@
S>* 0.0.0.0/0 [1/0] via 10.0.20.1, r2-eth1, weight 1, XX:XX:XX
O>* 10.0.1.0/24 [110/20] via 10.0.20.1, r2-eth1, weight 1, XX:XX:XX
O 10.0.2.0/24 [110/10] is directly connected, r2-eth0, weight 1, XX:XX:XX
C>* 10.0.2.0/24 is directly connected, r2-eth0, XX:XX:XX
L>* 10.0.2.2/32 is directly connected, r2-eth0, XX:XX:XX
C>* 10.0.2.0/24 is directly connected, r2-eth0, weight 1, XX:XX:XX
L>* 10.0.2.2/32 is directly connected, r2-eth0, weight 1, XX:XX:XX
O>* 10.0.3.0/24 [110/20] via 10.0.20.1, r2-eth1, weight 1, XX:XX:XX
B>* 10.0.4.0/24 [20/20] via 10.0.40.4, r2-eth2 (vrf ray), weight 1, XX:XX:XX
O 10.0.20.0/24 [110/10] is directly connected, r2-eth1, weight 1, XX:XX:XX
C>* 10.0.20.0/24 is directly connected, r2-eth1, XX:XX:XX
L>* 10.0.20.2/32 is directly connected, r2-eth1, XX:XX:XX
C>* 10.0.20.0/24 is directly connected, r2-eth1, weight 1, XX:XX:XX
L>* 10.0.20.2/32 is directly connected, r2-eth1, weight 1, XX:XX:XX
O>* 10.0.30.0/24 [110/20] via 10.0.20.1, r2-eth1, weight 1, XX:XX:XX
B>* 10.0.40.0/24 [20/0] is directly connected, ray (vrf ray), weight 1, XX:XX:XX

4
tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-ray.txt
View File

@ -6,5 +6,5 @@ O>* 10.0.4.0/24 [110/20] via 10.0.40.4, r2-eth2, weight 1, XX:XX:XX
B 10.0.20.0/24 [20/0] is directly connected, r2-eth1 (vrf default) inactive, weight 1, XX:XX:XX
B>* 10.0.30.0/24 [20/20] via 10.0.20.1, r2-eth1 (vrf default), weight 1, XX:XX:XX
O 10.0.40.0/24 [110/10] is directly connected, r2-eth2, weight 1, XX:XX:XX
C>* 10.0.40.0/24 is directly connected, r2-eth2, XX:XX:XX
L>* 10.0.40.2/32 is directly connected, r2-eth2, XX:XX:XX
C>* 10.0.40.0/24 is directly connected, r2-eth2, weight 1, XX:XX:XX
L>* 10.0.40.2/32 is directly connected, r2-eth2, weight 1, XX:XX:XX

8
tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/zebra-vrf-default.txt
View File

@ -1,10 +1,10 @@
O 10.0.3.0/24 [110/10] is directly connected, r3-eth0, weight 1, XX:XX:XX
C>* 10.0.3.0/24 is directly connected, r3-eth0, XX:XX:XX
L>* 10.0.3.3/32 is directly connected, r3-eth0, XX:XX:XX
C>* 10.0.3.0/24 is directly connected, r3-eth0, weight 1, XX:XX:XX
L>* 10.0.3.3/32 is directly connected, r3-eth0, weight 1, XX:XX:XX
O>* 10.0.4.0/24 [110/20] via 10.0.30.1, r3-eth1, weight 1, XX:XX:XX
O 10.0.30.0/24 [110/10] is directly connected, r3-eth1, weight 1, XX:XX:XX
C>* 10.0.30.0/24 is directly connected, r3-eth1, XX:XX:XX
L>* 10.0.30.3/32 is directly connected, r3-eth1, XX:XX:XX
C>* 10.0.30.0/24 is directly connected, r3-eth1, weight 1, XX:XX:XX
L>* 10.0.30.3/32 is directly connected, r3-eth1, weight 1, XX:XX:XX
O>* 10.0.40.0/24 [110/20] via 10.0.30.1, r3-eth1, weight 1, XX:XX:XX

8
tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/zebra-vrf-default.txt
View File

@ -1,9 +1,9 @@
O>* 10.0.3.0/24 [110/20] via 10.0.40.2, r4-eth1, weight 1, XX:XX:XX
O 10.0.4.0/24 [110/10] is directly connected, r4-eth0, weight 1, XX:XX:XX
C>* 10.0.4.0/24 is directly connected, r4-eth0, XX:XX:XX
L>* 10.0.4.4/32 is directly connected, r4-eth0, XX:XX:XX
C>* 10.0.4.0/24 is directly connected, r4-eth0, weight 1, XX:XX:XX
L>* 10.0.4.4/32 is directly connected, r4-eth0, weight 1, XX:XX:XX
O>* 10.0.30.0/24 [110/20] via 10.0.40.2, r4-eth1, weight 1, XX:XX:XX
O 10.0.40.0/24 [110/10] is directly connected, r4-eth1, weight 1, XX:XX:XX
C>* 10.0.40.0/24 is directly connected, r4-eth1, XX:XX:XX
L>* 10.0.40.4/32 is directly connected, r4-eth1, XX:XX:XX
C>* 10.0.40.0/24 is directly connected, r4-eth1, weight 1, XX:XX:XX
L>* 10.0.40.4/32 is directly connected, r4-eth1, weight 1, XX:XX:XX

8
tests/topotests/ospf_netns_vrf/r1/zebraroute.txt
View File

@ -1,10 +1,10 @@
VRF r1-ospf-cust1:
O 10.0.1.0/24 [110/10] is directly connected, r1-eth0, weight 1, XX:XX:XX
C>* 10.0.1.0/24 is directly connected, r1-eth0, XX:XX:XX
L>* 10.0.1.1/32 is directly connected, r1-eth0, XX:XX:XX
C>* 10.0.1.0/24 is directly connected, r1-eth0, weight 1, XX:XX:XX
L>* 10.0.1.1/32 is directly connected, r1-eth0, weight 1, XX:XX:XX
O>* 10.0.2.0/24 [110/20] via 10.0.3.3, r1-eth1, weight 1, XX:XX:XX
O 10.0.3.0/24 [110/10] is directly connected, r1-eth1, weight 1, XX:XX:XX
C>* 10.0.3.0/24 is directly connected, r1-eth1, XX:XX:XX
L>* 10.0.3.2/32 is directly connected, r1-eth1, XX:XX:XX
C>* 10.0.3.0/24 is directly connected, r1-eth1, weight 1, XX:XX:XX
L>* 10.0.3.2/32 is directly connected, r1-eth1, weight 1, XX:XX:XX
O>* 10.0.10.0/24 [110/20] via 10.0.3.1, r1-eth1, weight 1, XX:XX:XX

8
tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt
View File

@ -1,9 +1,9 @@
VRF r1-ospf-cust1:
O 10.0.1.0/24 [110/10] is directly connected, r1-eth0, weight 1, XX:XX:XX
C>* 10.0.1.0/24 is directly connected, r1-eth0, XX:XX:XX
L>* 10.0.1.1/32 is directly connected, r1-eth0, XX:XX:XX
C>* 10.0.1.0/24 is directly connected, r1-eth0, weight 1, XX:XX:XX
L>* 10.0.1.1/32 is directly connected, r1-eth0, weight 1, XX:XX:XX
O>* 10.0.2.0/24 [110/20] via 10.0.3.3, r1-eth1, weight 1, XX:XX:XX
O 10.0.3.0/24 [110/10] is directly connected, r1-eth1, weight 1, XX:XX:XX
C>* 10.0.3.0/24 is directly connected, r1-eth1, XX:XX:XX
L>* 10.0.3.2/32 is directly connected, r1-eth1, XX:XX:XX
C>* 10.0.3.0/24 is directly connected, r1-eth1, weight 1, XX:XX:XX
L>* 10.0.3.2/32 is directly connected, r1-eth1, weight 1, XX:XX:XX

8
tests/topotests/ospf_netns_vrf/r2/zebraroute.txt
View File

@ -1,10 +1,10 @@
VRF r2-ospf-cust1:
O>* 10.0.1.0/24 [110/20] via 10.0.3.2, r2-eth1, weight 1, XX:XX:XX
O 10.0.2.0/24 [110/10] is directly connected, r2-eth0, weight 1, XX:XX:XX
C>* 10.0.2.0/24 is directly connected, r2-eth0, XX:XX:XX
L>* 10.0.2.1/32 is directly connected, r2-eth0, XX:XX:XX
C>* 10.0.2.0/24 is directly connected, r2-eth0, weight 1, XX:XX:XX
L>* 10.0.2.1/32 is directly connected, r2-eth0, weight 1, XX:XX:XX
O 10.0.3.0/24 [110/10] is directly connected, r2-eth1, weight 1, XX:XX:XX
C>* 10.0.3.0/24 is directly connected, r2-eth1, XX:XX:XX
L>* 10.0.3.3/32 is directly connected, r2-eth1, XX:XX:XX
C>* 10.0.3.0/24 is directly connected, r2-eth1, weight 1, XX:XX:XX
L>* 10.0.3.3/32 is directly connected, r2-eth1, weight 1, XX:XX:XX
O>* 10.0.10.0/24 [110/20] via 10.0.3.1, r2-eth1, weight 1, XX:XX:XX

8
tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt
View File

@ -1,9 +1,9 @@
VRF r2-ospf-cust1:
O>* 10.0.1.0/24 [110/20] via 10.0.3.2, r2-eth1, weight 1, XX:XX:XX
O 10.0.2.0/24 [110/10] is directly connected, r2-eth0, weight 1, XX:XX:XX
C>* 10.0.2.0/24 is directly connected, r2-eth0, XX:XX:XX
L>* 10.0.2.1/32 is directly connected, r2-eth0, XX:XX:XX
C>* 10.0.2.0/24 is directly connected, r2-eth0, weight 1, XX:XX:XX
L>* 10.0.2.1/32 is directly connected, r2-eth0, weight 1, XX:XX:XX
O 10.0.3.0/24 [110/10] is directly connected, r2-eth1, weight 1, XX:XX:XX
C>* 10.0.3.0/24 is directly connected, r2-eth1, XX:XX:XX
L>* 10.0.3.3/32 is directly connected, r2-eth1, XX:XX:XX
C>* 10.0.3.0/24 is directly connected, r2-eth1, weight 1, XX:XX:XX
L>* 10.0.3.3/32 is directly connected, r2-eth1, weight 1, XX:XX:XX

8
tests/topotests/ospf_netns_vrf/r3/zebraroute.txt
View File

@ -2,9 +2,9 @@ VRF r3-ospf-cust1:
O>* 10.0.1.0/24 [110/20] via 10.0.3.2, r3-eth0, weight 1, XX:XX:XX
O>* 10.0.2.0/24 [110/20] via 10.0.3.3, r3-eth0, weight 1, XX:XX:XX
O 10.0.3.0/24 [110/10] is directly connected, r3-eth0, weight 1, XX:XX:XX
C>* 10.0.3.0/24 is directly connected, r3-eth0, XX:XX:XX
L>* 10.0.3.1/32 is directly connected, r3-eth0, XX:XX:XX
C>* 10.0.3.0/24 is directly connected, r3-eth0, weight 1, XX:XX:XX
L>* 10.0.3.1/32 is directly connected, r3-eth0, weight 1, XX:XX:XX
O 10.0.10.0/24 [110/10] is directly connected, r3-eth1, weight 1, XX:XX:XX
C>* 10.0.10.0/24 is directly connected, r3-eth1, XX:XX:XX
L>* 10.0.10.1/32 is directly connected, r3-eth1, XX:XX:XX
C>* 10.0.10.0/24 is directly connected, r3-eth1, weight 1, XX:XX:XX
L>* 10.0.10.1/32 is directly connected, r3-eth1, weight 1, XX:XX:XX

4
tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt
View File

@ -1,5 +1,5 @@
VRF r3-ospf-cust1:
O 10.0.10.0/24 [110/10] is directly connected, r3-eth1, weight 1, XX:XX:XX
C>* 10.0.10.0/24 is directly connected, r3-eth1, XX:XX:XX
L>* 10.0.10.1/32 is directly connected, r3-eth1, XX:XX:XX
C>* 10.0.10.0/24 is directly connected, r3-eth1, weight 1, XX:XX:XX
L>* 10.0.10.1/32 is directly connected, r3-eth1, weight 1, XX:XX:XX

1
zebra/connected.c
View File

@ -185,6 +185,7 @@ void connected_up(struct interface *ifp, struct connected *ifc)
.type = NEXTHOP_TYPE_IFINDEX,
.ifindex = ifp->ifindex,
.vrf_id = ifp->vrf->vrf_id,
.weight = 1,
};
struct zebra_vrf *zvrf;
uint32_t metric;

6
zebra/rt_netlink.c
View File

@ -506,7 +506,7 @@ parse_nexthop_unicast(ns_id_t ns_id, struct rtmsg *rtm, struct rtattr **tb,
void *gate, afi_t afi, vrf_id_t vrf_id)
{
struct interface *ifp = NULL;
struct nexthop nh = {0};
struct nexthop nh = {.weight = 1};
mpls_label_t labels[MPLS_MAX_LABELS] = {0};
int num_labels = 0;
enum seg6local_action_t seg6l_act = ZEBRA_SEG6_LOCAL_ACTION_UNSPEC;
@ -3210,7 +3210,7 @@ static struct nexthop netlink_nexthop_process_nh(struct rtattr **tb,
struct interface **ifp,
ns_id_t ns_id)
{
struct nexthop nh = {};
struct nexthop nh = {.weight = 1};
void *gate = NULL;
enum nexthop_types_t type = 0;
int if_index = 0;
@ -3357,7 +3357,7 @@ int netlink_nexthop_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
vrf_id_t vrf_id = VRF_DEFAULT;
struct interface *ifp = NULL;
struct nhmsg *nhm = NULL;
struct nexthop nh = {};
struct nexthop nh = {.weight = 1};
struct nh_grp grp[MULTIPATH_NUM] = {};
/* Count of nexthops in group array */
uint8_t grp_count = 0;