summaryrefslogtreecommitdiffstats
path: root/test/test_dhcp.py
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2018-02-25 12:27:18 -0800
committerDave Wallace <dwallacelf@gmail.com>2018-03-19 13:09:45 +0000
commit2bc940272ec75d1094326eafb4a3fa2c614e3a7b (patch)
treed813084708e143fc9eb6edbca408ba93beadaf41 /test/test_dhcp.py
parentf38bef46a3511249f352d18072f97a49f2c5b06c (diff)
Scapy upgrade to 2.4.0.rc5
- many of the patches fd.io applies in test/patches/2.3.3 are now upstreamed in 2.4 - 2.4 adds support for IGMPv3 which is my main motivation for the upgrade Change-Id: If2c0a524e3cba320b4a5d8cd07817c6ea2bf0c5a Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'test/test_dhcp.py')
-rw-r--r--test/test_dhcp.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test_dhcp.py b/test/test_dhcp.py
index 21940ca99f0..df33d076a24 100644
--- a/test/test_dhcp.py
+++ b/test/test_dhcp.py
@@ -11,7 +11,8 @@ from util import mk_ll_addr
from scapy.layers.l2 import Ether, getmacbyip, ARP
from scapy.layers.inet import IP, UDP, ICMP
-from scapy.layers.inet6 import IPv6, in6_getnsmac, in6_mactoifaceid
+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, DHCP6_Advertise, DHCP6OptRelayMsg, DHCP6OptIfaceId, \