tests: get bgp_l3vpn_to_bgp_vrf running, also improve logging

Signed-off-by: Lou Berger <lberger@labn.net>

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py
index 8fd344696e46e24aad0652aa52e1dbf3f5e6cc30..fce8e708f2fa828d620076315c8c145b10080369 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py
@@ -206,7 +206,7 @@ def ltemplatePreRouterStartHook():
         for cmd in cmds:
             cc.doCmd(tgen, rtr, cmd.format(rtr))
         cc.doCmd(tgen, rtr, "ip link set dev {0}-eth0 master {0}-cust2".format(rtr))
-    if cc.getOutput() != 4:
+    if cc.getOutput() != 0:
         InitSuccess = False
         logger.info(
             "Unexpected output seen ({} times, tests will be skipped".format(
@@ -214,6 +214,11 @@ def ltemplatePreRouterStartHook():
             )
         )
     else:
+        rtrs = ["r1", "r3", "r4", "ce4"]
+        for rtr in rtrs:
+            logger.info("{} configured".format(rtr))
+            cc.doCmd(tgen, rtr, "ip -d link show type vrf")
+            cc.doCmd(tgen, rtr, "ip link show")
         InitSuccess = True
         logger.info("VRF config successful!")
     return InitSuccess

diff --git a/tests/topotests/lib/ltemplate.py b/tests/topotests/lib/ltemplate.py
index 910573c14c5674174f7acee1ebf79fae597f0554..c98bfac9ee6dc79e87c404f65662771e7b1e5e2a 100644 (file)
--- a/tests/topotests/lib/ltemplate.py
+++ b/tests/topotests/lib/ltemplate.py
@@ -217,6 +217,7 @@ class ltemplateRtrCmd:
         self.resetCounts()
 
     def doCmd(self, tgen, rtr, cmd, checkstr=None):
+        logger.info("doCmd: {} {}".format(rtr, cmd))
         output = tgen.net[rtr].cmd(cmd).strip()
         if len(output):
             self.output += 1
@@ -227,9 +228,10 @@ class ltemplateRtrCmd:
                 else:
                     self.match += 1
                 return ret
-            logger.info("command: {} {}".format(rtr, cmd))
             logger.info("output: " + output)
-        self.none += 1
+        else:
+            logger.info("No output")
+            self.none += 1
         return None
 
     def resetCounts(self):