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

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>

diff --git a/tests/topotests/all_protocol_startup/r1/ip_nht.ref b/tests/topotests/all_protocol_startup/r1/ip_nht.ref
index a2f3d3b0db4e2dd5dcebd461e6f8d1c6c630b4cf..3592f29b545429ee9f858eebed71ac1db3a33823 100644 (file)
--- a/tests/topotests/all_protocol_startup/r1/ip_nht.ref
+++ b/tests/topotests/all_protocol_startup/r1/ip_nht.ref
@@ -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

diff --git a/tests/topotests/all_protocol_startup/r1/ipv4_routes.ref b/tests/topotests/all_protocol_startup/r1/ipv4_routes.ref
index a4a4aba3d1813382b66d875ff3becf8cc93d9499..33c44780b4542a5198daf1668a6a09b2f6fdb1df 100644 (file)
--- a/tests/topotests/all_protocol_startup/r1/ipv4_routes.ref
+++ b/tests/topotests/all_protocol_startup/r1/ipv4_routes.ref
@@ -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

diff --git a/tests/topotests/all_protocol_startup/r1/ipv6_nht.ref b/tests/topotests/all_protocol_startup/r1/ipv6_nht.ref
index 100a36a8d6abb69a64d302e2117c234cff6a40fa..7b71761185d836dbb9ac243bdbb30e82f134c6ef 100644 (file)
--- a/tests/topotests/all_protocol_startup/r1/ipv6_nht.ref
+++ b/tests/topotests/all_protocol_startup/r1/ipv6_nht.ref
@@ -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)
 

diff --git a/tests/topotests/all_protocol_startup/r1/ipv6_routes.ref b/tests/topotests/all_protocol_startup/r1/ipv6_routes.ref
index a25b53aa21bf801d7fd767aaf431d4b17649311b..f5c1d6d7d232e9f61e41a9984c0bba3b312d53c8 100644 (file)
--- a/tests/topotests/all_protocol_startup/r1/ipv6_routes.ref
+++ b/tests/topotests/all_protocol_startup/r1/ipv6_routes.ref
@@ -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

diff --git a/tests/topotests/bgp_features/r1/ip_route.json b/tests/topotests/bgp_features/r1/ip_route.json
index 34c58033ad518db3322a964ff50768b86597e37f..3f95e27078ffed71821f31798cfb62b6626bb70d 100644 (file)
--- a/tests/topotests/bgp_features/r1/ip_route.json
+++ b/tests/topotests/bgp_features/r1/ip_route.json
@@ -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,

diff --git a/tests/topotests/bgp_features/r1/ip_route_norib.json b/tests/topotests/bgp_features/r1/ip_route_norib.json
index f6536d1e9f31d84b1e9397c575acb77236c333b2..b8e0fc288306eaf594afaf65d47c6be467e151c7 100644 (file)
--- a/tests/topotests/bgp_features/r1/ip_route_norib.json
+++ b/tests/topotests/bgp_features/r1/ip_route_norib.json
@@ -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,

diff --git a/tests/topotests/bgp_link_bw_ip/r1/ip-route-1.json b/tests/topotests/bgp_link_bw_ip/r1/ip-route-1.json
index bb50bc96d910e24b067028731b1f285bbaaca7f8..5773d86065335b8bf15f73b95d6a349a2aca2279 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r1/ip-route-1.json
+++ b/tests/topotests/bgp_link_bw_ip/r1/ip-route-1.json
@@ -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
         }
       ]
     }

diff --git a/tests/topotests/bgp_link_bw_ip/r1/ip-route-2.json b/tests/topotests/bgp_link_bw_ip/r1/ip-route-2.json
index 57726ce46c23a4cf7130f94d978f5730409be43f..a65eb8f591753e8b4c6c5aff8e76eae48bac21f2 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r1/ip-route-2.json
+++ b/tests/topotests/bgp_link_bw_ip/r1/ip-route-2.json
@@ -12,7 +12,7 @@
         {
           "fib":true,
           "ip":"11.1.1.2",
-          "weight":255
+          "weight":254
         }
       ]
     }

