X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_memif.py;h=226f8af72b5d9ecc9f73f17fb9f2613d9392cb4c;hb=233683180638d1c7f517b713722cbbeb3b4be86e;hp=88b9189032d992b0ee42141a3d50cde008aacfc7;hpb=e63325e3ca03c847963863446345e6c80a2c0cfd;p=vpp.git

diff --git a/test/vpp_memif.py b/test/vpp_memif.py
index 88b9189032d..226f8af72b5 100644
--- a/test/vpp_memif.py
+++ b/test/vpp_memif.py
@@ -1,23 +1,10 @@
 import socket
-
-import six
+from ipaddress import IPv4Network
 
 from vpp_object import VppObject
-from vpp_ip import VppIpPrefix
 from vpp_papi import VppEnum
 
 
-class MEMIF_ROLE:
-    MASTER = 0
-    SLAVE = 1
-
-
-class MEMIF_MODE:
-    ETHERNET = 0
-    IP = 1
-    PUNT_INJECT = 2
-
-
 def get_if_dump(dump, sw_if_index):
     for d in dump:
         if (d.sw_if_index == sw_if_index):
@@ -54,9 +41,8 @@ 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 = b"%s/%s" % (
-                six.ensure_binary(self._test.tempdir, encoding='utf-8'),
-                self.socket_filename)
+            self.socket_filename = "%s/%s" % (self._test.tempdir,
+                                              self.socket_filename)
         return rv
 
     def remove_vpp_config(self):
@@ -66,11 +52,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):
@@ -89,16 +72,28 @@ class VppMemif(VppObject):
         self.buffer_size = buffer_size
         self.hw_addr = hw_addr
         self.sw_if_index = None
-        self.ip_prefix = VppIpPrefix("192.168.%d.%d" %
-                                     (self.if_id + 1, self.role + 1), 24)
+        self.ip_prefix = IPv4Network("192.168.%d.%d/24" %
+                                     (self.if_id + 1, self.role + 1),
+                                     strict=False)
 
     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 = rv.sw_if_index
+        except AttributeError:
+            # rv doesn't have .sw_if_index attribute
+            raise AttributeError("%s %s" % (self, rv))
+
         return self.sw_if_index
 
     def admin_up(self):
@@ -116,7 +111,8 @@ class VppMemif(VppObject):
             return False
         while True:
             dump = self.query_vpp_config()
-            if dump.link_up_down == 1:
+            f = VppEnum.vl_api_if_status_flags_t.IF_STATUS_API_FLAG_LINK_UP
+            if dump.flags & f:
                 return True
             self._test.sleep(step)
             timeout -= step
@@ -125,7 +121,7 @@ class VppMemif(VppObject):
 
     def config_ip4(self):
         return self._test.vapi.sw_interface_add_del_address(
-            sw_if_index=self.sw_if_index, prefix=self.ip_prefix.encode())
+            sw_if_index=self.sw_if_index, prefix=self.ip_prefix)
 
     def remove_vpp_config(self):
         self._test.vapi.memif_delete(self.sw_if_index)
@@ -137,9 +133,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)