[V2,01/10] tests/cvl_dcf_flow_priority: update case code for driver change

Message ID 1635840720-90878-1-git-send-email-songx.jiale@intel.com (mailing list archive)
State Accepted
Headers
Series [V2,01/10] tests/cvl_dcf_flow_priority: update case code for driver change |

Commit Message

Jiale, SongX Nov. 2, 2021, 8:11 a.m. UTC
  Signed-off-by: Jiale Song <songx.jiale@intel.com>
---
 test_plans/cvl_dcf_flow_priority_test_plan.rst |  4 ++--
 tests/TestSuite_cvl_dcf_flow_priority.py       | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)
  

Patch

diff --git a/test_plans/cvl_dcf_flow_priority_test_plan.rst b/test_plans/cvl_dcf_flow_priority_test_plan.rst
index 38e86a74..d4623194 100755
--- a/test_plans/cvl_dcf_flow_priority_test_plan.rst
+++ b/test_plans/cvl_dcf_flow_priority_test_plan.rst
@@ -71,9 +71,9 @@  Prerequisites
     0000:18:00.0 'Device 159b' if=ens785f0 drv=ice unused=vfio-pci
     0000:18:00.1 'Device 159b' if=ens785f1 drv=ice unused=vfio-pci
 
-6. Enable vlan prune flag::
+6. Disable vlan prune flag::
 
-    ethtool --set-priv-flags ens785f0 vf-vlan-prune-disable on
+    ethtool --set-priv-flags ens785f0 vf-vlan-pruning off
 
 7. Generate 4 VFs on PF0(not all the VFs are used)::
 
diff --git a/tests/TestSuite_cvl_dcf_flow_priority.py b/tests/TestSuite_cvl_dcf_flow_priority.py
index 2e021a67..8ec16fad 100755
--- a/tests/TestSuite_cvl_dcf_flow_priority.py
+++ b/tests/TestSuite_cvl_dcf_flow_priority.py
@@ -1128,6 +1128,11 @@  class CVLDCFFlowPriorityTest(TestCase):
         self.testpmd_status = "close"
         #bind pf to kernel
         self.bind_nics_driver(self.dut_ports, driver="ice")
+        # get PF interface name
+        self.pf0_intf = self.dut.ports_info[self.dut_ports[0]]['intf']
+        # get priv-flags default stats
+        self.flag = 'vf-vlan-pruning'
+        self.default_stats = self.dut.get_priv_flags_state(self.pf0_intf, self.flag)
 
         #set vf driver
         self.vf_driver = 'vfio-pci'
@@ -1139,7 +1144,8 @@  class CVLDCFFlowPriorityTest(TestCase):
         self.used_dut_port_0 = self.dut_ports[pf_port]
         #get PF interface name
         self.pf0_intf = self.dut.ports_info[self.used_dut_port_0]['intf']
-        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-prune-disable on' % self.pf0_intf, '#')
+        if self.default_stats:
+            self.dut.send_expect('ethtool --set-priv-flags %s %s off' % (self.pf0_intf, self.flag), "# ")
         #generate 4 VFs on PF
         self.dut.generate_sriov_vfs_by_port(self.used_dut_port_0, 4, driver=driver)
         self.sriov_vfs_port_0 = self.dut.ports_info[self.used_dut_port_0]['vfs_port']
@@ -1768,4 +1774,6 @@  class CVLDCFFlowPriorityTest(TestCase):
         Run after each test suite.
         """
         self.dut.kill_all()
+        if self.default_stats:
+            self.dut.send_expect('ethtool --set-priv-flags %s %s %s' % (self.pf0_intf, self.flag, self.default_stats), "# ")