diff options
| author |   snaramre <snaramre@cisco.com> | 2019-12-13 23:39:35 +0000 |
|---|---|---|
| committer |   Paul Vinciguerra <pvinci@vinciconsulting.com> | 2019-12-14 22:14:12 +0000 |
| commit | 5d4b8912d2fe186b4fb920a72b3a2f7b556f4e7d (patch) | |
| tree | 4530f71a783679e3566ed501471cbad481c128d7 /src/plugins/dhcp | |
| parent | aa72578637e2a346ee845545b2e26aad83e12192 (diff) | |
tests: changes for scapy 2.4.3 migration
Type: fix
Change-Id: I7e041b666dabd90df23a920a1f1d99db4c10ddfe
Signed-off-by: snaramre <snaramre@cisco.com>
Diffstat (limited to 'src/plugins/dhcp')
| -rw-r--r-- | src/plugins/dhcp/test/test_dhcp.py | 3 | ||||
| -rw-r--r-- | src/plugins/dhcp/test/test_dhcp6.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/dhcp/test/test_dhcp.py b/src/plugins/dhcp/test/test_dhcp.py index 14e20c419b0..07db35d0cd0 100644 --- a/src/plugins/dhcp/test/test_dhcp.py +++ b/src/plugins/dhcp/test/test_dhcp.py @@ -18,8 +18,7 @@ from scapy.layers.dhcp import DHCP, BOOTP, DHCPTypes from scapy.layers.dhcp6 import DHCP6, DHCP6_Solicit, DHCP6_RelayForward, \ DHCP6_RelayReply, DHCP6_Advertise, DHCP6OptRelayMsg, DHCP6OptIfaceId, \ DHCP6OptStatusCode, DHCP6OptVSS, DHCP6OptClientLinkLayerAddr, DHCP6_Request -from socket import AF_INET, AF_INET6 -from scapy.utils import inet_pton, inet_ntop +from socket import AF_INET, AF_INET6, inet_pton, inet_ntop from scapy.utils6 import in6_ptop from vpp_papi import mac_pton, VppEnum from vpp_sub_interface import VppDot1QSubint diff --git a/src/plugins/dhcp/test/test_dhcp6.py b/src/plugins/dhcp/test/test_dhcp6.py index 9beff5a60e5..7254496f48f 100644 --- a/src/plugins/dhcp/test/test_dhcp6.py +++ b/src/plugins/dhcp/test/test_dhcp6.py @@ -1,4 +1,4 @@ -from socket import AF_INET6 +from socket import AF_INET6, inet_ntop, inet_pton from scapy.layers.dhcp6 import DHCP6_Advertise, DHCP6OptClientId, \ DHCP6OptStatusCode, DHCP6OptPref, DHCP6OptIA_PD, DHCP6OptIAPrefix, \ @@ -7,7 +7,6 @@ from scapy.layers.dhcp6 import DHCP6_Advertise, DHCP6OptClientId, \ DHCP6OptIAAddress from scapy.layers.inet6 import IPv6, Ether, UDP from scapy.utils6 import in6_mactoifaceid -from scapy.utils import inet_ntop, inet_pton from framework import VppTestCase from vpp_papi import VppEnum |