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

Message ID 20210325155751.24219-3-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_vlan_rx: while vlan set filter on, the pkts with random vlan id 1-4095 shall not be received.
add_pvid_vf: while ip link set pf_intf vf 0 vlan 0, the pkts with random vlan id 1-4095 shall not be received.

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

Comments

Zhao, HaiyangX March 25, 2021, 7:54 a.m. UTC | #1
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of xiewei
> Sent: Thursday, March 25, 2021 23:58
> To: dts@dpdk.org
> Cc: Xie, WeiX <weix.xie@intel.com>
> Subject: [dts] [PATCH V1 2/2] tests/vf_vlan: adapt to CVL nic
> 
> adapt to ice driver update for vlan issue on AVF/DCF.
> vf_vlan_rx: while vlan set filter on, the pkts with random vlan id 1-4095 shall
> not be received.
> add_pvid_vf: while ip link set pf_intf vf 0 vlan 0, the pkts with random vlan id
> 1-4095 shall not be received.
> 
> Signed-off-by: xiewei <weix.xie@intel.com>
> ---
>  tests/TestSuite_vf_vlan.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/TestSuite_vf_vlan.py b/tests/TestSuite_vf_vlan.py index
> 28650143..0cc2ba89 100644
> --- a/tests/TestSuite_vf_vlan.py
> +++ b/tests/TestSuite_vf_vlan.py
> @@ -276,7 +276,7 @@ class TestVfVlan(TestCase):
>          self.vm0_testpmd.execute_cmd("start")
> 
>          out = self.send_and_getout(vlan=random_vlan, 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":

Hi, wei,
Now you can just use self.nic_obj.driver_version to do the kernel driver version judgement,
And the code of getting kernel driver version in suite could be removed.

>              self.verify("received" in out, "Failed to received vlan packet!!!")
>          else:
>              self.verify(
> @@ -398,7 +398,7 @@ class TestVfVlan(TestCase):
> 
>          # send packet with vlan
>          out = self.send_and_getout(vlan=random_vlan, 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(
>                  "received 1 packets" in out, "Received mismatched vlan packet while
> vlan filter on")
>          else:
> --
> 2.17.1
  

Patch

diff --git a/tests/TestSuite_vf_vlan.py b/tests/TestSuite_vf_vlan.py
index 28650143..0cc2ba89 100644
--- a/tests/TestSuite_vf_vlan.py
+++ b/tests/TestSuite_vf_vlan.py
@@ -276,7 +276,7 @@  class TestVfVlan(TestCase):
         self.vm0_testpmd.execute_cmd("start")
 
         out = self.send_and_getout(vlan=random_vlan, 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("received" in out, "Failed to received vlan packet!!!")
         else:
             self.verify(
@@ -398,7 +398,7 @@  class TestVfVlan(TestCase):
 
         # send packet with vlan
         out = self.send_and_getout(vlan=random_vlan, 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(
                 "received 1 packets" in out, "Received mismatched vlan packet while vlan filter on")
         else: