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

Message ID 1617093887-25137-2-git-send-email-zhiminx.huang@intel.com (mailing list archive)
State Accepted
Headers
Series remove replace pkg code |

Commit Message

Huang, ZhiminX March 30, 2021, 8:44 a.m. UTC
  *.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(-)
  

Comments

Huang, ZhiminX March 30, 2021, 10:04 a.m. UTC | #1
> -----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>
  

Patch

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.