Merging upstream version 10.2.

Signed-off-by: Daniel Baumann <daniel@debian.org>

7 files changed, 24 insertions, 24 deletions

diff --git a/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt
index bf874ac7..68fd30d4 100644
--- 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 e5152053..f0bce905 100644
--- 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 3763ef80..098eceb2 100644
--- 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 f6eaba6e..a9300f8d 100644
--- 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 5eb92efd..f58beb81 100644
--- 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 26cc1966..cfedf8fc 100644
--- 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/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.py b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.py
index 4fc93b58..718445f0 100644
--- a/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.py
+++ b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.py
@@ -104,13 +104,13 @@ def setup_module(mod):
             tgen.set_error("unsupported version")
 
 
-def teardown_module(mod):
+def teardown_module():
     "Teardown the pytest environment"
     tgen = get_topogen()
 
     # Move interfaces out of vrf namespace and delete the namespace
     router_list = tgen.routers()
-    for rname, router in router_list.items():
+    for rname, _ in router_list.items():
         tgen.net[rname].reset_intf_netns(rname + "-eth0")
         tgen.net[rname].reset_intf_netns(rname + "-eth1")
         tgen.net[rname].delete_netns(rname + "-ospf-cust1")