[V1,2/2] tests/TestSuite_kernelpf_iavf:adapt to I40E driver update
diff mbox series

Message ID 20201029074008.29911-2-weix.xie@intel.com
State Changes Requested
Headers show
Series
  • [V1,1/2] tests/TestSuite_vf_vlan:adapt to I40E driver update
Related show

Commit Message

Xie, WeiX Oct. 29, 2020, 7:40 a.m. UTC
*Update i40e driver to 2.13.10, while vlan tag is removed, the pkts with vlan tag shall not be received.

Signed-off-by: Xie wei <weix.xie@intel.com>
---
 tests/TestSuite_kernelpf_iavf.py | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

Comments

Xie, WeiX Oct. 29, 2020, 8:02 a.m. UTC | #1
Tested-by:  Xie,WeiX < weix.xie@intel.com>

Regards,
Xie Wei


> -----Original Message-----
> From: Xie wei [mailto:weix.xie@intel.com]
> Sent: Thursday, October 29, 2020 3:40 PM
> To: dts@dpdk.org
> Cc: Xie, WeiX <weix.xie@intel.com>
> Subject: [dts][PATCH V1 2/2] tests/TestSuite_kernelpf_iavf:adapt to I40E
> driver update
> 
> *Update i40e driver to 2.13.10, while vlan tag is removed, the pkts with vlan
> tag shall not be received.
Ma, LihongX Oct. 30, 2020, 1:56 a.m. UTC | #2
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Xie wei
> Sent: Thursday, October 29, 2020 3:40 PM
> To: dts@dpdk.org
> Cc: Xie, WeiX <weix.xie@intel.com>
> Subject: [dts] [PATCH V1 2/2] tests/TestSuite_kernelpf_iavf:adapt to I40E
> driver update
> 
> *Update i40e driver to 2.13.10, while vlan tag is removed, the pkts with
> vlan tag shall not be received.
> 
> Signed-off-by: Xie wei <weix.xie@intel.com>
> ---
>  tests/TestSuite_kernelpf_iavf.py | 28 ++++++++++++++++++++++------
>  1 file changed, 22 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/TestSuite_kernelpf_iavf.py
> b/tests/TestSuite_kernelpf_iavf.py
> index da925109..adeac42f 100644
> --- a/tests/TestSuite_kernelpf_iavf.py
> +++ b/tests/TestSuite_kernelpf_iavf.py
> @@ -428,8 +428,12 @@ 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)
> -        self.verify(len(receive_pkt) == 2, "fail to tester received vlan
> packet!!!")
> -        self.verify(self.vf_mac in out, "Failed to received vlan
> packet!!!")
> +        if self.kdriver == 'ice':
> +            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:
> +            self.verify(len(receive_pkt) == 1, "fail to tester received
> vlan packet!!!")
> +            self.verify(self.vf_mac not in out, "Received vlan
> + packet!!!")

Some of the cases not set the cmd 'vlan filter on' , the modify do not match your description ,please check it.


Regards,
Ma,lihong

Patch
diff mbox series

diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py
index da925109..adeac42f 100644
--- a/tests/TestSuite_kernelpf_iavf.py
+++ b/tests/TestSuite_kernelpf_iavf.py
@@ -428,8 +428,12 @@  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)
-        self.verify(len(receive_pkt) == 2, "fail to tester received vlan packet!!!")
-        self.verify(self.vf_mac in out, "Failed to received vlan packet!!!")
+        if self.kdriver == 'ice':
+            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:
+            self.verify(len(receive_pkt) == 1, "fail to tester received vlan packet!!!")
+            self.verify(self.vf_mac not in out, "Received vlan packet!!!")
 
     def send_and_getout(self, vlan=0, pkt_type="UDP"):
 
@@ -493,7 +497,10 @@  class TestKernelpfIavf(TestCase):
 
         # send vlan 1 packet, vf can receive packet
         out = self.send_and_getout(vlan=1, pkt_type="VLAN_UDP")
-        self.verify(self.vf_mac in out, "received vlan 1 packet!!!")
+        if self.kdriver == 'ice':
+            self.verify(self.vf_mac in out, "Not received vlan 1 packet!!!")
+        else:
+            self.verify(self.vf_mac not in out, "Received vlan 1 packet!!!")
 
     def test_vf_vlan_insertion(self):
         self.vm_testpmd.start_testpmd("all")
@@ -538,7 +545,10 @@  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)
-        self.verify(len(receive_pkt) == 2, 'Failed to not received vlan packet!!!')
+        if self.kdriver == 'ice':
+            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!!!')
 
     def test_vf_vlan_filter(self):
         random_vlan = random.randint(2, MAX_VLAN)
@@ -572,7 +582,10 @@  class TestKernelpfIavf(TestCase):
         time.sleep(1)
         tcpdump_out = self.get_tcpdump_package()
         receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out)
-        self.verify(len(receive_pkt) == 2, 'Failed to received vlan packet!!!')
+        if self.kdriver == 'ice':
+            self.verify(len(receive_pkt) == 2, 'Failed to received vlan packet!!!')
+        else:
+            self.verify(len(receive_pkt) == 1, 'Failed to received vlan packet!!!')
 
     def test_vf_without_jumboframe(self):
         self.tester.send_expect('ifconfig %s mtu %s' % (self.tester_intf, ETHER_JUMBO_FRAME_MTU), '#')
@@ -923,7 +936,10 @@  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))
-        self.verify(packets == 10, "Not receive expected packet")
+        if self.kdriver == 'ice':
+            self.verify(packets == 10, "Not receive expected packet")
+        else:
+            self.verify(packets == 0, "Receive expected packet")
 
         # send 10 untagged packets, and check 10 untagged packets received
         self.scapy_send_packet(self.vf_mac, self.tester_intf, count=10)