[V1] tests/cvl_advanced_iavf_rss:change load ice package mode

  use conf/xxx.cfg mode load ice package.

Signed-off-by: Xie wei <weix.xie@intel.com>
---
 conf/cvl_advanced_iavf_rss_package.cfg   | 4 ++++
 tests/TestSuite_cvl_advanced_iavf_rss.py | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 conf/cvl_advanced_iavf_rss_package.cfg
  

Tested-by:  Xie,WeiX < weix.xie@intel.com>

Regards,
Xie Wei


-----Original Message-----
From: Xie, WeiX 
Sent: Tuesday, July 21, 2020 2:19 PM
To: dts@dpdk.org
Cc: Xie, WeiX <weix.xie@intel.com>
Subject: [dts][PATCH V1] tests/cvl_advanced_iavf_rss:change load ice package mode

use conf/xxx.cfg mode load ice package.

Signed-off-by: Xie wei <weix.xie@intel.com>
---
 conf/cvl_advanced_iavf_rss_package.cfg   | 4 ++++
 tests/TestSuite_cvl_advanced_iavf_rss.py | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)  create mode 100644 conf/cvl_advanced_iavf_rss_package.cfg

diff --git a/conf/cvl_advanced_iavf_rss_package.cfg b/conf/cvl_advanced_iavf_rss_package.cfg
new file mode 100644
index 0000000..228d481
--- /dev/null
+++ b/conf/cvl_advanced_iavf_rss_package.cfg
@@ -0,0 +1,4 @@
+[suite]
+# cvl_advanced_iavf_rss ice package file location 
+os_default_package_file_location=/lib/firmware/updates/intel/ice/ddp/ic
+e-1.3.13.0.pkg 
+comms_package_file_location=/lib/firmware/updates/intel/ice/ddp/ice_com
+ms-1.3.16.0.pkg
diff --git a/tests/TestSuite_cvl_advanced_iavf_rss.py b/tests/TestSuite_cvl_advanced_iavf_rss.py
index eaf55fa..349cb40 100644
--- a/tests/TestSuite_cvl_advanced_iavf_rss.py
+++ b/tests/TestSuite_cvl_advanced_iavf_rss.py
@@ -4,6 +4,7 @@ import time
 from packet import Packet
 from pmd_output import PmdOutput
 from test_case import TestCase
+from config import UserConf
 import rte_flow_common as rfc
 
 vf0_mac = "00:01:23:45:67:89"
@@ -735,8 +736,11 @@ class AdvancedIavfRSSTest(TestCase):
         self.pf_pci = self.dut.ports_info[self.dut_ports[0]]['pci']
         self.verify(self.nic in ["columbiaville_25g", "columbiaville_100g"], "%s nic not support ethertype filter" % self.nic)
         self.ddp_fdir = "/lib/firmware/updates/intel/ice/ddp/"
-        self.os_pkg_name = "ice-1.3.11.0.pkg"
-        self.comms_pkg_name = "ice_comms-1.3.16.0.pkg"
+        conf_file = 'conf/cvl_advanced_iavf_rss_package.cfg'
+        conf_info = UserConf(conf_file)
+        conf_section = conf_info.conf._sections['suite']
+        self.os_pkg_name = conf_section['os_default_package_file_location']
+        self.comms_pkg_name = 
+ conf_section['comms_package_file_location']
         self.vf_flag = False
         self.create_iavf()
 
--
2.17.1
  

Applied, thanks

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Xie wei
> Sent: 2020年7月21日 14:19
> To: dts@dpdk.org
> Cc: Xie, WeiX <weix.xie@intel.com>
> Subject: [dts] [PATCH V1] tests/cvl_advanced_iavf_rss:change load ice package
> mode
> 
> use conf/xxx.cfg mode load ice package.
> 
> Signed-off-by: Xie wei <weix.xie@intel.com>
> ---
>  conf/cvl_advanced_iavf_rss_package.cfg   | 4 ++++
>  tests/TestSuite_cvl_advanced_iavf_rss.py | 8 ++++++--
>  2 files changed, 10 insertions(+), 2 deletions(-)  create mode 100644
> conf/cvl_advanced_iavf_rss_package.cfg
> 
> diff --git a/conf/cvl_advanced_iavf_rss_package.cfg
> b/conf/cvl_advanced_iavf_rss_package.cfg
> new file mode 100644
> index 0000000..228d481
> --- /dev/null
> +++ b/conf/cvl_advanced_iavf_rss_package.cfg
> @@ -0,0 +1,4 @@
> +[suite]
> +# cvl_advanced_iavf_rss ice package file location
> +os_default_package_file_location=/lib/firmware/updates/intel/ice/ddp/ic
> +e-1.3.13.0.pkg
> +comms_package_file_location=/lib/firmware/updates/intel/ice/ddp/ice_com
> +ms-1.3.16.0.pkg
> diff --git a/tests/TestSuite_cvl_advanced_iavf_rss.py
> b/tests/TestSuite_cvl_advanced_iavf_rss.py
> index eaf55fa..349cb40 100644
> --- a/tests/TestSuite_cvl_advanced_iavf_rss.py
> +++ b/tests/TestSuite_cvl_advanced_iavf_rss.py
> @@ -4,6 +4,7 @@ import time
>  from packet import Packet
>  from pmd_output import PmdOutput
>  from test_case import TestCase
> +from config import UserConf
>  import rte_flow_common as rfc
> 
>  vf0_mac = "00:01:23:45:67:89"
> @@ -735,8 +736,11 @@ class AdvancedIavfRSSTest(TestCase):
>          self.pf_pci = self.dut.ports_info[self.dut_ports[0]]['pci']
>          self.verify(self.nic in ["columbiaville_25g", "columbiaville_100g"], "%s nic
> not support ethertype filter" % self.nic)
>          self.ddp_fdir = "/lib/firmware/updates/intel/ice/ddp/"
> -        self.os_pkg_name = "ice-1.3.11.0.pkg"
> -        self.comms_pkg_name = "ice_comms-1.3.16.0.pkg"
> +        conf_file = 'conf/cvl_advanced_iavf_rss_package.cfg'
> +        conf_info = UserConf(conf_file)
> +        conf_section = conf_info.conf._sections['suite']
> +        self.os_pkg_name = conf_section['os_default_package_file_location']
> +        self.comms_pkg_name =
> + conf_section['comms_package_file_location']
>          self.vf_flag = False
>          self.create_iavf()
> 
> --
> 2.17.1