diff options
Diffstat (limited to 'test/vpp_neighbor.py')
| -rw-r--r-- | test/vpp_neighbor.py | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/test/vpp_neighbor.py b/test/vpp_neighbor.py index 9ba87005c46..60fe28f76e4 100644 --- a/test/vpp_neighbor.py +++ b/test/vpp_neighbor.py @@ -6,7 +6,8 @@ from ipaddress import ip_address from vpp_object import VppObject -from vpp_papi import mac_pton, VppEnum +from vpp_papi import VppEnum + try: text_type = unicode except NameError: @@ -16,13 +17,14 @@ 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=sw_if_index, - af=ip_addr.vapi_af) + nbrs = test.vapi.ip_neighbor_dump(sw_if_index=sw_if_index, af=ip_addr.vapi_af) for n in nbrs: - if sw_if_index == n.neighbor.sw_if_index and \ - ip_addr == n.neighbor.ip_address and \ - is_static == (n.neighbor.flags & e.IP_API_NEIGHBOR_FLAG_STATIC): + if ( + sw_if_index == n.neighbor.sw_if_index + and ip_addr == n.neighbor.ip_address + and is_static == (n.neighbor.flags & e.IP_API_NEIGHBOR_FLAG_STATIC) + ): if mac: if mac == str(n.neighbor.mac_address): return True @@ -36,8 +38,15 @@ class VppNeighbor(VppObject): ARP Entry """ - def __init__(self, test, sw_if_index, mac_addr, nbr_addr, - is_static=False, is_no_fib_entry=False): + def __init__( + self, + test, + sw_if_index, + mac_addr, + nbr_addr, + is_static=False, + is_no_fib_entry=False, + ): self._test = test self.sw_if_index = sw_if_index self.mac_addr = mac_addr @@ -52,35 +61,26 @@ class VppNeighbor(VppObject): def add_vpp_config(self): r = self._test.vapi.ip_neighbor_add_del( - self.sw_if_index, - self.mac_addr, - self.nbr_addr, - is_add=1, - flags=self.flags) + self.sw_if_index, self.mac_addr, self.nbr_addr, is_add=1, 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( - self.sw_if_index, - self.mac_addr, - self.nbr_addr, - is_add=0, - flags=self.flags) + self.sw_if_index, self.mac_addr, self.nbr_addr, is_add=0, flags=self.flags + ) def is_static(self): e = VppEnum.vl_api_ip_neighbor_flags_t - return (self.flags & e.IP_API_NEIGHBOR_FLAG_STATIC) + return self.flags & e.IP_API_NEIGHBOR_FLAG_STATIC def query_vpp_config(self): - return find_nbr(self._test, - self.sw_if_index, - self.nbr_addr, - self.is_static()) + return find_nbr(self._test, self.sw_if_index, self.nbr_addr, self.is_static()) def object_id(self): - return ("%d:%s" % (self.sw_if_index, self.nbr_addr)) + return "%d:%s" % (self.sw_if_index, self.nbr_addr) def get_stats(self): c = self._test.statistics["/net/adjacency"] |