from six import moves
from framework import VppTestCase, VppTestRunner
-from util import ppp, ip6_normalize
+from util import ppp, ip6_normalize, mk_ll_addr
from vpp_ip import DpoProto
from vpp_ip_route import VppIpRoute, VppRoutePath, find_route, VppIpMRoute, \
VppMRoutePath, MRouteItfFlags, MRouteEntryFlags, VppMplsIpBind, \
AF_INET6 = socket.AF_INET6
-
-def mk_ll_addr(mac):
- euid = in6_mactoifaceid(mac)
- addr = "fe80::" + euid
- return addr
+try:
+ text_type = unicode
+except NameError:
+ text_type = str
class TestIPv6ND(VppTestCase):
def verify_prefix_info(self, reported_prefix, prefix_option):
prefix = IPv6Network(
- unicode(prefix_option.getfieldval("prefix") +
- "/" +
- str(prefix_option.getfieldval("prefixlen"))),
+ text_type(prefix_option.getfieldval("prefix") +
+ "/" +
+ text_type(prefix_option.getfieldval("prefixlen"))),
strict=False)
self.assert_equal(reported_prefix.prefix.network_address,
prefix.network_address)
#
# Add proxy support for the host
#
- self.vapi.ip6_nd_proxy(
+ self.vapi.ip6nd_proxy_add_del(
inet_pton(AF_INET6, self.pg0._remote_hosts[2].ip6),
self.pg1.sw_if_index)
ICMPv6NDOptSrcLLAddr(
lladdr=self.pg0._remote_hosts[2].mac))
- self.vapi.ip6_nd_proxy(
+ self.vapi.ip6nd_proxy_add_del(
inet_pton(AF_INET6, self.pg0._remote_hosts[3].ip6),
self.pg2.sw_if_index)
#
# remove the proxy configs
#
- self.vapi.ip6_nd_proxy(
+ self.vapi.ip6nd_proxy_add_del(
inet_pton(AF_INET6, self.pg0._remote_hosts[2].ip6),
self.pg1.sw_if_index,
is_del=1)
- self.vapi.ip6_nd_proxy(
+ self.vapi.ip6nd_proxy_add_del(
inet_pton(AF_INET6, self.pg0._remote_hosts[3].ip6),
self.pg2.sw_if_index,
is_del=1)