X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FMemif.py;h=b4c184e1bedb457af00bae4229b3d558378e27c5;hp=e3cea939ecaa1223d4a7f7030930707874828e71;hb=73a01b1a7fc836c964627eea2c08106df0da5aee;hpb=7bfb36dfd9284bbca10881e31e14108c7d468b7c

diff --git a/resources/libraries/python/Memif.py b/resources/libraries/python/Memif.py
index e3cea939ec..b4c184e1be 100644
--- a/resources/libraries/python/Memif.py
+++ b/resources/libraries/python/Memif.py
@@ -25,16 +25,23 @@ class Memif(object):
         pass
 
     @staticmethod
-    def create_memif_interface(node, socket, mid, role='master'):
+    def create_memif_interface(node, filename, mid, sid, rxq=1, txq=1,
+                               role='slave'):
         """Create Memif interface on the given node.
 
         :param node: Given node to create Memif interface on.
-        :param socket: Memif interface socket path.
+        :param filename: Memif interface socket filename.
         :param mid: Memif interface ID.
+        :param sid: Socket ID.
+        :param rxq: Number of RX queues.
+        :param txq: Number of TX queues.
         :param role: Memif interface role [master|slave]. Default is master.
         :type node: dict
-        :type socket: str
+        :type filename: str
         :type mid: str
+        :type sid: str
+        :type rxq: int
+        :type txq: int
         :type role: str
         :returns: SW interface index.
         :rtype: int
@@ -43,8 +50,11 @@ class Memif(object):
 
         with VatTerminal(node, json_param=False) as vat:
             vat.vat_terminal_exec_cmd_from_template(
-                'memif_create.vat',
-                socket=socket, id=mid, role=role)
+                'memif_socket_filename_add_del.vat',
+                add_del='add', id=sid, filename='/tmp/'+filename)
+            vat.vat_terminal_exec_cmd_from_template(
+                'memif_create.vat', id=mid, socket=sid, rxq=rxq, txq=txq,
+                role=role)
             if 'sw_if_index' in vat.vat_stdout:
                 try:
                     sw_if_idx = int(vat.vat_stdout.split()[4])
@@ -56,7 +66,8 @@ class Memif(object):
                     Topology.update_interface_name(node, if_key, ifc_name)
                     ifc_mac = Memif.vpp_get_memif_interface_mac(node, sw_if_idx)
                     Topology.update_interface_mac_address(node, if_key, ifc_mac)
-                    Topology.update_interface_memif_socket(node, if_key, socket)
+                    Topology.update_interface_memif_socket(node, if_key,
+                                                           '/tmp/'+filename)
                     Topology.update_interface_memif_id(node, if_key, mid)
                     Topology.update_interface_memif_role(node, if_key, role)
                     return sw_if_idx
@@ -67,6 +78,16 @@ class Memif(object):
                 raise ValueError('Create Memif interface failed on node '
                                  '{}'.format(node['host']))
 
+    @staticmethod
+    def dump_memif(node):
+        """Dump Memif data for the given node.
+
+        :param node: Given node to show Memif data on.
+        :type node: dict
+        """
+        vat = VatExecutor()
+        vat.execute_script("memif_dump.vat", node, json_out=False)
+
     @staticmethod
     def show_memif(node):
         """Show Memif data for the given node.
@@ -75,7 +96,7 @@ class Memif(object):
         :type node: dict
         """
         vat = VatExecutor()
-        vat.execute_script("memif_dump.vat", node, json_out=False)
+        vat.execute_script("show_memif.vat", node, json_out=False)
 
     @staticmethod
     def clear_memif_socks(node, *socks):
@@ -154,7 +175,7 @@ class Memif(object):
             for item in memif_data:
                 if memif_data[item]['sw_if_index'] == str(sw_if_idx):
                     return item
-                return None
+        return None
 
     @staticmethod
     def vpp_get_memif_interface_mac(node, sw_if_idx):