X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_neighbor.py;h=ffe87d93b586655ae8f6cf851767f43a01feba65;hb=17ec577f7b3b092e09d95451317957415f4baf4f;hp=95bcc0d6057d305e9e648bad92ac29c96f53513e;hpb=beded852d7e1494abd23de191ba7ae2a5a6b81b0;p=vpp.git diff --git a/test/vpp_neighbor.py b/test/vpp_neighbor.py index 95bcc0d6057..ffe87d93b58 100644 --- a/test/vpp_neighbor.py +++ b/test/vpp_neighbor.py @@ -16,8 +16,8 @@ except NameError: def find_nbr(test, sw_if_index, nbr_addr, is_static=0, mac=None): ip_addr = ip_address(text_type(nbr_addr)) e = VppEnum.vl_api_ip_neighbor_flags_t - nbrs = test.vapi.ip_neighbor_dump(sw_if_index, - is_ipv6=(6 == ip_addr.version)) + nbrs = test.vapi.ip_neighbor_dump(sw_if_index=sw_if_index, + af=ip_addr.vapi_af) for n in nbrs: if ip_addr == n.neighbor.ip_address and \ @@ -58,6 +58,7 @@ class VppNeighbor(VppObject): flags=self.flags) self.stats_index = r.stats_index self._test.registry.register(self, self._test.logger) + return self def remove_vpp_config(self): self._test.vapi.ip_neighbor_add_del( @@ -77,9 +78,6 @@ class VppNeighbor(VppObject): self.nbr_addr, self.is_static()) - def __str__(self): - return self.object_id() - def object_id(self): return ("%d:%s" % (self.sw_if_index, self.nbr_addr))