X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_interface.py;h=1e047f5f700ff803379d0b63f5a205f158b35966;hb=053204ab039d34a990ff0e14c32ce3b294fcce0e;hp=4c4e4138479ddc23bb38b7f43ae7a4ed60a6ecf9;hpb=e63325e3ca03c847963863446345e6c80a2c0cfd;p=vpp.git diff --git a/test/vpp_interface.py b/test/vpp_interface.py index 4c4e4138479..1e047f5f700 100644 --- a/test/vpp_interface.py +++ b/test/vpp_interface.py @@ -8,6 +8,12 @@ from six import moves from util import Host, mk_ll_addr from vpp_papi import mac_ntop, VppEnum from vpp_ip import VppIpAddress, VppIpPrefix +from ipaddress import IPv4Network + +try: + text_type = unicode +except NameError: + text_type = str @six.add_metaclass(abc.ABCMeta) @@ -42,11 +48,19 @@ class VppInterface(object): """Local IPv4 address on VPP interface (string).""" return self._local_ip4.address + @local_ip4.setter + def local_ip4(self, value): + self._local_ip4.address = value + @property def local_ip4_prefix_len(self): """Local IPv4 prefix length """ return self._local_ip4.len + @local_ip4_prefix_len.setter + def local_ip4_prefix_len(self, value): + self._local_ip4.len = value + @property def local_ip4_prefix(self): """Local IPv4 prefix """ @@ -74,11 +88,19 @@ class VppInterface(object): """Local IPv6 address on VPP interface (string).""" return self._local_ip6.address + @local_ip6.setter + def local_ip6(self, value): + self._local_ip6.address = value + @property def local_ip6_prefix_len(self): """Local IPv6 prefix length """ return self._local_ip6.len + @local_ip6_prefix_len.setter + def local_ip6_prefix_len(self, value): + self._local_ip6.len = value + @property def local_ip6_prefix(self): """Local IPv6 prefix """ @@ -235,7 +257,7 @@ class VppInterface(object): self._remote_addr = {socket.AF_INET: self.remote_ip4, socket.AF_INET6: self.remote_ip6} - r = self.test.vapi.sw_interface_dump() + r = self.test.vapi.sw_interface_dump(sw_if_index=self.sw_if_index) for intf in r: if intf.sw_if_index == self.sw_if_index: self._name = intf.interface_name.split(b'\0', @@ -342,14 +364,16 @@ class VppInterface(object): suppress=suppress, send_unicast=send_unicast) - # TODO: This should accept ipaddress object. - def ip6_ra_prefix(self, address, address_length, is_no=0, + def ip6_ra_prefix(self, prefix, is_no=0, off_link=0, no_autoconfig=0, use_default=0): - """Configure IPv6 RA suppress on the VPP interface.""" + """Configure IPv6 RA suppress on the VPP interface. + + prefix can be a string in the format of '
/