diff --git a/tests/topotests/bgp_link_bw_ip/r1/ip-route-3.json b/tests/topotests/bgp_link_bw_ip/r1/ip-route-3.json
index f2368dfdc5352fbc49c98b10f408bfdcfd859d68..a1546f57ec7201ede1fa06c9dab159b6eb17ccf1 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r1/ip-route-3.json
+++ b/tests/topotests/bgp_link_bw_ip/r1/ip-route-3.json
@@ -12,7 +12,7 @@
         {
           "fib":true,
           "ip":"11.1.1.2",
-          "weight":255
+          "weight":254
         }
       ]
     }

diff --git a/tests/topotests/bgp_link_bw_ip/r1/ip-route-6.json b/tests/topotests/bgp_link_bw_ip/r1/ip-route-6.json
index 7b4da2a8d036f05046a579782cd409ff0d6748f2..0444d2d6cb123a7c03df72985552a08ab74e1d12 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r1/ip-route-6.json
+++ b/tests/topotests/bgp_link_bw_ip/r1/ip-route-6.json
@@ -7,7 +7,7 @@
         {
           "fib":true,
           "ip":"11.1.1.2",
-          "weight":255
+          "weight":254
         }
       ]
     }

diff --git a/tests/topotests/bgp_link_bw_ip/r1/ip-route-7.json b/tests/topotests/bgp_link_bw_ip/r1/ip-route-7.json
index 3062d1cf8b6baa642ecec2fa49670da78a0c62a6..dd84a0f373fcdd29fea748b16a690f0b101a5e6b 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r1/ip-route-7.json
+++ b/tests/topotests/bgp_link_bw_ip/r1/ip-route-7.json
@@ -7,7 +7,7 @@
         {
           "fib":true,
           "ip":"11.1.1.2",
-          "weight":255
+          "weight":254
         }
       ]
     }

diff --git a/tests/topotests/bgp_link_bw_ip/r1/ip-route-8.json b/tests/topotests/bgp_link_bw_ip/r1/ip-route-8.json
index 662b7f716cdf3f8d58b3ffe42fc60af272ae7cd8..63b7a6b5086b860ceea0538de882931c6ce94061 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r1/ip-route-8.json
+++ b/tests/topotests/bgp_link_bw_ip/r1/ip-route-8.json
@@ -12,7 +12,7 @@
         {
           "fib":true,
           "ip":"11.1.1.2",
-          "weight":255
+          "weight":254
         }
       ]
     }

diff --git a/tests/topotests/bgp_link_bw_ip/r1/ip-route-9.json b/tests/topotests/bgp_link_bw_ip/r1/ip-route-9.json
index d9b5a8992dd954372b3e4736a4a2428386ed0351..edd764a80acca4298cc077c28bf62a9b465eb882 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r1/ip-route-9.json
+++ b/tests/topotests/bgp_link_bw_ip/r1/ip-route-9.json
@@ -12,7 +12,7 @@
         {
           "fib":true,
           "ip":"11.1.1.2",
-          "weight":255
+          "weight":254
         }
       ]
     }

diff --git a/tests/topotests/bgp_link_bw_ip/r2/ip-route-2.json b/tests/topotests/bgp_link_bw_ip/r2/ip-route-2.json
index 53be1171f6ec0536df43aacd78e5401c3434ca0c..05928b11677c0cc7ec6c346f6d0e2bf349c948cb 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r2/ip-route-2.json
+++ b/tests/topotests/bgp_link_bw_ip/r2/ip-route-2.json
@@ -12,7 +12,7 @@
         {
           "fib":true,
           "ip":"11.1.2.2",
-          "weight":255
+          "weight":254
         }
       ]
     }

diff --git a/tests/topotests/bgp_weighted_ecmp_recursive/test_bgp_weighted_ecmp_recursive.py b/tests/topotests/bgp_weighted_ecmp_recursive/test_bgp_weighted_ecmp_recursive.py
index 7a6d068e56bdd32f9dc09d8d2409203cb996d2de..5dc917bd1a8ad8b52a7299ee06ad49895be1888c 100644 (file)
--- a/tests/topotests/bgp_weighted_ecmp_recursive/test_bgp_weighted_ecmp_recursive.py
+++ b/tests/topotests/bgp_weighted_ecmp_recursive/test_bgp_weighted_ecmp_recursive.py
@@ -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,
                         },
                     ],
                 }

