From 7f9bf69df985ca78bfb69e73ce51ba49001ff6dc Mon Sep 17 00:00:00 2001
From: Philippe Guibert <philippe.guibert@6wind.com>
Date: Fri, 29 Oct 2021 10:26:55 +0200
Subject: [PATCH] topotests: bfd_topo3, remove reference to default vrf

Because this test can be run in either netns vrf mode or vrflite
vrf mode, the default vrf name has different name. When netns mode
is chosen, vrf0 name is chosen as default name, while when vrflite
mode is chosen, default name is chosen. Remove the vrf keyword from
the expected dump.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
---
 tests/topotests/bfd_topo3/r1/bfd-peers.json | 9 +++------
 tests/topotests/bfd_topo3/r2/bfd-peers.json | 6 ++----
 tests/topotests/bfd_topo3/r3/bfd-peers.json | 9 +++------
 tests/topotests/bfd_topo3/r4/bfd-peers.json | 6 ++----
 4 files changed, 10 insertions(+), 20 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
     }
 ]