33 files changed, 6 insertions, 5 deletions
diff --git a/tests/topotests/bgp_conditional_advertisement/r2/bgpd.conf b/tests/topotests/bgp_conditional_advertisement/r2/bgpd.conf
index 82525fac64..73f837c69b 100644
--- a/tests/topotests/bgp_conditional_advertisement/r2/bgpd.conf
+++ b/tests/topotests/bgp_conditional_advertisement/r2/bgpd.conf
@@ -19,6 +19,7 @@ route-map ADV-MAP-1 permit 20
 !
 route-map ADV-MAP-2 permit 10
  match ip address prefix-list IP2
+ set metric 911
 !
 route-map EXIST-MAP permit 10
  match community DEFAULT-ROUTE
diff --git a/tests/topotests/bgp_conditional_advertisement/test_bgp_conditional_advertisement.py b/tests/topotests/bgp_conditional_advertisement/test_bgp_conditional_advertisement.py
index e9b393ba7f..6153aee418 100644
--- a/tests/topotests/bgp_conditional_advertisement/test_bgp_conditional_advertisement.py
+++ b/tests/topotests/bgp_conditional_advertisement/test_bgp_conditional_advertisement.py
@@ -334,7 +334,7 @@ def test_bgp_conditional_advertisement():
             "192.0.2.1/32": None,
             "192.0.2.5/32": None,
             "10.139.224.0/20": None,
-            "203.0.113.1/32": [{"protocol": "bgp"}],
+            "203.0.113.1/32": [{"protocol": "bgp", "metric": 911}],
         }
         return topotest.json_cmp(output, expected)
 
