FIX: IPUtil after vpp api changes

[csit.git] / resources / libraries / python / PapiExecutor.py

diff --git a/resources/libraries/python/PapiExecutor.py b/resources/libraries/python/PapiExecutor.py
index 5e35422..30a9047 100644 (file)
--- a/resources/libraries/python/PapiExecutor.py
+++ b/resources/libraries/python/PapiExecutor.py
@@ -290,20 +290,24 @@ class PapiExecutor(object):
     def __exit__(self, exc_type, exc_val, exc_tb):
         self._ssh.disconnect(self._node)
 
-    def add(self, csit_papi_command="vpp-stats", **kwargs):
+    def add(self, csit_papi_command="vpp-stats", history=True, **kwargs):
         """Add next command to internal command list; return self.
 
         The argument name 'csit_papi_command' must be unique enough as it cannot
         be repeated in kwargs.
 
         :param csit_papi_command: VPP API command.
+        :param history: Enable/disable adding command to PAPI command history.
         :param kwargs: Optional key-value arguments.
         :type csit_papi_command: str
+        :type history: bool
         :type kwargs: dict
         :returns: self, so that method chaining is possible.
         :rtype: PapiExecutor
         """
-        PapiHistory.add_to_papi_history(self._node, csit_papi_command, **kwargs)
+        if history:
+            PapiHistory.add_to_papi_history(
+                self._node, csit_papi_command, **kwargs)
         self._api_command_list.append(dict(api_name=csit_papi_command,
                                            api_args=kwargs))
         return self
@@ -480,10 +484,13 @@ class PapiExecutor(object):
             :rtype: dict or str or int
             """
             if isinstance(val, dict):
-                val_dict = dict()
                 for val_k, val_v in val.iteritems():
-                    val_dict[str(val_k)] = process_value(val_v)
-                return val_dict
+                    val[str(val_k)] = process_value(val_v)
+                return val
+            elif isinstance(val, list):
+                for idx, val_l in enumerate(val):
+                    val[idx] = process_value(val_l)
+                return val
             else:
                 return binascii.hexlify(val) if isinstance(val, str) else val
 
@@ -509,12 +516,32 @@ class PapiExecutor(object):
         :returns: Processed API reply / a part of API reply.
         :rtype: dict
         """
+        def process_value(val):
+            """Process value.
+
+            :param val: Value to be processed.
+            :type val: object
+            :returns: Processed value.
+            :rtype: dict or str or int
+            """
+            if isinstance(val, dict):
+                for val_k, val_v in val.iteritems():
+                    val[str(val_k)] = process_value(val_v)
+                return val
+            elif isinstance(val, list):
+                for idx, val_l in enumerate(val):
+                    val[idx] = process_value(val_l)
+                return val
+            elif isinstance(val, unicode):
+                return binascii.unhexlify(val)
+            else:
+                return val
+
         reply_dict = dict()
         reply_value = dict()
         for reply_key, reply_v in api_r.iteritems():
             for a_k, a_v in reply_v.iteritems():
-                reply_value[a_k] = binascii.unhexlify(a_v) \
-                    if isinstance(a_v, unicode) else a_v
+                reply_value[a_k] = process_value(a_v)
             reply_dict[reply_key] = reply_value
         return reply_dict