diff options
| author |   Ole Troan <ot@cisco.com> | 2018-12-06 17:35:12 +0100 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2018-12-10 08:01:56 +0000 |
| commit | 7f99183a20d60cd5c648cc23d7a2f30a594a215b (patch) | |
| tree | bb3934aab296ce5fa531bfc5ab47921a113ffd26 /test/test_dhcp.py | |
| parent | 521a8d7df423a0b5aaf259d49ca9230705bc25ee (diff) | |
Test framework: StringIO fixes for Python3
Add 2/3 support to binarytomac and mactobinary and move to vpp_mac.py
Change-Id: I3dc7e4a24486aee22140c781aae7e44e58935877
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'test/test_dhcp.py')
| -rw-r--r-- | test/test_dhcp.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/test_dhcp.py b/test/test_dhcp.py index 179221d6584..db3e3f3bab0 100644 --- a/test/test_dhcp.py +++ b/test/test_dhcp.py @@ -8,7 +8,7 @@ from framework import VppTestCase, VppTestRunner, running_extended_tests from vpp_neighbor import VppNeighbor from vpp_ip_route import find_route, VppIpTable from util import mk_ll_addr - +from vpp_mac import mactobinary, binarytomac from scapy.layers.l2 import Ether, getmacbyip, ARP from scapy.layers.inet import IP, UDP, ICMP from scapy.layers.inet6 import IPv6, in6_getnsmac @@ -20,7 +20,6 @@ from scapy.layers.dhcp6 import DHCP6, DHCP6_Solicit, DHCP6_RelayForward, \ from socket import AF_INET, AF_INET6 from scapy.utils import inet_pton, inet_ntop from scapy.utils6 import in6_ptop -from util import mactobinary DHCP4_CLIENT_PORT = 68 DHCP4_SERVER_PORT = 67 |