diff --git a/tests/topotests/ospf_topo1_vrf/__init__.py b/tests/topotests/ospf_netns_vrf/__init__.py
index e69de29bb2..e69de29bb2 100755
--- a/tests/topotests/ospf_topo1_vrf/__init__.py
+++ b/tests/topotests/ospf_netns_vrf/__init__.py
diff --git a/tests/topotests/ospf_topo1_vrf/r1/ospfd.conf b/tests/topotests/ospf_netns_vrf/r1/ospfd.conf
index e1e2bfb99a..e1e2bfb99a 100644
--- a/tests/topotests/ospf_topo1_vrf/r1/ospfd.conf
+++ b/tests/topotests/ospf_netns_vrf/r1/ospfd.conf
diff --git a/tests/topotests/ospf_topo1_vrf/r1/ospfroute.txt b/tests/topotests/ospf_netns_vrf/r1/ospfroute.txt
index d617ab36d9..d617ab36d9 100644
--- a/tests/topotests/ospf_topo1_vrf/r1/ospfroute.txt
+++ b/tests/topotests/ospf_netns_vrf/r1/ospfroute.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r1/ospfroute_down.txt b/tests/topotests/ospf_netns_vrf/r1/ospfroute_down.txt
index 4f7fd699cf..4f7fd699cf 100644
--- a/tests/topotests/ospf_topo1_vrf/r1/ospfroute_down.txt
+++ b/tests/topotests/ospf_netns_vrf/r1/ospfroute_down.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r1/zebra.conf b/tests/topotests/ospf_netns_vrf/r1/zebra.conf
index 56d7a9764e..56d7a9764e 100644
--- a/tests/topotests/ospf_topo1_vrf/r1/zebra.conf
+++ b/tests/topotests/ospf_netns_vrf/r1/zebra.conf
diff --git a/tests/topotests/ospf_topo1_vrf/r1/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt
index 979af20c59..979af20c59 100644
--- a/tests/topotests/ospf_topo1_vrf/r1/zebraroute.txt
+++ b/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r1/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt
index ec99fad762..ec99fad762 100644
--- a/tests/topotests/ospf_topo1_vrf/r1/zebraroutedown.txt
+++ b/tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r2/ospfd.conf b/tests/topotests/ospf_netns_vrf/r2/ospfd.conf
index c1984276f4..c1984276f4 100644
--- a/tests/topotests/ospf_topo1_vrf/r2/ospfd.conf
+++ b/tests/topotests/ospf_netns_vrf/r2/ospfd.conf
diff --git a/tests/topotests/ospf_topo1_vrf/r2/ospfroute.txt b/tests/topotests/ospf_netns_vrf/r2/ospfroute.txt
index 89763ff733..89763ff733 100644
--- a/tests/topotests/ospf_topo1_vrf/r2/ospfroute.txt
+++ b/tests/topotests/ospf_netns_vrf/r2/ospfroute.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r2/ospfroute_down.txt b/tests/topotests/ospf_netns_vrf/r2/ospfroute_down.txt
index d946f02dfd..d946f02dfd 100644
--- a/tests/topotests/ospf_topo1_vrf/r2/ospfroute_down.txt
+++ b/tests/topotests/ospf_netns_vrf/r2/ospfroute_down.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r2/zebra.conf b/tests/topotests/ospf_netns_vrf/r2/zebra.conf
index 6ff72d1267..6ff72d1267 100644
--- a/tests/topotests/ospf_topo1_vrf/r2/zebra.conf
+++ b/tests/topotests/ospf_netns_vrf/r2/zebra.conf
diff --git a/tests/topotests/ospf_topo1_vrf/r2/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r2/zebraroute.txt
index df66e92abc..df66e92abc 100644
--- a/tests/topotests/ospf_topo1_vrf/r2/zebraroute.txt
+++ b/tests/topotests/ospf_netns_vrf/r2/zebraroute.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r2/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt
index 4afc354ca7..4afc354ca7 100644
--- a/tests/topotests/ospf_topo1_vrf/r2/zebraroutedown.txt
+++ b/tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r3/ospfd.conf b/tests/topotests/ospf_netns_vrf/r3/ospfd.conf
index b73d547e3e..b73d547e3e 100644
--- a/tests/topotests/ospf_topo1_vrf/r3/ospfd.conf
+++ b/tests/topotests/ospf_netns_vrf/r3/ospfd.conf
diff --git a/tests/topotests/ospf_topo1_vrf/r3/ospfroute.txt b/tests/topotests/ospf_netns_vrf/r3/ospfroute.txt
index 917702b14c..917702b14c 100644
--- a/tests/topotests/ospf_topo1_vrf/r3/ospfroute.txt
+++ b/tests/topotests/ospf_netns_vrf/r3/ospfroute.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r3/ospfroute_down.txt b/tests/topotests/ospf_netns_vrf/r3/ospfroute_down.txt
index 966185e495..966185e495 100644
--- a/tests/topotests/ospf_topo1_vrf/r3/ospfroute_down.txt
+++ b/tests/topotests/ospf_netns_vrf/r3/ospfroute_down.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r3/zebra.conf b/tests/topotests/ospf_netns_vrf/r3/zebra.conf
index 1534150048..1534150048 100644
--- a/tests/topotests/ospf_topo1_vrf/r3/zebra.conf
+++ b/tests/topotests/ospf_netns_vrf/r3/zebra.conf
diff --git a/tests/topotests/ospf_topo1_vrf/r3/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r3/zebraroute.txt
index b435c2ebe5..b435c2ebe5 100644
--- a/tests/topotests/ospf_topo1_vrf/r3/zebraroute.txt
+++ b/tests/topotests/ospf_netns_vrf/r3/zebraroute.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r3/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt
index f30a4be6c6..f30a4be6c6 100644
--- a/tests/topotests/ospf_topo1_vrf/r3/zebraroutedown.txt
+++ b/tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt
diff --git a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1-vrf.dot b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.dot
index 789fdd7c09..789fdd7c09 100644
--- a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1-vrf.dot
+++ b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.dot
diff --git a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.jpg b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.jpg
index 85f2e52f8e..85f2e52f8e 100644
--- a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.jpg
+++ b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.jpg
diff --git a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.py b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.py
index 44de61d82a..621d8079dc 100644
--- a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.py
+++ b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 #
-# test_ospf_topo1.py
+# test_ospf_netns_vrf.py
 # Part of NetDEF Topology Tests
 #
 # Copyright (c) 2017 by
@@ -23,7 +23,7 @@
 #
 
 """
-test_ospf_topo1.py: Test the FRR OSPF routing daemon.
+test_ospf_netns_vrf.py: Test OSPF with Network Namespace VRFs.
 """
 
 import os
diff --git a/tests/topotests/ospf_topo2/r1/ospf-route.json b/tests/topotests/ospf_unnumbered/r1/ospf-route.json
index 6beb7e9bed..6beb7e9bed 100644
--- a/tests/topotests/ospf_topo2/r1/ospf-route.json
+++ b/tests/topotests/ospf_unnumbered/r1/ospf-route.json
diff --git a/tests/topotests/ospf_topo2/r1/ospfd.conf b/tests/topotests/ospf_unnumbered/r1/ospfd.conf
index 65843cbb83..65843cbb83 100644
--- a/tests/topotests/ospf_topo2/r1/ospfd.conf
+++ b/tests/topotests/ospf_unnumbered/r1/ospfd.conf
diff --git a/tests/topotests/ospf_topo2/r1/v4_route.json b/tests/topotests/ospf_unnumbered/r1/v4_route.json
index 76c6396169..76c6396169 100644
--- a/tests/topotests/ospf_topo2/r1/v4_route.json
+++ b/tests/topotests/ospf_unnumbered/r1/v4_route.json
diff --git a/tests/topotests/ospf_topo2/r1/zebra.conf b/tests/topotests/ospf_unnumbered/r1/zebra.conf
index d96d9707c1..d96d9707c1 100644
--- a/tests/topotests/ospf_topo2/r1/zebra.conf
+++ b/tests/topotests/ospf_unnumbered/r1/zebra.conf
diff --git a/tests/topotests/ospf_topo2/r2/ospf-route.json b/tests/topotests/ospf_unnumbered/r2/ospf-route.json
index 3cfd255bfd..3cfd255bfd 100644
--- a/tests/topotests/ospf_topo2/r2/ospf-route.json
+++ b/tests/topotests/ospf_unnumbered/r2/ospf-route.json
diff --git a/tests/topotests/ospf_topo2/r2/ospfd.conf b/tests/topotests/ospf_unnumbered/r2/ospfd.conf
index b032f1a8ac..b032f1a8ac 100644
--- a/tests/topotests/ospf_topo2/r2/ospfd.conf
+++ b/tests/topotests/ospf_unnumbered/r2/ospfd.conf
diff --git a/tests/topotests/ospf_topo2/r2/v4_route.json b/tests/topotests/ospf_unnumbered/r2/v4_route.json
index 1638536388..1638536388 100644
--- a/tests/topotests/ospf_topo2/r2/v4_route.json
+++ b/tests/topotests/ospf_unnumbered/r2/v4_route.json
diff --git a/tests/topotests/ospf_topo2/r2/zebra.conf b/tests/topotests/ospf_unnumbered/r2/zebra.conf
index f9dd2c4471..f9dd2c4471 100644
--- a/tests/topotests/ospf_topo2/r2/zebra.conf
+++ b/tests/topotests/ospf_unnumbered/r2/zebra.conf
diff --git a/tests/topotests/ospf_topo2/test_ospf_topo2.py b/tests/topotests/ospf_unnumbered/test_ospf_unnumbered.py
index 1ad62ff18e..a9640adca3 100644
--- a/tests/topotests/ospf_topo2/test_ospf_topo2.py
+++ b/tests/topotests/ospf_unnumbered/test_ospf_unnumbered.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 #
-# test_ospf_topo2.py
+# test_ospf_unnumbered.py
 #
 # Copyright (c) 2019 by
 # Cumulus Networks, Inc
@@ -23,7 +23,7 @@
 #
 
 """
-test_ospf_topo2.py: Test the OSPF unnumbered.
+test_ospf_unnumbered.py: Test the OSPF unnumbered.
 """
 
 import os