API: Cleanup APIs interface.api

[vpp.git] / test / vpp_memif.py

diff --git a/test/vpp_memif.py b/test/vpp_memif.py
index 2095480..88b9189 100644 (file)
--- a/test/vpp_memif.py
+++ b/test/vpp_memif.py
@@ -1,6 +1,10 @@
 import socket
 
+import six
+
 from vpp_object import VppObject
+from vpp_ip import VppIpPrefix
+from vpp_papi import VppEnum
 
 
 class MEMIF_ROLE:
@@ -50,7 +54,9 @@ class VppSocketFilename(VppObject):
         rv = self._test.vapi.memif_socket_filename_add_del(
             1, self.socket_id, self.socket_filename)
         if self.add_default_folder:
-            self.socket_filename = "/run/vpp/" + self.socket_filename
+            self.socket_filename = b"%s/%s" % (
+                six.ensure_binary(self._test.tempdir, encoding='utf-8'),
+                self.socket_filename)
         return rv
 
     def remove_vpp_config(self):
@@ -83,8 +89,8 @@ class VppMemif(VppObject):
         self.buffer_size = buffer_size
         self.hw_addr = hw_addr
         self.sw_if_index = None
-        self.ip4_addr = "192.168.%d.%d" % (self.if_id + 1, self.role + 1)
-        self.ip4_addr_len = 24
+        self.ip_prefix = VppIpPrefix("192.168.%d.%d" %
+                                     (self.if_id + 1, self.role + 1), 24)
 
     def add_vpp_config(self):
         rv = self._test.vapi.memif_create(self.role, self.mode, self.rx_queues,
@@ -97,11 +103,13 @@ class VppMemif(VppObject):
 
     def admin_up(self):
         if self.sw_if_index:
-            return self._test.vapi.sw_interface_set_flags(self.sw_if_index, 1)
+            return self._test.vapi.sw_interface_set_flags(
+                sw_if_index=self.sw_if_index, flags=1)
 
     def admin_down(self):
         if self.sw_if_index:
-            return self._test.vapi.sw_interface_set_flags(self.sw_if_index, 0)
+            return self._test.vapi.sw_interface_set_flags(
+                sw_if_index=self.sw_if_index, flags=0)
 
     def wait_for_link_up(self, timeout, step=1):
         if not self.sw_if_index:
@@ -117,8 +125,7 @@ class VppMemif(VppObject):
 
     def config_ip4(self):
         return self._test.vapi.sw_interface_add_del_address(
-            self.sw_if_index, socket.inet_pton(
-                socket.AF_INET, self.ip4_addr), self.ip4_addr_len)
+            sw_if_index=self.sw_if_index, prefix=self.ip_prefix.encode())
 
     def remove_vpp_config(self):
         self._test.vapi.memif_delete(self.sw_if_index)