Merge pull request #9940 from pguibert6WIND/misc_topotests

simplify some topotests config with naming default vrf

8 files changed, 13 insertions, 29 deletions

diff --git a/tests/topotests/bfd_topo3/r1/bfd-peers.json b/tests/topotests/bfd_topo3/r1/bfd-peers.json
index f8a354fc20..3ce8d97f15 100644
--- a/tests/topotests/bfd_topo3/r1/bfd-peers.json
+++ b/tests/topotests/bfd_topo3/r1/bfd-peers.json
@@ -18,9 +18,8 @@
         "remote-receive-interval": 2000,
         "remote-transmit-interval": 2000,
         "status": "up",
-        "transmit-interval": 2000,
         "uptime": "*",
-        "vrf": "default"
+        "transmit-interval": 2000
     },
     {
         "detect-multiplier": 3,
@@ -41,9 +40,8 @@
         "remote-receive-interval": 600,
         "remote-transmit-interval": 600,
         "status": "up",
-        "transmit-interval": 600,
         "uptime": "*",
-        "vrf": "default"
+        "transmit-interval": 600
     },
     {
         "detect-multiplier": 3,
@@ -64,8 +62,7 @@
         "remote-receive-interval": 2000,
         "remote-transmit-interval": 2000,
         "status": "up",
-        "transmit-interval": 2000,
         "uptime": "*",
-        "vrf": "default"
+        "transmit-interval": 2000
     }
 ]
diff --git a/tests/topotests/bfd_topo3/r2/bfd-peers.json b/tests/topotests/bfd_topo3/r2/bfd-peers.json
index 786d66dbe3..a40f7e46cf 100644
--- a/tests/topotests/bfd_topo3/r2/bfd-peers.json
+++ b/tests/topotests/bfd_topo3/r2/bfd-peers.json
@@ -18,9 +18,8 @@
         "remote-receive-interval": 600,
         "remote-transmit-interval": 600,
         "status": "up",
-        "transmit-interval": 600,
         "uptime": "*",
-        "vrf": "default"
+        "transmit-interval": 600
     },
     {
         "detect-multiplier": 3,
@@ -41,8 +40,7 @@
         "remote-receive-interval": 2000,
         "remote-transmit-interval": 2000,
         "status": "up",
-        "transmit-interval": 2000,
         "uptime": "*",
-        "vrf": "default"
+        "transmit-interval": 2000
     }
 ]
diff --git a/tests/topotests/bfd_topo3/r3/bfd-peers.json b/tests/topotests/bfd_topo3/r3/bfd-peers.json
index 1f58663a4e..2182b26ed3 100644
--- a/tests/topotests/bfd_topo3/r3/bfd-peers.json
+++ b/tests/topotests/bfd_topo3/r3/bfd-peers.json
@@ -18,9 +18,8 @@
         "remote-receive-interval": 2000,
         "remote-transmit-interval": 2000,
         "status": "up",
-        "transmit-interval": 2000,
         "uptime": "*",
-        "vrf": "default"
+        "transmit-interval": 2000
     },
     {
         "detect-multiplier": 3,
@@ -41,9 +40,8 @@
         "remote-receive-interval": 2000,
         "remote-transmit-interval": 2000,
         "status": "up",
-        "transmit-interval": 2000,
         "uptime": "*",
-        "vrf": "default"
+        "transmit-interval": 2000
     },
     {
         "detect-multiplier": 3,
@@ -64,8 +62,7 @@
         "remote-receive-interval": 2000,
         "remote-transmit-interval": 2000,
         "status": "up",
-        "transmit-interval": 2000,
         "uptime": "*",
-        "vrf": "default"
+        "transmit-interval": 2000
     }
 ]
diff --git a/tests/topotests/bfd_topo3/r4/bfd-peers.json b/tests/topotests/bfd_topo3/r4/bfd-peers.json
index 5477f39120..2f41f25c58 100644
--- a/tests/topotests/bfd_topo3/r4/bfd-peers.json
+++ b/tests/topotests/bfd_topo3/r4/bfd-peers.json
@@ -18,9 +18,8 @@
         "remote-receive-interval": 2000,
         "remote-transmit-interval": 2000,
         "status": "up",
-        "transmit-interval": 2000,
         "uptime": "*",
-        "vrf": "default"
+        "transmit-interval": 2000
     },
     {
         "detect-multiplier": 3,
@@ -41,8 +40,7 @@
         "remote-receive-interval": 2000,
         "remote-transmit-interval": 2000,
         "status": "up",
-        "transmit-interval": 2000,
         "uptime": "*",
-        "vrf": "default"
+        "transmit-interval": 2000
     }
 ]
diff --git a/tests/topotests/bgp_ecmp_topo1/r1/summary.txt b/tests/topotests/bgp_ecmp_topo1/r1/summary.txt
index f0929536d3..68de28a35b 100644
--- a/tests/topotests/bgp_ecmp_topo1/r1/summary.txt
+++ b/tests/topotests/bgp_ecmp_topo1/r1/summary.txt
@@ -2,7 +2,7 @@
 "ipv4Unicast":{
   "routerId":"10.0.255.1",
   "as":100,
-  "vrfName":"Default",
+  "vrfName":"default",
   "peerCount":20,
   "peers":{
     "10.0.1.101":{
diff --git a/tests/topotests/bgp_ecmp_topo1/r1/summary20.txt b/tests/topotests/bgp_ecmp_topo1/r1/summary20.txt
index 9015f485f8..4895cdbecf 100644
--- a/tests/topotests/bgp_ecmp_topo1/r1/summary20.txt
+++ b/tests/topotests/bgp_ecmp_topo1/r1/summary20.txt
@@ -1,7 +1,7 @@
 {
   "routerId":"10.0.255.1",
   "as":100,
-  "vrfName":"Default",
+  "vrfName":"default",
   "peerCount":20,
   "peers":{
     "10.0.1.101":{
diff --git a/tests/topotests/bgp_ecmp_topo1/test_bgp_ecmp_topo1.py b/tests/topotests/bgp_ecmp_topo1/test_bgp_ecmp_topo1.py
index 982a076bfb..96e4bf6ed3 100644
--- a/tests/topotests/bgp_ecmp_topo1/test_bgp_ecmp_topo1.py
+++ b/tests/topotests/bgp_ecmp_topo1/test_bgp_ecmp_topo1.py
@@ -140,12 +140,6 @@ def test_bgp_convergence():
         with 'json') and compare with `data` contents.
         """
         output = router.vtysh_cmd(cmd, isjson=True)
-        if "ipv4Unicast" in output:
-            output["ipv4Unicast"]["vrfName"] = output["ipv4Unicast"]["vrfName"].replace(
-                "default", "Default"
-            )
-        elif "vrfName" in output:
-            output["vrfName"] = output["vrfName"].replace("default", "Default")
         return topotest.json_cmp(output, data)
 
     test_func = functools.partial(
diff --git a/tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py b/tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py
index 6ea281e6f0..3e2fb2b6e0 100644
--- a/tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py
+++ b/tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py
@@ -148,7 +148,7 @@ def setup_module(mod):
             router.load_config(
                 TopoRouter.RD_ZEBRA,
                 os.path.join(CWD, "{}/zebra.conf".format(rname)),
-                "--vrfwnetns -o vrf0",
+                "--vrfwnetns",
             )
         else:
             router.load_config(