X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ip6.py;h=1e846a66c5a30a8e7b589b955d5ce009cd6cbb4c;hb=8800f732f868bf54da8adba05e38bd2477895ca5;hp=c78b8441f9017c34015854b438d914e2f9226c71;hpb=af5684bf18077acf1f448c6f2a62ef1af9f9be05;p=vpp.git diff --git a/test/test_ip6.py b/test/test_ip6.py index c78b8441f90..1e846a66c5a 100644 --- a/test/test_ip6.py +++ b/test/test_ip6.py @@ -5,7 +5,6 @@ from socket import inet_pton, inet_ntop import unittest from parameterized import parameterized -import scapy.compat import scapy.layers.inet6 as inet6 from scapy.layers.inet import UDP, IP from scapy.contrib.mpls import MPLS @@ -26,7 +25,6 @@ from scapy.layers.inet6 import ( ICMPv6EchoReply, IPv6ExtHdrHopByHop, ICMPv6MLReport2, - ICMPv6MLDMultAddrRec, ) from scapy.layers.l2 import Ether, Dot1Q, GRE from scapy.packet import Raw @@ -35,14 +33,14 @@ from scapy.utils6 import ( in6_getnsmac, in6_ptop, in6_islladdr, - in6_mactoifaceid, ) from six import moves -from framework import VppTestCase, VppTestRunner, tag_run_solo +from framework import VppTestCase +from asfframework import VppTestRunner, tag_run_solo from util import ppp, ip6_normalize, mk_ll_addr from vpp_papi import VppEnum -from vpp_ip import DpoProto, VppIpPuntPolicer, VppIpPuntRedirect, VppIpPathMtu +from vpp_ip import VppIpPuntPolicer, VppIpPuntRedirect, VppIpPathMtu from vpp_ip_route import ( VppIpRoute, VppRoutePath,