object abstractions for ARP and ND
"""
-from socket import inet_pton, inet_ntop, AF_INET, AF_INET6
-from vpp_object import *
-from util import mactobinary
+from ipaddress import ip_address
+from vpp_object import VppObject
+from vpp_papi import mac_pton, VppEnum
+try:
+ text_type = unicode
+except NameError:
+ text_type = str
-def find_nbr(test, sw_if_index, ip_addr, is_static=0, inet=AF_INET):
+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=1 if AF_INET6 == inet else 0)
- if inet == AF_INET:
- s = 4
- else:
- s = 16
- nbr_addr = inet_pton(inet, ip_addr)
+ is_ipv6=(6 == ip_addr.version))
for n in nbrs:
- if nbr_addr == n.ip_address[:s] \
- and is_static == n.is_static:
- return True
+ if 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
+ else:
+ return True
return False
"""
def __init__(self, test, sw_if_index, mac_addr, nbr_addr,
- af=AF_INET, is_static=False, is_no_fib_entry=0):
+ is_static=False, is_no_fib_entry=False):
self._test = test
self.sw_if_index = sw_if_index
- self.mac_addr = mactobinary(mac_addr)
- self.af = af
- self.is_static = is_static
- self.is_no_fib_entry = is_no_fib_entry
- self.nbr_addr = inet_pton(af, nbr_addr)
+ self.mac_addr = mac_addr
+ self.nbr_addr = nbr_addr
+
+ e = VppEnum.vl_api_ip_neighbor_flags_t
+ self.flags = e.IP_API_NEIGHBOR_FLAG_NONE
+ if is_static:
+ self.flags |= e.IP_API_NEIGHBOR_FLAG_STATIC
+ if is_no_fib_entry:
+ self.flags |= e.IP_API_NEIGHBOR_FLAG_NO_FIB_ENTRY
def add_vpp_config(self):
- self._test.vapi.ip_neighbor_add_del(
+ r = self._test.vapi.ip_neighbor_add_del(
self.sw_if_index,
self.mac_addr,
self.nbr_addr,
is_add=1,
- is_ipv6=1 if AF_INET6 == self.af else 0,
- is_static=self.is_static,
- is_no_adj_fib=self.is_no_fib_entry)
+ 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_ipv6=1 if AF_INET6 == self.af else 0,
is_add=0,
- is_static=self.is_static)
+ flags=self.flags)
- def query_vpp_config(self):
- dump = self._test.vapi.ip_neighbor_dump(
- self.sw_if_index,
- is_ipv6=1 if AF_INET6 == self.af else 0)
- for n in dump:
- if self.nbr_addr == n.ip_address \
- and self.is_static == n.is_static:
- return True
- return False
+ def is_static(self):
+ e = VppEnum.vl_api_ip_neighbor_flags_t
+ return (self.flags & e.IP_API_NEIGHBOR_FLAG_STATIC)
- def __str__(self):
- return self.object_id()
+ def query_vpp_config(self):
+ 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,
- inet_ntop(self.af, self.nbr_addr)))
+ return ("%d:%s" % (self.sw_if_index, self.nbr_addr))
+
+ def get_stats(self):
+ c = self._test.statistics.get_counter("/net/adjacency")
+ return c[0][self.stats_index]