bgpd: Adjusted topotests to reflect the new "show ip bgp" output

Topotests changed to consider the extra wite space added in "show ip
bgp" output.

Signed-off-by: Cassiano Campes   <cassiano.campes@venkonetworks.com>

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py
index 0deb181f3e5c360ee58a4abcc80c6bebbba60d4f..c98d837069a7b271186d871a5e8cb0c98365b269 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py
@@ -9,9 +9,9 @@ luCommand(
 luCommand(
     "r4", 'vtysh -c "show bgp next"', "99.0.0.. valid", "wait", "See CE static NH"
 )
-luCommand("r1", 'vtysh -c "show bgp ipv4 uni"', "i5.*i5", "wait", "See CE routes")
-luCommand("r3", 'vtysh -c "show bgp ipv4 uni"', "i5.*i5", "wait", "See CE routes")
-luCommand("r4", 'vtysh -c "show bgp ipv4 uni"', "i5.*i5", "wait", "See CE routes")
+luCommand("r1", 'vtysh -c "show bgp ipv4 uni"', "i 5.*i 5", "wait", "See CE routes")
+luCommand("r3", 'vtysh -c "show bgp ipv4 uni"', "i 5.*i 5", "wait", "See CE routes")
+luCommand("r4", 'vtysh -c "show bgp ipv4 uni"', "i 5.*i 5", "wait", "See CE routes")
 luCommand("ce1", 'vtysh -c "show bgp ipv4 uni 5.1.0.0/24"', "", "none", "See CE routes")
 luCommand("r1", 'vtysh -c "show bgp ipv4 uni 5.1.0.0/24"', "", "none", "See CE routes")
 luCommand("ce2", 'vtysh -c "show bgp ipv4 uni 5.1.0.0/24"', "", "none", "See CE routes")
@@ -39,22 +39,22 @@ luCommand(
 luCommand(
     "r3",
     'vtysh -c "show bgp ipv4 vpn"',
-    "i99.0.0.1/32",
+    "i 99.0.0.1/32",
     "wait",
     "See R1s static address",
 )
 luCommand(
     "r4",
     'vtysh -c "show bgp ipv4 vpn"',
-    "i99.0.0.1/32",
+    "i 99.0.0.1/32",
     "wait",
     "See R1s static address",
 )
 luCommand(
-    "r3", 'vtysh -c "show bgp ipv4 vpn rd 10:1"', "i5.*i5", "wait", "See R1s imports"
+    "r3", 'vtysh -c "show bgp ipv4 vpn rd 10:1"', "i 5.*i 5", "wait", "See R1s imports"
 )
 luCommand(
-    "r4", 'vtysh -c "show bgp ipv4 vpn rd 10:1"', "i5.*i5", "wait", "See R1s imports"
+    "r4", 'vtysh -c "show bgp ipv4 vpn rd 10:1"', "i 5.*i 5", "wait", "See R1s imports"
 )
 
 luCommand(
@@ -86,14 +86,14 @@ if have2ndImports:
 luCommand(
     "r1",
     'vtysh -c "show bgp ipv4 vpn"',
-    "i99.0.0.2/32",
+    "i 99.0.0.2/32",
     "wait",
     "See R3s static address",
 )
 luCommand(
     "r4",
     'vtysh -c "show bgp ipv4 vpn"',
-    "i99.0.0.2/32",
+    "i 99.0.0.2/32",
     "wait",
     "See R3s static address",
 )
@@ -101,14 +101,14 @@ if have2ndImports:
     luCommand(
         "r1",
         'vtysh -c "show bgp ipv4 vpn rd 10:3"',
-        "i5.*i5",
+        "i 5.*i 5",
         "none",
         "See R3s imports",
     )
     luCommand(
         "r4",
         'vtysh -c "show bgp ipv4 vpn rd 10:3"',
-        "i5.*i5",
+        "i 5.*i 5",
         "none",
         "See R3s imports",
     )
@@ -133,22 +133,22 @@ luCommand(
 luCommand(
     "r1",
     'vtysh -c "show bgp ipv4 vpn"',
-    "i99.0.0.3/32",
+    "i 99.0.0.3/32",
     "wait",
     "See R4s static address",
 )
 luCommand(
     "r3",
     'vtysh -c "show bgp ipv4 vpn"',
-    "i99.0.0.3/32",
+    "i 99.0.0.3/32",
     "wait",
     "See R4s static address",
 )
 luCommand(
-    "r1", 'vtysh -c "show bgp ipv4 vpn rd 10:4"', "i5.*i5", "wait", "See R4s imports"
+    "r1", 'vtysh -c "show bgp ipv4 vpn rd 10:4"', "i 5.*i 5", "wait", "See R4s imports"
 )
 luCommand(
-    "r3", 'vtysh -c "show bgp ipv4 vpn rd 10:4"', "i5.*i5", "wait", "See R4s imports"
+    "r3", 'vtysh -c "show bgp ipv4 vpn rd 10:4"', "i 5.*i 5", "wait", "See R4s imports"
 )