From 8800f732f868bf54da8adba05e38bd2477895ca5 Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Thu, 31 Aug 2023 00:47:44 -0400
Subject: 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>
---
 test/test_nat66.py | 45 ++++++---------------------------------------
 1 file changed, 6 insertions(+), 39 deletions(-)

(limited to 'test/test_nat66.py')

diff --git a/test/test_nat66.py b/test/test_nat66.py
index f3bec78ec5a..44df7222f9d 100644
--- a/test/test_nat66.py
+++ b/test/test_nat66.py
@@ -1,50 +1,17 @@
 #!/usr/bin/env python3
 
-import ipaddress
-import random
-import socket
-import struct
 import unittest
-from io import BytesIO
-
-import scapy.compat
-from framework import VppTestCase, VppTestRunner
-from ipfix import IPFIX, Set, Template, Data, IPFIXDecoder
-from scapy.all import (
-    bind_layers,
-    Packet,
-    ByteEnumField,
-    ShortField,
-    IPField,
-    IntField,
-    LongField,
-    XByteField,
-    FlagsField,
-    FieldLenField,
-    PacketListField,
-)
-from scapy.data import IP_PROTOS
-from scapy.layers.inet import IP, TCP, UDP, ICMP
-from scapy.layers.inet import IPerror, TCPerror, UDPerror, ICMPerror
-from scapy.layers.inet6 import ICMPv6DestUnreach, IPerror6, IPv6ExtHdrFragment
+
+from framework import VppTestCase
+from asfframework import VppTestRunner
+from scapy.layers.inet import IP, TCP, UDP
 from scapy.layers.inet6 import (
     IPv6,
     ICMPv6EchoRequest,
     ICMPv6EchoReply,
-    ICMPv6ND_NS,
-    ICMPv6ND_NA,
-    ICMPv6NDOptDstLLAddr,
-    fragment6,
 )
-from scapy.layers.l2 import Ether, ARP, GRE
-from scapy.packet import Raw
-from syslog_rfc5424_parser import SyslogMessage, ParseError
-from syslog_rfc5424_parser.constants import SyslogSeverity
-from util import ip4_range
-from util import ppc, ppp
-from vpp_acl import AclRule, VppAcl, VppAclInterface
-from vpp_ip_route import VppIpRoute, VppRoutePath
-from vpp_neighbor import VppNeighbor
+from scapy.layers.l2 import Ether, GRE
+from util import ppp
 from vpp_papi import VppEnum
 
 
-- 
cgit 1.2.3-korg