X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_memif.py;h=befcc2840c574eb2cac4df86769da970c04fccb4;hb=053204ab0;hp=c6e8142030b9babf8017fc9f2215f8251b5b58a3;hpb=9a475373ed9b1ff9952acc06353ddaa50c2c96bd;p=vpp.git

diff --git a/test/vpp_memif.py b/test/vpp_memif.py
index c6e8142030b..befcc2840c5 100644
--- 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,8 +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 = self._test.tempdir + "/" \
-                                   + 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):
@@ -61,11 +66,8 @@ class VppSocketFilename(VppObject):
     def query_vpp_config(self):
         return self._test.vapi.memif_socket_filename_dump()
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
-        return "%d" % (self.socket_id)
+        return "socket-filename-%d-%s" % (self.socket_id, self.socket_filename)
 
 
 class VppMemif(VppObject):
@@ -84,25 +86,41 @@ 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,
-                                          self.tx_queues, self.if_id,
-                                          self.socket_id, self.secret,
-                                          self.ring_size, self.buffer_size,
-                                          self.hw_addr)
-        self.sw_if_index = rv.sw_if_index
+        rv = self._test.vapi.memif_create(
+            role=self.role,
+            mode=self.mode,
+            rx_queues=self.rx_queues,
+            tx_queues=self.tx_queues,
+            id=self.if_id,
+            socket_id=self.socket_id,
+            secret=self.secret,
+            ring_size=self.ring_size,
+            buffer_size=self.buffer_size,
+            hw_addr=self.hw_addr)
+        try:
+            self.sw_if_index = 0
+        except AttributeError:
+            raise AttributeError('self: %s' % self.__dict__)
+        try:
+            self.sw_if_index = rv.sw_if_index
+        except AttributeError:
+            raise AttributeError("%s %s", self, rv)
+
         return self.sw_if_index
 
     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:
@@ -118,9 +136,7 @@ class VppMemif(VppObject):
 
     def config_ip4(self):
         return self._test.vapi.sw_interface_add_del_address(
-            sw_if_index=self.sw_if_index, address=socket.inet_pton(
-                socket.AF_INET, self.ip4_addr),
-            address_length=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)
@@ -132,9 +148,6 @@ class VppMemif(VppObject):
         dump = self._test.vapi.memif_dump()
         return get_if_dump(dump, self.sw_if_index)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         if self.sw_if_index:
             return "%d:%d:%d" % (self.role, self.if_id, self.sw_if_index)