Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tests: refactor asf framework code
[vpp.git]
/
test
/
test_dhcp.py
diff --git
a/test/test_dhcp.py
b/test/test_dhcp.py
index
a349356
..
3924ebc
100644
(file)
--- a/
test/test_dhcp.py
+++ b/
test/test_dhcp.py
@@
-2,22
+2,19
@@
import unittest
import socket
import unittest
import socket
-import struct
import six
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 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.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 (
from scapy.layers.dhcp import DHCP, BOOTP, DHCPTypes
from scapy.layers.dhcp6 import (
- DHCP6,
DHCP6_Solicit,
DHCP6_RelayForward,
DHCP6_RelayReply,
DHCP6_Solicit,
DHCP6_RelayForward,
DHCP6_RelayReply,
@@
-29,7
+26,7
@@
from scapy.layers.dhcp6 import (
DHCP6OptClientLinkLayerAddr,
DHCP6_Request,
)
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
from scapy.utils6 import in6_ptop
from vpp_papi import mac_pton, VppEnum
from vpp_sub_interface import VppDot1QSubint