diff mbox series

[V1,2/9] tests/cvl_qinq: update case code for driver change

Message ID 1634717221-221075-2-git-send-email-songx.jiale@intel.com (mailing list archive)
State Superseded
Headers show
Series [V1,1/9] tests/cvl_dcf_flow_priority: update case code for driver change | expand

Commit Message

Jiale Song Oct. 20, 2021, 8:06 a.m. UTC
Signed-off-by: Jiale Song <songx.jiale@intel.com>
---
 test_plans/cvl_qinq_test_plan.rst |  8 ++++----
 tests/TestSuite_cvl_qinq.py       | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 tests/TestSuite_cvl_qinq.py
diff mbox series

Patch

diff --git a/test_plans/cvl_qinq_test_plan.rst b/test_plans/cvl_qinq_test_plan.rst
index 4f44150..e725861 100644
--- a/test_plans/cvl_qinq_test_plan.rst
+++ b/test_plans/cvl_qinq_test_plan.rst
@@ -73,7 +73,7 @@  Prerequisites
 
 6. Enable 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)::
 
@@ -130,7 +130,7 @@  Prerequisites
 13. For AVF QinQ test cases(10-14), recreate Generate 1 VFs on PF0, reconfig the VF then launch testpmd::
 
      echo 0 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
-     ethtool --set-priv-flags ens785f0 vf-vlan-prune-disable off
+     ethtool --set-priv-flags ens785f0 vf-vlan-pruning on
      echo 1 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
      ip link set ens785f0 vf 0 mac 00:11:22:33:44:11
      ip link set dev ens785f0 vf 0 spoofchk off
@@ -908,7 +908,7 @@  Test case 09: vlan filter when pvid enable
 
 1. reset test environment, create vfs and disable vlan prune flag::
 
-    ethtool --set-priv-flags ens785f0 vf-vlan-prune-disable off
+    ethtool --set-priv-flags ens785f0 vf-vlan-pruning on
 
 2. repeat Prerequisites steps from 7 to 12
 
@@ -1116,7 +1116,7 @@  Test case 12: Enable/Disable IAVF VLAN header insertion
 1. enable vf-vlan-prune-disable flag::
 
     echo 0 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
-    ethtool --set-priv-flags ens785f0 vf-vlan-prune-disable on
+    ethtool --set-priv-flags ens785f0 vf-vlan-pruning off
 
 2. set up test environment again::
 
