[dts] [PATCH V1 0/3] add flexible rxid 22 case

[dts] [PATCH V1 0/3] add flexible rxid 22 case

[Zhimin Huang]

*.This patch set add flexible rxid 22 test case and Configuration file.

Zhimin Huang (3):
  tests/TestSuite_flexible_rxd:add flexible rxid 22 case
  tests/flexible_common:add flexible rxid 22 common
  conf/flexible_rxd:add flexible rxid 22 conf

 conf/flexible_rxd.cfg           |  4 ++++
 tests/TestSuite_flexible_rxd.py | 13 ++++++++++++-
 tests/flexible_common.py        | 24 ++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 conf/flexible_rxd.cfg

-- 
1.8.3.1

[dts] [PATCH V1 1/3] tests/TestSuite_flexible_rxd:add flexible rxid 22 case

[Zhimin Huang]

*.add rxid 22 case into flexible_rxd suite.

Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 tests/TestSuite_flexible_rxd.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/TestSuite_flexible_rxd.py b/tests/TestSuite_flexible_rxd.py
index 733c62e..6ce0a09 100644
--- a/tests/TestSuite_flexible_rxd.py
+++ b/tests/TestSuite_flexible_rxd.py
@@ -34,7 +34,7 @@
 import time
 from test_case import TestCase
 from flexible_common import FlexibleRxdBase
-
+import rte_flow_common as rfc
 
 class TestFlexibleRxd(TestCase, FlexibleRxdBase):
 
@@ -85,12 +85,17 @@ 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):
         """
@@ -213,3 +218,9 @@ class TestFlexibleRxd(TestCase, FlexibleRxdBase):
         check ip offset with multi MPLS with 2 vlan tag
         """
         self.check_ip_offset_with_multi_MPLS_with_2_vlan_tag()
+
+    def test_check_effect_replace_pkg_RXID_22_to_RXID_16(self):
+        """
+        Check replace pkg RXID #22 to RXID #16 effect of testpmd
+        """
+        self.check_effect_replace_pkg_RXID_22_to_RXID_16()
\ No newline at end of file
-- 
1.8.3.1

[dts] [PATCH V1 2/3] tests/flexible_common:add flexible rxid 22 common

[Zhimin Huang]

*.add rxid 22 case flexible common.

Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 tests/flexible_common.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/flexible_common.py b/tests/flexible_common.py
index fa3c64d..9df62ca 100644
--- a/tests/flexible_common.py
+++ b/tests/flexible_common.py
@@ -32,6 +32,7 @@
 import time
 from packet import Packet
 from pmd_output import PmdOutput
+import re
 
 
 class FlexibleRxdBase(object):
@@ -159,6 +160,21 @@ class FlexibleRxdBase(object):
                 expected_strs
             self.verify(all([e in out for e in _expected_strs]), msg)
 