diff --git a/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-default.json b/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-default.json
index 435d7336fcfab05ff3929d91a5dbc23d81dea4a6..948f4e6c23b44ec587c0544f6473e66c8f4df2c4 100644 (file)
--- a/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-default.json
+++ b/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-default.json
@@ -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 @@
     ]
   }
 }
-

diff --git a/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-nokey.json b/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-nokey.json
index 1a1f6480faaf8c91005a0ab3ec3f9059fadc4dfd..30daecf16ebcc69549c24a82b113c13dcb27a3f1 100644 (file)
--- a/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-nokey.json
+++ b/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-nokey.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-zebra-ribs.json b/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-zebra-ribs.json
index 2e2b8ec7ad133257b7d65c32b499dbef72c9042b..b1124bd7bb55c82d858edb7f3a369c4ff077cc40 100644 (file)
--- a/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-zebra-ribs.json
+++ b/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-zebra-ribs.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-zebra.json b/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-zebra.json
index 2e2b8ec7ad133257b7d65c32b499dbef72c9042b..70c8798b31fe1e4284b4623e8b2840ef553312f5 100644 (file)
--- a/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-zebra.json
+++ b/tests/topotests/mgmt_oper/oper-results/result-lib-vrf-zebra.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/oper-results/result-lib.json b/tests/topotests/mgmt_oper/oper-results/result-lib.json
index 1a1f6480faaf8c91005a0ab3ec3f9059fadc4dfd..0b2a9fa4270a59c7e79d07653406b66abbd829b3 100644 (file)
--- a/tests/topotests/mgmt_oper/oper-results/result-lib.json
+++ b/tests/topotests/mgmt_oper/oper-results/result-lib.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/oper-results/result-ribs-rib-ipv4-unicast.json b/tests/topotests/mgmt_oper/oper-results/result-ribs-rib-ipv4-unicast.json
index 956d3a8922e966cf3ac4dc549000c70aed234531..769c1f73a5799c2f906c7f8802262a9bcce59234 100644 (file)
--- a/tests/topotests/mgmt_oper/oper-results/result-ribs-rib-ipv4-unicast.json
+++ b/tests/topotests/mgmt_oper/oper-results/result-ribs-rib-ipv4-unicast.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/oper-results/result-ribs-rib-nokeys.json b/tests/topotests/mgmt_oper/oper-results/result-ribs-rib-nokeys.json
index 2e2b8ec7ad133257b7d65c32b499dbef72c9042b..c740f592f7bc7143ead47a150d3dc8a989a0b419 100644 (file)
--- a/tests/topotests/mgmt_oper/oper-results/result-ribs-rib-nokeys.json
+++ b/tests/topotests/mgmt_oper/oper-results/result-ribs-rib-nokeys.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/oper.py b/tests/topotests/mgmt_oper/oper.py
index 934093aeee0ed001c11a7e9d4ceafc662d21abd5..9fc504569d50e7a51472020966beac0effab7125 100644 (file)
--- a/tests/topotests/mgmt_oper/oper.py
+++ b/tests/topotests/mgmt_oper/oper.py
@@ -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
 
 

diff --git a/tests/topotests/mgmt_oper/simple-results/result-intf-state-mtu.json b/tests/topotests/mgmt_oper/simple-results/result-intf-state-mtu.json
index 60359716d729a15c72ef3ddf390b3e0c722a2c0a..018ed99f40114c27bf017d18313d826885e12d28 100644 (file)
--- a/tests/topotests/mgmt_oper/simple-results/result-intf-state-mtu.json
+++ b/tests/topotests/mgmt_oper/simple-results/result-intf-state-mtu.json
@@ -10,3 +10,4 @@
     ]
   }
 }
+

