diff mbox series

[V1,1/2] remove reload ice code

Message ID 1616735292-74549-2-git-send-email-zhiminx.huang@intel.com (mailing list archive)
State Changes Requested
Headers
Series remove reload ice and add pkg check |

Commit Message

Huang, ZhiminX March 26, 2021, 5:08 a.m. UTC 
  *.cvl_dcf_acl_filter and cvl_limit_value_test remove reload ice code

Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 tests/TestSuite_cvl_dcf_acl_filter.py   | 16 ----------------
 tests/TestSuite_cvl_limit_value_test.py | 15 ---------------
 2 files changed, 31 deletions(-)

Comments

Tu, Lijuan March 30, 2021, 1:39 a.m. UTC | #1 
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Zhimin Huang
> Sent: 2021年3月26日 13:08
> To: dts@dpdk.org
> Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V1 1/2] remove reload ice code
> 
> *.cvl_dcf_acl_filter and cvl_limit_value_test remove reload ice code
> 
> Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
> ---
>  tests/TestSuite_cvl_dcf_acl_filter.py   | 16 ----------------
>  tests/TestSuite_cvl_limit_value_test.py | 15 ---------------
>  2 files changed, 31 deletions(-)
> 
> 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()

this is part of set_up_all, so I thought the suite is designed for comms package, but I saw you remove the replace, is that mean, the suite is also qualified to test other ddp packages, e.g. OS package.
Could you please explain, why do the changes. Thanks.

>          #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.
> 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
Huang, ZhiminX March 30, 2021, 2:19 a.m. UTC | #2 
For the current framework design, the dts not to replace pkg for regression.
After we tested, cvl_limit_value_test and cvl_dcf_acl_filter suites support os/comms/wireless pkg.
so remove it.

> -----Original Message-----
> From: Tu, Lijuan <lijuan.tu@intel.com>
> Sent: Tuesday, March 30, 2021 9:39 AM
> To: Huang, ZhiminX <zhiminx.huang@intel.com>; dts@dpdk.org
> Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: RE: [dts] [PATCH V1 1/2] remove reload ice code
> 
> 
> 
> > -----Original Message-----
> > From: dts <dts-bounces@dpdk.org> On Behalf Of Zhimin Huang
> > Sent: 2021年3月26日 13:08
> > To: dts@dpdk.org
> > Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> > Subject: [dts] [PATCH V1 1/2] remove reload ice code
> >
> > *.cvl_dcf_acl_filter and cvl_limit_value_test remove reload ice code
> >
> > Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
> > ---
> >  tests/TestSuite_cvl_dcf_acl_filter.py   | 16 ----------------
> >  tests/TestSuite_cvl_limit_value_test.py | 15 ---------------
> >  2 files changed, 31 deletions(-)
> >
> > 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()
> 
> this is part of set_up_all, so I thought the suite is designed for comms
> package, but I saw you remove the replace, is that mean, the suite is also
> qualified to test other ddp packages, e.g. OS package.
> Could you please explain, why do the changes. Thanks.
> 
> >          #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.
> > 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
>
diff mbox series

Patch

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.
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', '#')