diff --git a/tests/TestSuite_cvl_qinq.py b/tests/TestSuite_cvl_qinq.py
old mode 100644
new mode 100755
index 0c950b0..01fae96
--- a/tests/TestSuite_cvl_qinq.py
+++ b/tests/TestSuite_cvl_qinq.py
@@ -253,7 +253,7 @@  class TestCvlQinq(TestCase):
         Run before each test case.
         '''
         self.pci_list = []
-        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-prune-disable on' % self.pf_interface, "#")
+        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-pruning off' % self.pf_interface, "# ")
 
     def setup_pf_vfs_env(self, vfs_num=4):
 
@@ -644,7 +644,7 @@  class TestCvlQinq(TestCase):
                      'Ether(dst="%s",type=0x8100)/Dot1Q(vlan=11,type=0x0800)/IP(src="196.222.232.221")/("X"*480)' % self.vf1_mac]
         pkt_list2 = ['Ether(dst="%s",type=0x8100)/Dot1Q(vlan=21,type=0x8100)/Dot1Q(vlan=2,type=0x0800)/IP(src="196.222.232.221")/("X"*480)' % self.vf1_mac,
                      'Ether(dst="%s",type=0x8100)/Dot1Q(vlan=21,type=0x0800)/IP(src="196.222.232.221")/("X"*480)' % self.vf1_mac]
-        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-prune-disable off' % self.pf_interface, '#')
+        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-pruning on' % self.pf_interface, '# ')
         self.setup_pf_vfs_env()
         self.launch_testpmd(dcf_param=True)
         self.pmd_output.execute_cmd("vlan set filter on 1")
@@ -677,7 +677,7 @@  class TestCvlQinq(TestCase):
                      'Ether(dst="%s",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="196.222.232.221")/("X"*480)' % self.vf1_mac]
         pkt_list2 = ['Ether(dst="%s",type=0x8100)/Dot1Q(vlan=11,type=0x8100)/Dot1Q(vlan=2,type=0x0800)/IP(src="196.222.232.221")/("X"*480)' % self.vf1_mac,
                      'Ether(dst="%s",type=0x8100)/Dot1Q(vlan=11,type=0x0800)/IP(src="196.222.232.221")/("X"*480)' % self.vf1_mac]
-        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-prune-disable off' % self.pf_interface, '#')
+        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-pruning on' % self.pf_interface, '# ')
         self.setup_pf_vfs_env(vfs_num=1)
         self.launch_testpmd(vfs_num=1)
         self.pmd_output.execute_cmd("vlan set filter on 0")
@@ -710,7 +710,7 @@  class TestCvlQinq(TestCase):
         """
         pkt_list = ['Ether(dst="%s",type=0x8100)/Dot1Q(vlan=1,type=0x8100)/Dot1Q(vlan=2,type=0x0800)/IP(src="196.222.232.221")/("X"*480)' % self.vf1_mac,
                     'Ether(dst="%s",type=0x8100)/Dot1Q(vlan=1,type=0x0800)/IP(src="196.222.232.221")/("X"*480)' % self.vf1_mac]
-        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-prune-disable off' % self.pf_interface, '#')
+        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-pruning on' % self.pf_interface, '# ')
         self.setup_pf_vfs_env(vfs_num=1)
         self.launch_testpmd(vfs_num=1)
         self.pmd_output.execute_cmd("vlan set filter on 0")
@@ -744,7 +744,7 @@  class TestCvlQinq(TestCase):
         out_vlan = 1
         pkt_list = ['Ether(dst="%s",type=0x0800)/IP(src="196.222.232.221")/("X"*480)' % self.vf1_mac,
                     'Ether(dst="%s",type=0x8100)/Dot1Q(vlan=11,type=0x0800)/IP(src="196.222.232.221")/("X"*480)' % self.vf1_mac]
-        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-prune-disable on' % self.pf_interface, '#')
+        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-pruning off' % self.pf_interface, '# ')
         self.setup_pf_vfs_env(vfs_num=1)
         self.launch_testpmd(vfs_num=1)
         self.pmd_output.execute_cmd("stop")
@@ -787,7 +787,7 @@  class TestCvlQinq(TestCase):
         """
         param = '--rxq=16 --txq=16 --disable-crc-strip'
         pkt = 'Ether(dst="%s",type=0x0800)/IP(src="196.222.232.221")/("X"*480)' % self.vf1_mac
-        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-prune-disable off' % self.pf_interface, '#')
+        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-pruning on' % self.pf_interface, '# ')
         self.setup_pf_vfs_env(vfs_num=1)
         self.pmd_output.start_testpmd(cores='1S/4C/1T', param=param, ports=self.pci_list, socket=self.ports_socket)
         self.pmd_output.execute_cmd("set fwd mac")
@@ -819,7 +819,7 @@  class TestCvlQinq(TestCase):
         AVF CRC strip and Vlan strip co-exists
         """
         pkt = 'Ether(dst="%s",type=0x8100)/Dot1Q(vlan=1,type=0x8100)/Dot1Q(vlan=2,type=0x0800)/IP(src="196.222.232.221")/("X"*480)' % self.vf1_mac
-        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-prune-disable off' % self.pf_interface, "#")
+        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-pruning on' % self.pf_interface, "# ")
         self.setup_pf_vfs_env(vfs_num=1)
         self.launch_testpmd(vfs_num=1)
         self.check_vlan_offload(vlan_type="strip", stats="off")
@@ -873,4 +873,4 @@  class TestCvlQinq(TestCase):
         self.destroy_iavf()
 
     def tear_down_all(self):
-        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-prune-disable off' % self.pf_interface, '#')
\ No newline at end of file
+        self.dut.send_expect('ethtool --set-priv-flags %s vf-vlan-pruning off' % self.pf_interface, '# ')