[V1,1/2] tests/kernelpf_iavf: adapt to CVL nic

Message ID 20210325155751.24219-2-weix.xie@intel.com (mailing list archive)
State Superseded
Headers
Series adapt to CVL nic |

Commit Message

Xie, WeiX March 25, 2021, 3:57 p.m. UTC
  adapt to ice driver update for vlan issue on AVF/DCF.
vf_add_pvid: remove vlan, the pkts with random vlan id 1-4095 shall not be received.
vf_vlan_rx: remove vlan, the pkts with vlan 1 shall not be received.
vf_vlan_strip: disable strip, the pkts with random vlan tag shall not be received.
vf_vlan_filter: disable filter, the pkts with random vlan tag shall not be received.
vf_vlan_promisc: disable filter and strip, the pkts with random vlan tag shall not be received.

Signed-off-by: xiewei <weix.xie@intel.com>
---
 tests/TestSuite_kernelpf_iavf.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
  

Patch

diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py
index 5db1ec00..c953e46c 100644
--- a/tests/TestSuite_kernelpf_iavf.py
+++ b/tests/TestSuite_kernelpf_iavf.py
@@ -420,7 +420,7 @@  class TestKernelpfIavf(TestCase):
         out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP")
         tcpdump_out = self.get_tcpdump_package()
         receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out)
-        if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+        if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
             self.verify(len(receive_pkt) == 2, "fail to tester received vlan packet!!!")
             self.verify(self.vf_mac in out, "Failed to received vlan packet!!!")
         else:
@@ -489,7 +489,7 @@  class TestKernelpfIavf(TestCase):
 
         # send vlan 1 packet, vf can receive packet
         out = self.send_and_getout(vlan=1, pkt_type="VLAN_UDP")
-        if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+        if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
             self.verify(self.vf_mac in out, "received vlan 1 packet!!!")
         else:
             self.verify(self.vf_mac not in out, "Received vlan 1 packet!!!")
@@ -537,7 +537,7 @@  class TestKernelpfIavf(TestCase):
         self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP")
         tcpdump_out = self.get_tcpdump_package()
         receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out)
-        if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+        if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
             self.verify(len(receive_pkt) == 2, 'Failed to not received vlan packet!!!')
         else:
             self.verify(len(receive_pkt) == 1, 'Failed to not received vlan packet!!!')
@@ -574,7 +574,7 @@  class TestKernelpfIavf(TestCase):
         time.sleep(1)
         tcpdump_out = self.get_tcpdump_package()
         receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out)
-        if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+        if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
             self.verify(len(receive_pkt) == 2, 'Failed to received vlan packet!!!')
         else:
             self.verify(len(receive_pkt) == 1, 'Failed to received vlan packet!!!')
@@ -917,7 +917,7 @@  class TestKernelpfIavf(TestCase):
         self.scapy_send_packet(self.vf_mac, self.tester_intf, vlan_flags=True, count=10)
         out = self.vm_dut.get_session_output()
         packets = len(re.findall('received 1 packets', out))
-        if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+        if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
             self.verify(packets == 10, "Not receive expected packet")
         else:
             self.verify(packets == 0, "Receive expected packet")