fib: fib api updates

[vpp.git] / test / vpp_memif.py

diff --git a/test/vpp_memif.py b/test/vpp_memif.py
index 4ad9ffd..7fa4509 100644 (file)
--- a/test/vpp_memif.py
+++ b/test/vpp_memif.py
@@ -64,11 +64,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):
@@ -91,12 +88,26 @@ class VppMemif(VppObject):
         self.ip4_addr_len = 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):
@@ -135,9 +146,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)