[dts] [PATCH V1 0/2] remove replace pkg code

[dts] [PATCH V1 0/2] remove replace pkg code

[Zhimin Huang]

*.These suites support os default, comms, wireless pkg after tested,
so remove replace pkg code in script.

Zhimin Huang (2):
  tests/cvl_dcf_acl_filter:remove replace pkg code
  tests/cvl_limit_value_test:remove replace pkg code

 test_plans/cvl_dcf_acl_filter_test_plan.rst   |  6 ++----
 test_plans/cvl_limit_value_test_test_plan.rst |  5 +++--
 tests/TestSuite_cvl_dcf_acl_filter.py         | 16 ----------------
 tests/TestSuite_cvl_limit_value_test.py       | 15 ---------------
 4 files changed, 5 insertions(+), 37 deletions(-)

-- 
1.8.3.1

[dts] [PATCH V1 1/2] tests/cvl_dcf_acl_filter: remove replace pkg code

[Zhimin Huang]

*.update testplan pkg support and remove replace pkg in script

Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 test_plans/cvl_dcf_acl_filter_test_plan.rst |  6 ++----
 tests/TestSuite_cvl_dcf_acl_filter.py       | 16 ----------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/test_plans/cvl_dcf_acl_filter_test_plan.rst b/test_plans/cvl_dcf_acl_filter_test_plan.rst
index e9267a5..cdccb69 100644
--- a/test_plans/cvl_dcf_acl_filter_test_plan.rst
+++ b/test_plans/cvl_dcf_acl_filter_test_plan.rst
@@ -57,11 +57,9 @@ Prerequisites
    dpdk: http://dpdk.org/git/dpdk
    scapy: http://www.secdev.org/projects/scapy/
 
-3. Copy specific ice package to /lib/firmware/updates/intel/ice/ddp/ice.pkg,
-   then load driver::
+3. Support ice pkg::
 
-    rmmod ice
-    insmod ice.ko
+    os default/comms/wireless
 
 4. Compile DPDK::
 
diff --git a/tests/TestSuite_cvl_dcf_acl_filter.py b/tests/TestSuite_cvl_dcf_acl_filter.py
index 826da9c..1d516fc 100644
--- a/tests/TestSuite_cvl_dcf_acl_filter.py
+++ b/tests/TestSuite_cvl_dcf_acl_filter.py
@@ -749,12 +749,6 @@ class CVLDCFACLFilterTest(TestCase):
         self.testpmd_status = "close"
         #bind pf to kernel
         self.bind_nics_driver(self.dut_ports, driver="ice")
-        #move comms package to package folder
-        self.suite_config = rfc.get_suite_config(self)
-        comms_package_location = self.suite_config["comms_package_file_location"]
-        package_location = self.suite_config["package_file_location"]
-        self.dut.send_expect("cp %s %s" % (comms_package_location, package_location), "# ")
-        self.re_load_ice_driver()
         #set vf driver
         self.vf_driver = 'vfio-pci'
         self.dut.send_expect("modprobe uio", "# ")
@@ -784,16 +778,6 @@ class CVLDCFACLFilterTest(TestCase):
             port.bind_driver(self.vf_driver)
         time.sleep(15)
 
