From: Zhimin Huang <zhiminx.huang@intel.com>
To: dts@dpdk.org
Cc: Zhimin Huang <zhiminx.huang@intel.com>
Subject: [dts] [PATCH V1 2/2] tests/flexible: add pkg check and remove reload ice
Date: Fri, 26 Mar 2021 13:08:12 +0800 [thread overview]
Message-ID: <1616735292-74549-3-git-send-email-zhiminx.huang@intel.com> (raw)
In-Reply-To: <1616735292-74549-1-git-send-email-zhiminx.huang@intel.com>
*.flexible pf and vf suite add decorator to support pkg check
Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
tests/TestSuite_flexible_rxd.py | 26 +++++++++++++-------------
tests/TestSuite_iavf_flexible_descriptor.py | 21 +++++++++++++--------
2 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/tests/TestSuite_flexible_rxd.py b/tests/TestSuite_flexible_rxd.py
index 648173e..45eb603 100644
--- a/tests/TestSuite_flexible_rxd.py
+++ b/tests/TestSuite_flexible_rxd.py
@@ -32,11 +32,12 @@
import time
-from test_case import TestCase
+from test_case import TestCase, skip_unsupported_pkg, check_supported_nic
from flexible_common import FlexibleRxdBase
import rte_flow_common as rfc
class TestFlexibleRxd(TestCase, FlexibleRxdBase):
+ supported_nic = ['columbiaville_100g', 'columbiaville_25g', 'columbiaville_25gx2', 'foxville']
def preset_compilation(self):
"""
@@ -65,17 +66,11 @@ class TestFlexibleRxd(TestCase, FlexibleRxdBase):
[self.dut.send_expect(cmd, "#", 15, alt_session=True) for cmd in cmds]
self.dut.build_install_dpdk(self.dut.target)
+ @check_supported_nic(supported_nic)
def set_up_all(self):
"""
run at the start of each test suite.
"""
- support_nics = [
- "columbiaville_25g",
- "columbiaville_100g",
- "foxville",
- ]
- self.verify(self.nic in support_nics,
- "flexible rxd only supports CVL NIC.")
self.dut_ports = self.dut.get_ports(self.nic)
self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
self.ports_socket = self.dut.get_numa_id(self.dut_ports[0])
@@ -85,17 +80,12 @@ class TestFlexibleRxd(TestCase, FlexibleRxdBase):
self.pci = self.dut.ports_info[0]['pci']
self.dst_mac = self.dut.get_mac_address(self.dut_ports[0])
self.init_base(self.pci, self.dst_mac, 'pf')
- self.ddp_dir = "/lib/firmware/updates/intel/ice/ddp/"
- self.suite_config = rfc.get_suite_config(self)
- self.os_default_pkg = self.suite_config["os_default_package_file_location"]
- self.comms_pkg = self.suite_config["comms_package_file_location"]
def tear_down_all(self):
"""
Run after each test suite.
"""
self.restore_compilation()
- self.replace_pkg(pkg='comms')
def set_up(self):
"""
@@ -111,60 +101,70 @@ class TestFlexibleRxd(TestCase, FlexibleRxdBase):
time.sleep(2)
self.dut.kill_all()
+ @skip_unsupported_pkg('os default')
def test_check_single_VLAN_fields_in_RXD_8021Q(self):
"""
Check single VLAN fields in RXD (802.1Q)
"""
self.check_single_VLAN_fields_in_RXD_8021Q()
+ @skip_unsupported_pkg('os default')
def test_check_double_VLAN_fields_in_RXD_8021Q_1_VLAN_tag(self):
"""
Check double VLAN fields in RXD (802.1Q) only 1 VLAN tag
"""
self.check_double_VLAN_fields_in_RXD_8021Q_1_VLAN_tag()
+ @skip_unsupported_pkg('os default')
def test_check_double_VLAN_fields_in_RXD_8021Q_2_VLAN_tag(self):
"""
Check double VLAN fields in RXD (802.1Q) 2 VLAN tags
"""
self.check_double_VLAN_fields_in_RXD_8021Q_2_VLAN_tag()
+ @skip_unsupported_pkg('os default')
def test_check_double_VLAN_fields_in_RXD_8021ad(self):
"""
Check double VLAN fields in RXD (802.1ad)
"""
self.check_double_VLAN_fields_in_RXD_8021ad()
+ @skip_unsupported_pkg('os default')
def test_check_IPv4_fields_in_RXD(self):
"""
Check IPv4 fields in RXD
"""
self.check_IPv4_fields_in_RXD()
+ @skip_unsupported_pkg('os default')
def test_check_IPv6_fields_in_RXD(self):
"""
Check IPv6 fields in RXD
"""
self.check_IPv6_fields_in_RXD()
+ @skip_unsupported_pkg('os default')
def test_check_IPv6_flow_field_in_RXD(self):
"""
Check IPv6 flow field in RXD
"""
self.check_IPv6_flow_field_in_RXD()
+ @skip_unsupported_pkg('os default')
def test_check_TCP_fields_in_IPv4_in_RXD(self):
"""
Check TCP fields in IPv4 in RXD
"""
self.check_TCP_fields_in_IPv4_in_RXD()
+ @skip_unsupported_pkg('os default')
def test_check_TCP_fields_in_IPv6_in_RXD(self):
"""
Check TCP fields in IPv6 in RXD
"""
self.check_TCP_fields_in_IPv6_in_RXD()
+ @skip_unsupported_pkg('os default')
def test_check_IPv4_IPv6_TCP_fields_in_RXD_on_specific_queues(self):
"""
Check IPv4, IPv6, TCP fields in RXD on specific queues
diff --git a/tests/TestSuite_iavf_flexible_descriptor.py b/tests/TestSuite_iavf_flexible_descriptor.py
index 3bfd5b9..41d227a 100644
--- a/tests/TestSuite_iavf_flexible_descriptor.py
+++ b/tests/TestSuite_iavf_flexible_descriptor.py
@@ -35,11 +35,12 @@ import time
import traceback
-from test_case import TestCase
+from test_case import TestCase, skip_unsupported_pkg, check_supported_nic
from flexible_common import FlexibleRxdBase
class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
+ supported_nic = ['columbiaville_100g', 'columbiaville_25g', 'columbiaville_25gx2', 'foxville']
def preset_compilation(self):
"""
@@ -100,17 +101,11 @@ class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
except Exception as e:
self.logger.info(traceback.format_exc())
+ @check_supported_nic(supported_nic)
def set_up_all(self):
"""
run at the start of each test suite.
"""
- support_nics = [
- "columbiaville_25g",
- "columbiaville_100g",
- "foxville",
- ]
- self.verify(self.nic in support_nics,
- "flexible rxd only supports CVL NIC.")
self.dut_ports = self.dut.get_ports(self.nic)
self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
self.preset_compilation()
@@ -139,18 +134,21 @@ class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
time.sleep(2)
self.dut.kill_all()
+ @skip_unsupported_pkg('os default')
def test_check_single_VLAN_fields_in_RXD_8021Q(self):
"""
Check single VLAN fields in RXD (802.1Q)
"""
self.check_single_VLAN_fields_in_RXD_8021Q()
+ @skip_unsupported_pkg('os default')
def test_check_single_VLAN_fields_in_RXD_8021ad(self):
"""
Check single VLAN fields in RXD (802.1ad)
"""
self.check_single_VLAN_fields_in_RXD_8021ad()
+ @skip_unsupported_pkg('os default')
def test_check_double_VLAN_fields_in_RXD_8021Q_1_VLAN_tag(self):
"""
Check double VLAN fields in RXD (802.1Q) only 1 VLAN tag
@@ -163,42 +161,49 @@ class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
"""
self.check_double_VLAN_fields_in_RXD_8021Q_2_VLAN_tag()
+ @skip_unsupported_pkg('os default')
def test_check_double_VLAN_fields_in_RXD_8021ad(self):
"""
Check double VLAN fields in RXD (802.1ad)
"""
self.check_double_VLAN_fields_in_RXD_8021ad()
+ @skip_unsupported_pkg('os default')
def test_check_IPv4_fields_in_RXD(self):
"""
Check IPv4 fields in RXD
"""
self.check_IPv4_fields_in_RXD()
+ @skip_unsupported_pkg('os default')
def test_check_IPv6_fields_in_RXD(self):
"""
Check IPv6 fields in RXD
"""
self.check_IPv6_fields_in_RXD()
+ @skip_unsupported_pkg('os default')
def test_check_IPv6_flow_field_in_RXD(self):
"""
Check IPv6 flow field in RXD
"""
self.check_IPv6_flow_field_in_RXD()
+ @skip_unsupported_pkg('os default')
def test_check_TCP_fields_in_IPv4_in_RXD(self):
"""
Check TCP fields in IPv4 in RXD
"""
self.check_TCP_fields_in_IPv4_in_RXD()
+ @skip_unsupported_pkg('os default')
def test_check_TCP_fields_in_IPv6_in_RXD(self):
"""
Check TCP fields in IPv6 in RXD
"""
self.check_TCP_fields_in_IPv6_in_RXD()
+ @skip_unsupported_pkg('os default')
def test_check_IPv4_IPv6_TCP_fields_in_RXD_on_specific_queues(self):
"""
Check IPv4, IPv6, TCP fields in RXD on specific queues
--
1.8.3.1
next prev parent reply other threads:[~2021-03-26 5:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 5:08 [dts] [PATCH V1 0/2] remove reload ice and add pkg check Zhimin Huang
2021-03-26 5:08 ` [dts] [PATCH V1 1/2] remove reload ice code Zhimin Huang
2021-03-30 1:39 ` Tu, Lijuan
2021-03-30 2:19 ` Huang, ZhiminX
2021-03-26 5:08 ` Zhimin Huang [this message]
2021-03-26 5:26 ` [dts] [PATCH V1 2/2] tests/flexible: add pkg check and remove reload ice Huang, ZhiminX
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1616735292-74549-3-git-send-email-zhiminx.huang@intel.com \
--to=zhiminx.huang@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).