[PATCH v3 2/2] dts: rewrite two link topology requirements

[Dean Marx]

Some of the DTS test suites require two link topologies
in order to run, but not all truly require two links
for proper testing. Rewrite the topology requirements
on these test suites to reflect the actual
requirements.

Bugzilla ID: 1755

Signed-off-by: Dean Marx <dmarx at iol.unh.edu>
---
 dts/tests/TestSuite_blocklist.py        | 3 ++-
 dts/tests/TestSuite_checksum_offload.py | 3 +--
 dts/tests/TestSuite_dynamic_config.py   | 3 +--
 dts/tests/TestSuite_port_control.py     | 3 +--
 dts/tests/TestSuite_uni_pkt.py          | 3 +--
 dts/tests/TestSuite_vlan.py             | 3 +--
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/dts/tests/TestSuite_blocklist.py b/dts/tests/TestSuite_blocklist.py
index ce7da1cc8f..6c0507c51e 100644
--- a/dts/tests/TestSuite_blocklist.py
+++ b/dts/tests/TestSuite_blocklist.py
@@ -12,7 +12,6 @@
 from framework.testbed_model.port import Port
 
 
- at requires(topology_type=TopologyType.two_links)
 class TestBlocklist(TestSuite):
     """DPDK device blocklisting test suite."""
 
@@ -40,6 +39,7 @@ def no_blocklisted(self):
         """
         self.verify_blocklisted_ports([])
 
+    @requires(topology_type=TopologyType.two_links)
     @func_test
     def one_port_blocklisted(self):
         """Run testpmd with one blocklisted port.
@@ -51,6 +51,7 @@ def one_port_blocklisted(self):
         """
         self.verify_blocklisted_ports(self.topology.sut_ports[:1])
 
+    @requires(topology_type=TopologyType.two_links)
     @func_test
     def all_but_one_port_blocklisted(self):
         """Run testpmd with all but one blocklisted port.
diff --git a/dts/tests/TestSuite_checksum_offload.py b/dts/tests/TestSuite_checksum_offload.py
index d411af70a9..0487ef3ac1 100644
--- a/dts/tests/TestSuite_checksum_offload.py
+++ b/dts/tests/TestSuite_checksum_offload.py
@@ -26,10 +26,9 @@
     TestPmdShell,
 )
 from framework.test_suite import TestSuite, func_test
-from framework.testbed_model.capability import NicCapability, TopologyType, requires
+from framework.testbed_model.capability import NicCapability, requires
 
 
- at requires(topology_type=TopologyType.two_links)
 @requires(NicCapability.RX_OFFLOAD_IPV4_CKSUM)
 @requires(NicCapability.RX_OFFLOAD_UDP_CKSUM)
 @requires(NicCapability.RX_OFFLOAD_TCP_CKSUM)
diff --git a/dts/tests/TestSuite_dynamic_config.py b/dts/tests/TestSuite_dynamic_config.py
index 49f295a39a..99c2b67810 100644
--- a/dts/tests/TestSuite_dynamic_config.py
+++ b/dts/tests/TestSuite_dynamic_config.py
@@ -22,11 +22,10 @@
 from framework.params.testpmd import SimpleForwardingModes
 from framework.remote_session.testpmd_shell import NicCapability, TestPmdShell
 from framework.test_suite import TestSuite, func_test
-from framework.testbed_model.capability import TopologyType, requires
+from framework.testbed_model.capability import requires
 
 
 @requires(NicCapability.PHYSICAL_FUNCTION)
- at requires(topology_type=TopologyType.two_links)
 class TestDynamicConfig(TestSuite):
     """Dynamic config suite.
 
diff --git a/dts/tests/TestSuite_port_control.py b/dts/tests/TestSuite_port_control.py
index 58783f1d18..ba06858640 100644
--- a/dts/tests/TestSuite_port_control.py
+++ b/dts/tests/TestSuite_port_control.py
@@ -15,11 +15,10 @@
 from framework.params.testpmd import SimpleForwardingModes
 from framework.remote_session.testpmd_shell import NicCapability, TestPmdShell
 from framework.test_suite import TestSuite, func_test
-from framework.testbed_model.capability import TopologyType, requires
+from framework.testbed_model.capability import requires
 
 
 @requires(NicCapability.PHYSICAL_FUNCTION)
- at requires(topology_type=TopologyType.two_links)
 class TestPortControl(TestSuite):
     """DPDK Port Control Testing Suite."""
 
diff --git a/dts/tests/TestSuite_uni_pkt.py b/dts/tests/TestSuite_uni_pkt.py
index 690c5d4fd1..7cba5cb56b 100644
--- a/dts/tests/TestSuite_uni_pkt.py
+++ b/dts/tests/TestSuite_uni_pkt.py
@@ -27,10 +27,9 @@
     TestPmdVerbosePacket,
 )
 from framework.test_suite import TestSuite, func_test
-from framework.testbed_model.capability import TopologyType, requires
+from framework.testbed_model.capability import requires
 
 
- at requires(topology_type=TopologyType.two_links)
 class TestUniPkt(TestSuite):
     """DPDK Unified packet test suite.
 
diff --git a/dts/tests/TestSuite_vlan.py b/dts/tests/TestSuite_vlan.py
index d2a9e614d4..eeeb036a1d 100644
--- a/dts/tests/TestSuite_vlan.py
+++ b/dts/tests/TestSuite_vlan.py
@@ -17,11 +17,10 @@
 
 from framework.remote_session.testpmd_shell import SimpleForwardingModes, TestPmdShell
 from framework.test_suite import TestSuite, func_test
-from framework.testbed_model.capability import NicCapability, TopologyType, requires
+from framework.testbed_model.capability import NicCapability, requires
 
 
 @requires(NicCapability.RX_OFFLOAD_VLAN_FILTER)
- at requires(topology_type=TopologyType.two_links)
 class TestVlan(TestSuite):
     """DPDK VLAN test suite.
 
-- 
2.50.1