X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVhostUser.py;h=a24bc97633e2bc515c5701877094c11cc53c6fc0;hb=e7a8aec57027b1791178bccacd58facacc322f6a;hp=0c7a79e266e0557f5f1c62eb9421092b6cb44f2a;hpb=12a51f968499f7710a5f54c7cc3bc2afa5c7bc3b;p=csit.git

diff --git a/resources/libraries/python/VhostUser.py b/resources/libraries/python/VhostUser.py
index 0c7a79e266..a24bc97633 100644
--- a/resources/libraries/python/VhostUser.py
+++ b/resources/libraries/python/VhostUser.py
@@ -15,7 +15,7 @@
 
 from robot.api import logger
 
-from resources.libraries.python.PapiExecutor import PapiExecutor
+from resources.libraries.python.PapiExecutor import PapiSocketExecutor
 from resources.libraries.python.topology import NodeType, Topology
 from resources.libraries.python.InterfaceUtil import InterfaceUtil
 
@@ -33,21 +33,17 @@ class VhostUser(object):
             response.
         :rtype: list
         """
-        with PapiExecutor(node) as papi_exec:
-            dump = papi_exec.add("sw_interface_vhost_user_dump").get_dump()
+        cmd = "sw_interface_vhost_user_dump"
+        with PapiSocketExecutor(node) as papi_exec:
+            details = papi_exec.add(cmd).get_details()
 
-        key = "sw_interface_vhost_user_details"
-        data = list()
-        for item in dump.reply[0]["api_reply"]:
-            item[key]["interface_name"] = \
-                item[key]["interface_name"].rstrip('\x00')
-            item[key]["sock_filename"] = \
-                item[key]["sock_filename"].rstrip('\x00')
-            data.append(item)
+        for vhost in details:
+            vhost["interface_name"] = vhost["interface_name"].rstrip('\x00')
+            vhost["sock_filename"] = vhost["sock_filename"].rstrip('\x00')
 
-        logger.debug("VhostUser data:\n{data}".format(data=data))
+        logger.debug("VhostUser details:\n{details}".format(details=details))
 
-        return data
+        return details
 
     @staticmethod
     def vpp_create_vhost_user_interface(node, socket):
@@ -66,26 +62,22 @@ class VhostUser(object):
         args = dict(
             sock_filename=str(socket)
         )
-        with PapiExecutor(node) as papi_exec:
-            data = papi_exec.add(cmd, **args).get_replies(err_msg).\
-                verify_reply(err_msg=err_msg)
-
-        # Extract sw_if_idx:
-        sw_if_idx = data["sw_if_index"]
+        with PapiSocketExecutor(node) as papi_exec:
+            sw_if_index = papi_exec.add(cmd, **args).get_sw_if_index(err_msg)
 
         # Update the Topology:
         if_key = Topology.add_new_port(node, 'vhost')
-        Topology.update_interface_sw_if_index(node, if_key, sw_if_idx)
+        Topology.update_interface_sw_if_index(node, if_key, sw_if_index)
 
-        ifc_name = InterfaceUtil.vpp_get_interface_name(node, sw_if_idx)
+        ifc_name = InterfaceUtil.vpp_get_interface_name(node, sw_if_index)
         Topology.update_interface_name(node, if_key, ifc_name)
 
-        ifc_mac = InterfaceUtil.vpp_get_interface_mac(node, sw_if_idx)
+        ifc_mac = InterfaceUtil.vpp_get_interface_mac(node, sw_if_index)
         Topology.update_interface_mac_address(node, if_key, ifc_mac)
 
         Topology.update_interface_vhost_socket(node, if_key, socket)
 
-        return sw_if_idx
+        return sw_if_index
 
     @staticmethod
     def get_vhost_user_if_name_by_sock(node, socket):