X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_dhcp.py;h=3924ebc840db566b14611501b1016f79e4b873e7;hb=8800f732f868bf54da8adba05e38bd2477895ca5;hp=a349356119a5eca94a93fc934d27588b9f173bee;hpb=af5684bf18077acf1f448c6f2a62ef1af9f9be05;p=vpp.git diff --git a/test/test_dhcp.py b/test/test_dhcp.py index a349356119a..3924ebc840d 100644 --- a/test/test_dhcp.py +++ b/test/test_dhcp.py @@ -2,22 +2,19 @@ import unittest import socket -import struct import six -from framework import VppTestCase, VppTestRunner -from framework import tag_run_solo +from framework import VppTestCase +from asfframework import VppTestRunner, tag_run_solo from vpp_neighbor import VppNeighbor from vpp_ip_route import find_route, VppIpTable from util import mk_ll_addr import scapy.compat -from scapy.layers.l2 import Ether, getmacbyip, ARP, Dot1Q -from scapy.layers.inet import IP, UDP, ICMP +from scapy.layers.l2 import Ether, ARP, Dot1Q +from scapy.layers.inet import IP, UDP from scapy.layers.inet6 import IPv6, in6_getnsmac -from scapy.utils6 import in6_mactoifaceid from scapy.layers.dhcp import DHCP, BOOTP, DHCPTypes from scapy.layers.dhcp6 import ( - DHCP6, DHCP6_Solicit, DHCP6_RelayForward, DHCP6_RelayReply, @@ -29,7 +26,7 @@ from scapy.layers.dhcp6 import ( DHCP6OptClientLinkLayerAddr, DHCP6_Request, ) -from socket import AF_INET, AF_INET6, inet_pton, inet_ntop +from socket import AF_INET, AF_INET6, inet_pton from scapy.utils6 import in6_ptop from vpp_papi import mac_pton, VppEnum from vpp_sub_interface import VppDot1QSubint