X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVppCounters.py;h=b2c3b01c60d4435cfd7bcbb556b802bc2c924636;hb=1999c2ecc15760a57bdf34498635432ddb0321e0;hp=8247a1e8abf1c56713335cc4669664976abce831;hpb=d40746ab2134b0cedb2199685aab0ca8cea649cb;p=csit.git

diff --git a/resources/libraries/python/VppCounters.py b/resources/libraries/python/VppCounters.py
index 8247a1e8ab..b2c3b01c60 100644
--- a/resources/libraries/python/VppCounters.py
+++ b/resources/libraries/python/VppCounters.py
@@ -26,16 +26,6 @@ class VppCounters(object):
     def __init__(self):
         self._stats_table = None
 
-    def vpp_nodes_clear_interface_counters(self, nodes):
-        """Clear interface counters on all VPP nodes in topology.
-
-        :param nodes: Nodes in topology.
-        :type nodes: dict
-        """
-        for node in nodes.values():
-            if node['type'] == NodeType.DUT:
-                self.vpp_clear_interface_counters(node)
-
     @staticmethod
     def vpp_show_errors(node):
         """Run "show errors" debug CLI command.
@@ -45,6 +35,7 @@ class VppCounters(object):
         """
         vat = VatExecutor()
         vat.execute_script("show_errors.vat", node, json_out=False)
+        vat.script_should_have_passed()
 
     @staticmethod
     def vpp_show_errors_verbose(node):
@@ -55,6 +46,7 @@ class VppCounters(object):
         """
         vat = VatExecutor()
         vat.execute_script("show_errors_verbose.vat", node, json_out=False)
+        vat.script_should_have_passed()
 
     @staticmethod
     def vpp_show_errors_on_all_duts(nodes, verbose=False):
@@ -82,6 +74,7 @@ class VppCounters(object):
         """
         vat = VatExecutor()
         vat.execute_script("show_runtime.vat", node, json_out=False)
+        vat.script_should_have_passed()
 
     @staticmethod
     def show_runtime_counters_on_all_duts(nodes):
@@ -103,6 +96,7 @@ class VppCounters(object):
         """
         vat = VatExecutor()
         vat.execute_script("show_runtime_verbose.vat", node, json_out=False)
+        vat.script_should_have_passed()
 
     @staticmethod
     def vpp_show_hardware_detail(node):
@@ -113,6 +107,7 @@ class VppCounters(object):
         """
         vat = VatExecutor()
         vat.execute_script("show_hardware_detail.vat", node, json_out=False)
+        vat.script_should_have_passed()
 
     @staticmethod
     def vpp_clear_runtime(node):
@@ -123,6 +118,7 @@ class VppCounters(object):
         """
         vat = VatExecutor()
         vat.execute_script("clear_runtime.vat", node, json_out=False)
+        vat.script_should_have_passed()
 
     @staticmethod
     def clear_runtime_counters_on_all_duts(nodes):
@@ -212,8 +208,7 @@ class VppCounters(object):
             vat.vat_terminal_exec_cmd('want_stats enable')
             for _ in range(0, 12):
                 stats_table = vat.vat_terminal_exec_cmd('dump_stats_table')
-                if_counters = stats_table['interface_counters']
-                if len(if_counters) > 0:
+                if stats_table['interface_counters']:
                     self._stats_table = stats_table
                     return stats_table
                 time.sleep(1)
@@ -263,15 +258,15 @@ class VppCounters(object):
             return 0
 
         if_counters = self._stats_table.get('interface_counters')
-        if if_counters is None or len(if_counters) == 0:
+        if not if_counters:
             logger.trace('No interface counters.')
             return 0
         for counter in if_counters:
             if counter['vnet_counter_type'] == version:
                 data = counter['data']
                 return data[if_index]
-        logger.trace('{i} {v} counter not found.'.format(i=interface,
-                                                         v=version))
+        logger.trace('{i} {v} counter not found.'.format(
+            i=interface, v=version))
         return 0
 
     @staticmethod