X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_interface.py;h=1db34ba795808cb44add396eeb00c9d471883780;hb=28c142e3dedc0b136003f33f67243bf3c1873b71;hp=b8505ce39d79e658f3f02ecfa2ab4e2d0a118d5d;hpb=24b170aac55d16cb3ff934d2f3d7983dc11cbe12;p=vpp.git

diff --git a/test/vpp_interface.py b/test/vpp_interface.py
index b8505ce39d7..1db34ba7958 100644
--- 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):
@@ -54,6 +53,16 @@ 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)."""
@@ -62,17 +71,19 @@ class VppInterface(object):
     @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 +170,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
@@ -196,6 +217,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."""
@@ -372,3 +396,15 @@ class VppInterface(object):
         self.test.vapi.proxy_arp_intfc_enable_disable(
             self.sw_if_index,
             enable)
+
+    def query_vpp_config(self):
+        dump = self.test.vapi.sw_interface_dump()
+        return self.is_interface_config_in_dump(dump)
+
+    def is_interface_config_in_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
+        else:
+            return False