X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_memif.py;h=226f8af72b5d9ecc9f73f17fb9f2613d9392cb4c;hb=cfcc42e29;hp=7fa450927407f93ca7e94325ac96b9ff771df5cd;hpb=097fa66b986f06281f603767d321ab13ab6c88c3;p=vpp.git

diff --git a/test/vpp_memif.py b/test/vpp_memif.py
index 7fa45092740..226f8af72b5 100644
--- a/test/vpp_memif.py
+++ b/test/vpp_memif.py
@@ -1,19 +1,8 @@
 import socket
-
-import six
+from ipaddress import IPv4Network
 
 from vpp_object import VppObject
-
-
-class MEMIF_ROLE:
-    MASTER = 0
-    SLAVE = 1
-
-
-class MEMIF_MODE:
-    ETHERNET = 0
-    IP = 1
-    PUNT_INJECT = 2
+from vpp_papi import VppEnum
 
 
 def get_if_dump(dump, sw_if_index):
@@ -52,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):
@@ -84,8 +72,9 @@ 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 = 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(
@@ -99,31 +88,31 @@ class VppMemif(VppObject):
             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)
+            # rv doesn't have .sw_if_index attribute
+            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:
             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
@@ -132,9 +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, 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)
 
     def remove_vpp_config(self):
         self._test.vapi.memif_delete(self.sw_if_index)