diff --git a/tests/topotests/mgmt_oper/simple-results/result-intf-state.json b/tests/topotests/mgmt_oper/simple-results/result-intf-state.json
index 981df024cd5213333efe9befa33a4a54c00ca569..35669fd5715de02d32ea8dae802b144df7caa6e0 100644 (file)
--- a/tests/topotests/mgmt_oper/simple-results/result-intf-state.json
+++ b/tests/topotests/mgmt_oper/simple-results/result-intf-state.json
@@ -15,3 +15,4 @@
     ]
   }
 }
+

diff --git a/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-default.json b/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-default.json
index cea4bf5a6ba4cc7e175dfc4c0c4ce545443253f1..f85b163bd6bbe79c4aefb910e5fe2b10684ee470 100644 (file)
--- a/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-default.json
+++ b/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-default.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-nokey.json b/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-nokey.json
index 75414ca0453d05d998f2142bb33d703078956253..e2cfec972443c06bdafcf59091c334c2952fd6fa 100644 (file)
--- a/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-nokey.json
+++ b/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-nokey.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-red.json b/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-red.json
index 05382316a31295bfd0a1ddfdff76ecdacdeb6833..3567f35a349b4f5482c1b62fe56416a53cf60b71 100644 (file)
--- a/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-red.json
+++ b/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-red.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-zebra-ribs.json b/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-zebra-ribs.json
index 4f40820bb6578bfcb3f411d4c2d852a5da8a8230..d9ca58d25d91dda461490d1c25d31ac485def4f5 100644 (file)
--- a/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-zebra-ribs.json
+++ b/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-zebra-ribs.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-zebra.json b/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-zebra.json
index 4f40820bb6578bfcb3f411d4c2d852a5da8a8230..d9ca58d25d91dda461490d1c25d31ac485def4f5 100644 (file)
--- a/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-zebra.json
+++ b/tests/topotests/mgmt_oper/simple-results/result-lib-vrf-zebra.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/simple-results/result-lib.json b/tests/topotests/mgmt_oper/simple-results/result-lib.json
index 75414ca0453d05d998f2142bb33d703078956253..e2cfec972443c06bdafcf59091c334c2952fd6fa 100644 (file)
--- a/tests/topotests/mgmt_oper/simple-results/result-lib.json
+++ b/tests/topotests/mgmt_oper/simple-results/result-lib.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-ipv4-unicast.json b/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-ipv4-unicast.json
index 7ce60c3bdbca362caec70151255c5e2be5f68d26..11766ce9c1ea4244829b0dd4247ce97e8c75b96f 100644 (file)
--- a/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-ipv4-unicast.json
+++ b/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-ipv4-unicast.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-nokeys.json b/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-nokeys.json
index 4f40820bb6578bfcb3f411d4c2d852a5da8a8230..d9ca58d25d91dda461490d1c25d31ac485def4f5 100644 (file)
--- a/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-nokeys.json
+++ b/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-nokeys.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-route-nokey.json b/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-route-nokey.json
index 7ce60c3bdbca362caec70151255c5e2be5f68d26..11766ce9c1ea4244829b0dd4247ce97e8c75b96f 100644 (file)
--- a/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-route-nokey.json
+++ b/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-route-nokey.json
@@ -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
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-route-prefix.json b/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-route-prefix.json
index 833d418f9a4c2a5a271eafb73eb35cd3d1d9be19..ef4a4ab1313f5013926d5bf7056e9246f5a179b0 100644 (file)
--- a/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-route-prefix.json
+++ b/tests/topotests/mgmt_oper/simple-results/result-ribs-rib-route-prefix.json
@@ -31,7 +31,8 @@
                               "gateway": "",
                               "interface": "r1-eth0",
                               "active": [null],
-                              "fib": [null]
+                              "fib": [null],
+                              "weight":1
                             }
                           ]
                         }