+    def replace_pkg(self, pkg='comms'):
+        ice_pkg_path = ''.join([self.ddp_dir, "ice.pkg"])
+        if pkg == 'os_default':
+            self.dut.send_expect("cp {} {}".format(self.os_default_pkg, ice_pkg_path), "# ")
+        if pkg == 'comms':
+            self.dut.send_expect("cp {} {}".format(self.comms_pkg, ice_pkg_path), "# ")
+        self.dut.send_expect("echo {0} > /sys/bus/pci/devices/{0}/driver/unbind".format(self.pci), "# ", 60)
+        self.dut.send_expect("echo {} > /sys/bus/pci/drivers/ice/bind".format(self.pci), "# ", 60)
+        self.dut.send_expect("./usertools/dpdk-devbind.py --force --bind=vfio-pci {}".format(self.pci), "# ", 60)
+        dmesg_out = self.dut.send_expect('dmesg | grep Package | tail -1', '#')
+        package_version = re.search('version (.*)', dmesg_out).group(1)
+        self.logger.info("package version:{}".format(package_version))
+        self.verify(package_version in self.os_default_pkg if pkg == 'os_default' else self.comms_pkg,
+                    'replace package failed')
+
     def check_single_VLAN_fields_in_RXD_8021Q(self):
         """
         Check single VLAN fields in RXD (802.1Q)
@@ -481,3 +497,11 @@ class FlexibleRxdBase(object):
             ['Ether(src="{src_mac}", dst="{dst_mac}",type=0x88A8)/Dot1Q(type=0x8100)/Dot1Q(type=0x8847)/MPLS(s=0)/MPLS(s=0)/MPLS(s=0)/MPLS(s=0)/MPLS(s=1)/IPv6()',
                 'ip_offset=42']]
         self.__verify_common(pkts_list)
+
+    def check_effect_replace_pkg_RXID_22_to_RXID_16(self):
+        self.logger.info("replace ice-1.3.7.0.pkg with RXID 16")
+        self.replace_pkg('os_default')
+        out = self.__pmdout.start_testpmd(cores="1S/4C/1T", param='--rxq=64 --txq=64', eal_param=f"-w {self.__pci}")
+        self.verify("Fail to start port 0" in out, "RXID #16 not support start testpmd")
+        self.__pmdout.execute_cmd("quit", "# ")
+        self.replace_pkg('comms')
-- 
1.8.3.1

[dts] [PATCH V1 3/3] conf/flexible_rxd:add flexible rxid 22 conf

[Zhimin Huang]

*.add rxid 22 case conf.

Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 conf/flexible_rxd.cfg | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 conf/flexible_rxd.cfg

diff --git a/conf/flexible_rxd.cfg b/conf/flexible_rxd.cfg
new file mode 100644
index 0000000..79c3559
--- /dev/null
+++ b/conf/flexible_rxd.cfg
@@ -0,0 +1,4 @@
+[suite]
+# flexible_rxd ice package file location
+os_default_package_file_location="/lib/firmware/updates/intel/ice/ddp/ice-1.3.7.0.pkg"
+comms_package_file_location="/lib/firmware/updates/intel/ice/ddp/ice_comms-1.3.24.0.pkg"
-- 
1.8.3.1

Re: [dts] [PATCH V1 0/3] add flexible rxid 22 case

[Huang, ZhiminX]

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

Tested-by: Huang, ZhiminX <zhiminx.huang@intel.com>

Regards,
HuangZhiMin

> -----Original Message-----
> From: Zhimin Huang [mailto:zhiminx.huang@intel.com]
> Sent: Friday, November 27, 2020 11:14 AM
> To: dts@dpdk.org
> Cc: Fu, Qi <qi.fu@intel.com>; Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V1 0/3] add flexible rxid 22 case
> 
> *.This patch set add flexible rxid 22 test case and Configuration file.

[-- Attachment #2: TestFlexibleRxd.log --]
[-- Type: application/octet-stream, Size: 257612 bytes --]

Re: [dts] [PATCH V1 0/3] add flexible rxid 22 case

[Fu, Qi]

Acked-by: Fu, Qi <qi.fu@intel.com>

Best regards,
Fu, Qi

> -----Original Message-----
> From: Huang, ZhiminX <zhiminx.huang@intel.com>
> Sent: Friday, November 27, 2020 1:26 PM
> To: dts@dpdk.org
> Cc: Fu, Qi <qi.fu@intel.com>
> Subject: RE: [dts] [PATCH V1 0/3] add flexible rxid 22 case
> 
> Tested-by: Huang, ZhiminX <zhiminx.huang@intel.com>
> 
> Regards,
> HuangZhiMin
> 
> > -----Original Message-----
> > From: Zhimin Huang [mailto:zhiminx.huang@intel.com]
> > Sent: Friday, November 27, 2020 11:14 AM
> > To: dts@dpdk.org
> > Cc: Fu, Qi <qi.fu@intel.com>; Huang, ZhiminX <zhiminx.huang@intel.com>
> > Subject: [dts] [PATCH V1 0/3] add flexible rxid 22 case
> >
> > *.This patch set add flexible rxid 22 test case and Configuration file.

Re: [dts] [PATCH V1 0/3] add flexible rxid 22 case

[Tu, Lijuan]

Applied

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Fu, Qi
> Sent: 2020年12月7日 10:28
> To: Huang, ZhiminX <zhiminx.huang@intel.com>; dts@dpdk.org
> Subject: Re: [dts] [PATCH V1 0/3] add flexible rxid 22 case
> 
> Acked-by: Fu, Qi <qi.fu@intel.com>
> 
> Best regards,
> Fu, Qi
> 
> > -----Original Message-----
> > From: Huang, ZhiminX <zhiminx.huang@intel.com>
> > Sent: Friday, November 27, 2020 1:26 PM
> > To: dts@dpdk.org
> > Cc: Fu, Qi <qi.fu@intel.com>
> > Subject: RE: [dts] [PATCH V1 0/3] add flexible rxid 22 case
> >
> > Tested-by: Huang, ZhiminX <zhiminx.huang@intel.com>
> >
> > Regards,
> > HuangZhiMin
> >
> > > -----Original Message-----
> > > From: Zhimin Huang [mailto:zhiminx.huang@intel.com]
> > > Sent: Friday, November 27, 2020 11:14 AM
> > > To: dts@dpdk.org
> > > Cc: Fu, Qi <qi.fu@intel.com>; Huang, ZhiminX <zhiminx.huang@intel.com>
> > > Subject: [dts] [PATCH V1 0/3] add flexible rxid 22 case
> > >
> > > *.This patch set add flexible rxid 22 test case and Configuration file.