Align suite/test teardown/setup

+ Phase II - aligning FUNC/PERF setup.
  + 2n/3n compatibility of suite setup.
  + Same structure of testcase for DEV/PERF.
  + DEVICE tests are now running VPP startup config in same
    way as PERF.
  + DEVICE is using COREKEEPER!
- DEVICE tests are running topology compute twice for backward
  compatibility. TODO to remove.
- Still phase III needed to align TAGS, LIBRARIES and remove OLD
  setup phase.

Change-Id: Ib6e1b0ebf4abebf3cbe73b4fda5cac953c2a7270
Signed-off-by: Peter Mikus <pmikus@cisco.com>

2 files changed, 3 insertions, 8 deletions

diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py
index 46b1ffb034..34bfc1efe5 100644
--- a/resources/libraries/python/InterfaceUtil.py
+++ b/resources/libraries/python/InterfaceUtil.py
@@ -1543,9 +1543,6 @@ class InterfaceUtil(object):
         :rtype: list
         :raises RuntimeError: If a reason preventing initialization is found.
         """
-        ssh = SSH()
-        ssh.connect(node)
-
         # Read PCI address and driver.
         pf_pci_addr = Topology.get_interface_pci_addr(node, ifc_key)
         pf_mac_addr = Topology.get_interface_mac(node, ifc_key).split(":")
diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py
index c60509f018..03d39d3e23 100644
--- a/resources/libraries/python/VPPUtil.py
+++ b/resources/libraries/python/VPPUtil.py
@@ -216,7 +216,7 @@ class VPPUtil(object):
             host=node['host'], if_data=if_data))
 
     @staticmethod
-    def vpp_enable_traces_on_dut(node, fail_on_error=True):
+    def vpp_enable_traces_on_dut(node, fail_on_error=False):
         """Enable vpp packet traces on the DUT node.
 
         :param node: DUT node to set up.
@@ -234,14 +234,12 @@ class VPPUtil(object):
         for cmd in cmds:
             try:
                 PapiExecutor.run_cli_cmd(node, cmd)
-            except AssertionError as err:
+            except AssertionError:
                 if fail_on_error:
                     raise
-                else:
-                    logger.error(repr(err))
 
     @staticmethod
-    def vpp_enable_traces_on_all_duts(nodes, fail_on_error=True):
+    def vpp_enable_traces_on_all_duts(nodes, fail_on_error=False):
         """Enable vpp packet traces on all DUTs in the given topology.
 
         :param nodes: Nodes in the topology.