X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_interface.py;h=65f3c4400dabe49474247782a1a5d09fa1e564bb;hb=611864f4bddf787aff3323f162da589b1b26529c;hp=e14a31eb722a8a4ce6090b53c271ad3dd8b24723;hpb=a98346f664aae148d26a8e158008b773d73db96f;p=vpp.git diff --git a/test/vpp_interface.py b/test/vpp_interface.py index e14a31eb722..65f3c4400da 100644 --- a/test/vpp_interface.py +++ b/test/vpp_interface.py @@ -1,7 +1,7 @@ from abc import abstractmethod, ABCMeta import socket -from util import Host, mk_ll_addr +from util import Host, mk_ll_addr, mactobinary class VppInterface(object): @@ -23,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).""" @@ -65,7 +81,7 @@ class VppInterface(object): @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 @@ -170,6 +186,13 @@ 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 @@ -193,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: