diff options
author | Dave Wallace <dwallacelf@gmail.com> | 2023-08-31 00:47:44 -0400 |
---|---|---|
committer | Andrew Yourtchenko <ayourtch@gmail.com> | 2023-11-03 05:06:43 +0000 |
commit | 8800f732f868bf54da8adba05e38bd2477895ca5 (patch) | |
tree | 41cfeab26058ef7238c1e1e8199a05617a98541e /test/test_dhcp.py | |
parent | af5684bf18077acf1f448c6f2a62ef1af9f9be05 (diff) |
tests: refactor asf framework code
- Make framework.py classes a subset of asfframework.py classes
- Remove all packet related code from asfframework.py
- Add test class and test case set up debug output to log
- Repatriate packet tests from asf to test directory
- Remove non-packet related code from framework.py and
inherit them from asfframework.py classes
- Clean up unused import variables
- Re-enable BFD tests on Ubuntu 22.04 and fix
intermittent test failures in echo_looped_back
testcases (where # control packets verified but
not guaranteed to be received during test)
- Re-enable Wireguard tests on Ubuntu 22.04 and fix
intermittent test failures in handshake ratelimiting
testcases and event testcase
- Run Wiregard testcase suites solo
- Improve debug output in log.txt
- Increase VCL/LDP post sleep timeout to allow iperf server
to finish cleanly.
- Fix pcap history files to be sorted by suite and testcase
and ensure order/timestamp is correct based on creation
in the testcase.
- Decode pcap files for each suite and testcase for all
errors or if configured via comandline option / env var
- Improve vpp corefile detection to allow complete corefile
generation
- Disable vm vpp interfaces testcases on debian11
- Clean up failed unittest dir when retrying failed testcases
and unify testname directory and failed linknames into
framwork functions
Type: test
Change-Id: I0764f79ea5bb639d278bf635ed2408d4d5220e1e
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'test/test_dhcp.py')
-rw-r--r-- | test/test_dhcp.py | 13 |
1 files changed, 5 insertions, 8 deletions
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 |