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_ip6_nd_mirror_proxy.py | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

(limited to 'test/test_ip6_nd_mirror_proxy.py')

diff --git a/test/test_ip6_nd_mirror_proxy.py b/test/test_ip6_nd_mirror_proxy.py
index bb7c967137a..65209925e87 100644
--- a/test/test_ip6_nd_mirror_proxy.py
+++ b/test/test_ip6_nd_mirror_proxy.py
@@ -1,28 +1,14 @@
 #!/usr/bin/env python3
 
 import unittest
-import os
-from socket import AF_INET6, inet_pton, inet_ntop
-
-from framework import tag_fixme_vpp_workers
-from framework import VppTestCase, VppTestRunner
-from vpp_neighbor import VppNeighbor, find_nbr
-from vpp_ip_route import (
-    VppIpRoute,
-    VppRoutePath,
-    find_route,
-    VppIpTable,
-    DpoProto,
-    FibPathType,
-    VppIpInterfaceAddress,
-)
-from vpp_papi import VppEnum
+from socket import inet_pton, inet_ntop
+
+from framework import VppTestCase
+from asfframework import VppTestRunner
+
 from vpp_ip import VppIpPuntRedirect
 
-import scapy.compat
-from scapy.packet import Raw
-from scapy.layers.l2 import Ether, ARP, Dot1Q
-from scapy.layers.inet import IP, UDP, TCP
+from scapy.layers.l2 import Ether
 from scapy.layers.inet6 import (
     IPv6,
     ipv6nh,
@@ -33,7 +19,7 @@ from scapy.layers.inet6 import (
     ICMPv6EchoRequest,
     ICMPv6EchoReply,
 )
-from scapy.utils6 import in6_ptop, in6_getnsma, in6_getnsmac, in6_ismaddr
+from scapy.utils6 import in6_ptop, in6_getnsma, in6_getnsmac
 
 
 class TestNDPROXY(VppTestCase):
-- 
cgit 1.2.3-korg