VPP-1508: Tests: Fix vpp_api struct.error under py3.

[vpp.git] / test / vpp_memif.py

diff --git a/test/vpp_memif.py b/test/vpp_memif.py
index 2095480..4ad9ffd 100644 (file)
--- a/test/vpp_memif.py
+++ b/test/vpp_memif.py
@@ -1,5 +1,7 @@
 import socket
 
+import six
+
 from vpp_object import VppObject
 
 
@@ -50,7 +52,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):
@@ -117,8 +121,9 @@ 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, address=socket.inet_pton(
+                socket.AF_INET, self.ip4_addr),
+            address_length=self.ip4_addr_len)
 
     def remove_vpp_config(self):
         self._test.vapi.memif_delete(self.sw_if_index)