diff --git a/tests/topotests/mgmt_oper/test_simple.py b/tests/topotests/mgmt_oper/test_simple.py
index 3b115f62389b1e2e0029b56c6f2b4b50b2eb69ff..2b3d6ff6a52a872a9cd224d6b0fbac96aef60049 100644 (file)
--- a/tests/topotests/mgmt_oper/test_simple.py
+++ b/tests/topotests/mgmt_oper/test_simple.py
@@ -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

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-default.txt b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-default.txt
index 248375dc6c019f4a14fd85686b21fd1669fbe55f..797bced7b8bee4eca030847ef72200571027d723 100644 (file)
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-default.txt
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-default.txt
@@ -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

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-neno.txt b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-neno.txt
index 6e1335243bc0acd1932badd61e7c9054f79c56fb..1dc574f360856031bfd0955d7c31ad767eafb029 100644 (file)
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-neno.txt
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-neno.txt
@@ -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

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-default.txt b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-default.txt
index d7d31434c6d56b82c28e8c72dc9bea4d7e17f008..b5e81bc0e9a8b7d9f4d9940a6ba44dcd9a63ad3a 100644 (file)
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-default.txt
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-default.txt
@@ -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

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-ray.txt b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-ray.txt
index 1495c8893670df9335e4fe2bb5df15902b410395..c403496ff66e6edfa588e3d856e21be27efa360b 100644 (file)
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-ray.txt
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-ray.txt
@@ -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

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/zebra-vrf-default.txt b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/zebra-vrf-default.txt
index b1701fe177938abe020355117f7d94b509f1374b..db4e268cb01806de2d94849afb2fb974e7535c33 100644 (file)
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/zebra-vrf-default.txt
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/zebra-vrf-default.txt
@@ -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
 
 

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/zebra-vrf-default.txt b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/zebra-vrf-default.txt
index 3723a8a8cbd28b4dd2f8158f0384c878bb18889e..4865708578e2d4bee367c0b3c724d7480f740f8f 100644 (file)
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/zebra-vrf-default.txt
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/zebra-vrf-default.txt
@@ -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
 

diff --git a/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt
index bf874ac762c057e0caea8086f63f06e34ecb87ae..68fd30d4ccbad3dacb644d1ec17a34592c350de3 100644 (file)
--- a/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt
+++ b/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt
@@ -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
 

diff --git a/tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt
index e515205307dcf402f8091dc14261aa28b7295767..f0bce905b1326879fc098ef8ee6fa2d1d0f55426 100644 (file)
--- a/tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt
+++ b/tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt
@@ -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
 

diff --git a/tests/topotests/ospf_netns_vrf/r2/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r2/zebraroute.txt
index 3763ef80060f6fe80fb0538f83b1d00c6e0e5087..098eceb28bedfe83c4c859f2dd0ffd4e529f5954 100644 (file)
--- a/tests/topotests/ospf_netns_vrf/r2/zebraroute.txt
+++ b/tests/topotests/ospf_netns_vrf/r2/zebraroute.txt
@@ -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
 

diff --git a/tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt
index f6eaba6e1d4178a249b3042dcd3ff1887e1334a9..a9300f8dfafba4104d36ee7443c1bb343817b530 100644 (file)
--- a/tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt
+++ b/tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt
@@ -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
 

diff --git a/tests/topotests/ospf_netns_vrf/r3/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r3/zebraroute.txt
index 5eb92efd2067a16668d80dad94d319df1d8b1e0a..f58beb81a729fe188f1cc4303e159f8ba97c8340 100644 (file)
--- a/tests/topotests/ospf_netns_vrf/r3/zebraroute.txt
+++ b/tests/topotests/ospf_netns_vrf/r3/zebraroute.txt
@@ -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
 

diff --git a/tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt
index 26cc19660a8fa1851b1651ff9cdb38d61ae1819c..cfedf8fcb47284d039fc118586d36768da76d2bd 100644 (file)
--- a/tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt
+++ b/tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt
@@ -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
 

diff --git a/zebra/connected.c b/zebra/connected.c
index 404f892f6e5c688fd3caf087b4435efcfa6480d6..974a1c17a2925bbaba48b8b6eca0597b9ae6350b 100644 (file)
--- a/zebra/connected.c
+++ b/zebra/connected.c
@@ -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;

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 768090badbb905726c929bd0364dcbd4af60051c..c22145be693b368ec804beb30404d4ec60e22914 100644 (file)
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -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;