Add with-statment support to VatTerminal.

Change-Id: I7b4b32ce07b9247ccf80bf6b5d3339d00bc0999f
Signed-off-by: Matej Klotton <mklotton@cisco.com>

1 files changed, 10 insertions, 13 deletions

diff --git a/resources/libraries/python/VppCounters.py b/resources/libraries/python/VppCounters.py
index b99d65274b..caae06c495 100644
--- a/resources/libraries/python/VppCounters.py
+++ b/resources/libraries/python/VppCounters.py
@@ -83,19 +83,16 @@ class VppCounters(object):
            :type node: dict
            :return: Stats table.
         """
-        vat = VatTerminal(node)
-        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:
-                self._stats_table = stats_table
-                vat.vat_terminal_close()
-                return stats_table
-            time.sleep(1)
-
-        vat.vat_terminal_close()
-        return None
+        with VatTerminal(node) as vat:
+            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:
+                    self._stats_table = stats_table
+                    return stats_table
+                time.sleep(1)
+            return None
 
     def vpp_get_ipv4_interface_counter(self, node, interface):
         return self.vpp_get_ipv46_interface_counter(node, interface, False)