-    def re_load_ice_driver(self):
-        """
-        remove and reload the ice driver
-        """
-        ice_driver_file_location = self.suite_config["ice_driver_file_location"]
-        self.dut.send_expect("rmmod ice", "# ", 60)
-        self.dut.send_expect("insmod %s" % ice_driver_file_location, "# ", 60)
-        self.dut.send_expect("ifconfig %s up" % self.pf0_intf, "# ", 15)
-        self.dut.send_expect("ifconfig %s up" % self.tester_iface0, "# ", 15)
-
     def set_up(self):
         """
         Run before each test case.
-- 
1.8.3.1

[dts] [PATCH V1 2/2] tests/cvl_limit_value_test: remove replace pkg code

[Zhimin Huang]

*.update test plan support pkg and remove replace pkg in script

Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 test_plans/cvl_limit_value_test_test_plan.rst |  5 +++--
 tests/TestSuite_cvl_limit_value_test.py       | 15 ---------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/test_plans/cvl_limit_value_test_test_plan.rst b/test_plans/cvl_limit_value_test_test_plan.rst
index 8c8402e..242eb9a 100644
--- a/test_plans/cvl_limit_value_test_test_plan.rst
+++ b/test_plans/cvl_limit_value_test_test_plan.rst
@@ -66,8 +66,9 @@ Prerequisites
    DPDK: http://dpdk.org/git/dpdk
    scapy: http://www.secdev.org/projects/scapy/
 
-3. Copy specific ice package to /lib/firmware/intel/ice/ddp/ice.pkg
-   Then reboot server, and compile DPDK
+3. Support ice pkg::
+
+    os default/comms/wireless
 
 4. Generate 2 VFs on each PF and set mac address for each VF::
 
diff --git a/tests/TestSuite_cvl_limit_value_test.py b/tests/TestSuite_cvl_limit_value_test.py
index 77ce016..b806474 100644
--- a/tests/TestSuite_cvl_limit_value_test.py
+++ b/tests/TestSuite_cvl_limit_value_test.py
@@ -189,15 +189,6 @@ class TestCvlLimitValue(TestCase):
         self.dut.destroy_sriov_vfs_by_port(self.dut_ports[0])
         self.dut.destroy_sriov_vfs_by_port(self.dut_ports[1])
 
-    def re_load_ice_driver(self):
-        """
-        remove and reload the ice driver
-        """
-        ice_driver_file_location = self.suite_config["ice_driver_file_location"]
-        self.dut.send_expect("rmmod ice", "# ", 15)
-        self.dut.send_expect("insmod %s" % ice_driver_file_location, "# ", 60)
-        time.sleep(5)
-
     def config_testpmd(self):
         self.pmd_output.execute_cmd("set fwd rxonly")
         self.pmd_output.execute_cmd("set verbose 1")
@@ -813,12 +804,6 @@ class TestCvlLimitValue(TestCase):
     def test_max_rule_number(self):
         #bind pf to kernel
         self.bind_nics_driver(self.dut_ports, driver="ice")
-        #move comms package to package folder
-        self.suite_config = rfc.get_suite_config(self)
-        comms_package_location = self.suite_config["comms_package_file_location"]
-        package_location = self.suite_config["package_file_location"]
-        self.dut.send_expect("cp %s %s" % (comms_package_location, package_location), "# ")
-        self.re_load_ice_driver()
         #set vf driver
         self.vf_driver = 'vfio-pci'
         self.dut.send_expect('modprobe vfio-pci', '#')
-- 
1.8.3.1

Re: [dts] [PATCH V1 1/2] tests/cvl_dcf_acl_filter: remove replace pkg code

[Huang, ZhiminX]

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

> -----Original Message-----
> From: Huang, ZhiminX <zhiminx.huang@intel.com>
> Sent: Tuesday, March 30, 2021 4:45 PM
> To: dts@dpdk.org
> Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V1 1/2] tests/cvl_dcf_acl_filter: remove replace pkg
> code
> 
Tested-by: Huang Zhimin <zhiminx.huang@intel.com>

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

Re: [dts] [PATCH V1 2/2] tests/cvl_limit_value_test: remove replace pkg code

[Huang, ZhiminX]

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

> -----Original Message-----
> From: Huang, ZhiminX <zhiminx.huang@intel.com>
> Sent: Tuesday, March 30, 2021 4:45 PM
> To: dts@dpdk.org
> Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V1 2/2] tests/cvl_limit_value_test: remove replace
> pkg code
> 
Tested-by: Huang Zhimin <zhiminx.huang@intel.com>

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

Re: [dts] [PATCH V1 0/2] remove replace pkg code

[Tu, Lijuan]

> *.These suites support os default, comms, wireless pkg after tested, so remove
> replace pkg code in script.
> 
> Zhimin Huang (2):
>   tests/cvl_dcf_acl_filter:remove replace pkg code
>   tests/cvl_limit_value_test:remove replace pkg code

Applied