X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_interface.py;h=194a0c4fb32e41822551980c05eac27b51a5c9d5;hb=e0d2bd6bd7fc59c0c6ac48195d7f825dc99bfd91;hp=b8505ce39d79e658f3f02ecfa2ab4e2d0a118d5d;hpb=24b170aac55d16cb3ff934d2f3d7983dc11cbe12;p=vpp.git diff --git a/test/vpp_interface.py b/test/vpp_interface.py index b8505ce39d7..194a0c4fb32 100644 --- a/test/vpp_interface.py +++ b/test/vpp_interface.py @@ -54,6 +54,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 +72,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): @@ -196,6 +208,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 +387,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