MAP: Use explicit address/prefix types in API

[vpp.git] / test / vpp_interface.py

diff --git a/test/vpp_interface.py b/test/vpp_interface.py
index 8891dde..1fe6652 100644 (file)
--- a/test/vpp_interface.py
+++ b/test/vpp_interface.py
@@ -1,8 +1,7 @@
 from abc import abstractmethod, ABCMeta
 import socket
 
-from util import Host, mk_ll_addr
-from vpp_neighbor import VppNeighbor
+from util import Host, mk_ll_addr, mactobinary
 
 
 class VppInterface(object):
@@ -24,6 +23,22 @@ class VppInterface(object):
         """MAC-address of the VPP interface."""
         return self._local_mac
 
+    @property
+    def local_addr(self):
+        return self._local_addr
+
+    @property
+    def remote_addr(self):
+        return self._remote_addr
+
+    @property
+    def local_addr_n(self):
+        return self._local_addr_n
+
+    @property
+    def remote_addr_n(self):
+        return self._remote_addr_n
+
     @property
     def local_ip4(self):
         """Local IPv4 address on VPP interface (string)."""
@@ -54,25 +69,37 @@ class VppInterface(object):
         """Local IPv6 address - raw, suitable as API parameter."""
         return socket.inet_pton(socket.AF_INET6, self.local_ip6)
 
+    @property
+    def remote_ip6(self):
+        """IPv6 address of remote peer "connected" to this interface."""
+        return self._remote_hosts[0].ip6
+
+    @property
+    def remote_ip6n(self):
+        """IPv6 address of remote peer - raw, suitable as API parameter"""
+        return socket.inet_pton(socket.AF_INET6, self.remote_ip6)
+
     @property
     def local_ip6_ll(self):
-        """Local IPv6 linnk-local address on VPP interface (string)."""
+        """Local IPv6 link-local address on VPP interface (string)."""
         return self._local_ip6_ll
 
     @property
     def local_ip6n_ll(self):
         """Local IPv6 link-local address - raw, suitable as API parameter."""
-        return self.local_ip6n_ll
+        return self._local_ip6n_ll
 
     @property
-    def remote_ip6(self):
-        """IPv6 address of remote peer "connected" to this interface."""
-        return self._remote_hosts[0].ip6
+    def remote_ip6_ll(self):
+        """Link-local IPv6 address of remote peer
+        "connected" to this interface."""
+        return self._remote_ip6_ll
 
     @property
-    def remote_ip6n(self):
-        """IPv6 address of remote peer - raw, suitable as API parameter"""
-        return socket.inet_pton(socket.AF_INET6, self.remote_ip6)
+    def remote_ip6n_ll(self):
+        """Link-local IPv6 address of remote peer
+        - raw, suitable as API parameter"""
+        return self._remote_ip6n_ll
 
     @property
     def name(self):
@@ -159,6 +186,16 @@ class VppInterface(object):
         self._hosts_by_ip4 = {}
         self._hosts_by_ip6 = {}
 
+    def set_mac(self, mac):
+        self._local_mac = mac
+        self._local_ip6_ll = mk_ll_addr(mac)
+        self.test.vapi.sw_interface_set_mac_address(
+            self.sw_if_index,
+            mactobinary(self._local_mac))
+
+    def set_sw_if_index(self, sw_if_index):
+        self._sw_if_index = sw_if_index
+
         self.generate_remote_hosts()
 
         self._local_ip4 = "172.16.%u.1" % self.sw_if_index
@@ -179,6 +216,15 @@ class VppInterface(object):
         self.has_ip6_config = False
         self.ip6_table_id = 0
 
+        self._local_addr = {socket.AF_INET: self.local_ip4,
+                            socket.AF_INET6: self.local_ip6}
+        self._local_addr_n = {socket.AF_INET: self.local_ip4n,
+                              socket.AF_INET6: self.local_ip6n}
+        self._remote_addr = {socket.AF_INET: self.remote_ip4,
+                             socket.AF_INET6: self.remote_ip6}
+        self._remote_addr_n = {socket.AF_INET: self.remote_ip4n,
+                               socket.AF_INET6: self.remote_ip6n}
+
         r = self.test.vapi.sw_interface_dump()
         for intf in r:
             if intf.sw_if_index == self.sw_if_index:
@@ -196,6 +242,9 @@ class VppInterface(object):
         self._local_ip6_ll = mk_ll_addr(self.local_mac)
         self._local_ip6n_ll = socket.inet_pton(socket.AF_INET6,
                                                self.local_ip6_ll)
+        self._remote_ip6_ll = mk_ll_addr(self.remote_mac)
+        self._remote_ip6n_ll = socket.inet_pton(socket.AF_INET6,
+                                                self.remote_ip6_ll)
 
     def config_ip4(self):
         """Configure IPv4 address on the VPP interface."""
@@ -377,10 +426,34 @@ class VppInterface(object):
         dump = self.test.vapi.sw_interface_dump()
         return self.is_interface_config_in_dump(dump)
 
-    def is_interface_config_in_dump(self, dump):
+    def get_interface_config_from_dump(self, dump):
         for i in dump:
             if i.interface_name.rstrip(' \t\r\n\0') == self.name and \
                i.sw_if_index == self.sw_if_index:
-                return True
+                return i
         else:
-            return False
+            return None
+
+    def is_interface_config_in_dump(self, dump):
+        return self.get_interface_config_from_dump(dump) is not None
+
+    def assert_interface_state(self, admin_up_down, link_up_down,
+                               expect_event=False):
+        if expect_event:
+            event = self.test.vapi.wait_for_event(timeout=1,
+                                                  name='sw_interface_event')
+            self.test.assert_equal(event.sw_if_index, self.sw_if_index,
+                                   "sw_if_index")
+            self.test.assert_equal(event.admin_up_down, admin_up_down,
+                                   "admin state")
+            self.test.assert_equal(event.link_up_down, link_up_down,
+                                   "link state")
+        dump = self.test.vapi.sw_interface_dump()
+        if_state = self.get_interface_config_from_dump(dump)
+        self.test.assert_equal(if_state.admin_up_down, admin_up_down,
+                               "admin state")
+        self.test.assert_equal(if_state.link_up_down, link_up_down,
+                               "link state")
+
+    def __str__(self):
+        return self.name