X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpapi%2Fvpp_papi_provider.py;h=1136be52dddd6b6b892705a040239d82a34e893d;hp=ee0d538fba47fea4aa8d939d1c05d39cf115c7cb;hb=7cac9ce6ee499efae7d631c022453b7dba8a3290;hpb=fe1975eb1ac994df1bd759deda7154bb7dd9d7a7

diff --git a/resources/tools/papi/vpp_papi_provider.py b/resources/tools/papi/vpp_papi_provider.py
index ee0d538fba..1136be52dd 100755
--- a/resources/tools/papi/vpp_papi_provider.py
+++ b/resources/tools/papi/vpp_papi_provider.py
@@ -91,25 +91,33 @@ def _convert_reply(api_r):
     """
     unwanted_fields = ['count', 'index', 'context']
 
+    def process_value(val):
+        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
+        elif isinstance(val, list):
+            for idx, val_l in enumerate(val):
+                val[idx] = process_value(val_l)
+            return val
+        elif hasattr(val, '__int__'):
+            return int(val)
+        elif hasattr(val, '__str__'):
+            return binascii.hexlify(str(val))
+        # Next handles parameters not supporting preferred integer or string
+        # representation to get it logged
+        elif hasattr(val, '__repr__'):
+            return repr(val)
+        else:
+            return val
+
     reply_dict = dict()
     reply_key = repr(api_r).split('(')[0]
     reply_value = dict()
     for item in dir(api_r):
         if not item.startswith('_') and item not in unwanted_fields:
-            attr_value = getattr(api_r, item)
-            if isinstance(attr_value, list) or isinstance(attr_value, dict):
-                value = attr_value
-            elif hasattr(attr_value, '__int__'):
-                value = int(attr_value)
-            elif hasattr(attr_value, '__str__'):
-                value = binascii.hexlify(str(attr_value))
-            # Next handles parameters not supporting preferred integer or string
-            # representation to get it logged
-            elif hasattr(attr_value, '__repr__'):
-                value = repr(attr_value)
-            else:
-                value = attr_value
-            reply_value[item] = value
+            reply_value[item] = process_value(getattr(api_r, item))
     reply_dict[reply_key] = reply_value
     return reply_dict
 
@@ -137,6 +145,10 @@ def process_json_request(args):
             for val_k, val_v in val.iteritems():
                 val_dict[str(val_k)] = process_value(val_v)
             return val_dict
+        elif isinstance(val, list):
+            for idx, item in enumerate(val):
+                val[idx] = process_value(item)
+            return val
         elif isinstance(val, unicode):
             return binascii.unhexlify(val)
         elif isinstance(val, int):
@@ -214,6 +226,33 @@ def process_stats(args):
             reply=reply, exc=repr(err)))
 
 
+def process_stats_request(args):
+    """Process the VPP Stats requests.
+
+    :param args: Command line arguments passed to VPP PAPI Provider.
+    :type args: ArgumentParser
+    :returns: JSON formatted string.
+    :rtype: str
+    :raises RuntimeError: If PAPI command error occurs.
+    """
+
+    try:
+        stats = VPPStats(args.socket)
+    except Exception as err:
+        raise RuntimeError('PAPI init failed:\n{err}'.format(err=repr(err)))
+
+    try:
+        json_data = json.loads(args.data)
+    except ValueError as err:
+        raise RuntimeError('Input json string is invalid:\n{err}'.
+                           format(err=repr(err)))
+
+    papi_fn = getattr(stats, json_data["api_name"])
+    reply = papi_fn(**json_data.get("api_args", {}))
+
+    return json.dumps(reply)
+
+
 def main():
     """Main function for the Python API provider.
     """
@@ -222,7 +261,8 @@ def main():
     process_request = dict(
         request=process_json_request,
         dump=process_json_request,
-        stats=process_stats
+        stats=process_stats,
+        stats_request=process_stats_request
     )
 
     parser = argparse.ArgumentParser(