[dts] [PATCH] dual_vlan: Skip qinq on tests in random and synthetic tests for cavium devices

[dts] [PATCH] dual_vlan: Skip qinq on tests in random and synthetic tests for cavium devices

[pvukkisala]

From: Phanendra Vukkisala <pvukkisala@marvell.com>

Configuring QinQ ON is not supported now in cavium devices

Signed-off-by: Phanendra Vukkisala <pvukkisala@marvell.com>
---
 conf/test_case_checklist.json |    4 +---
 tests/TestSuite_dual_vlan.py  |    3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/conf/test_case_checklist.json b/conf/test_case_checklist.json
index 71faa19..504a089 100644
--- a/conf/test_case_checklist.json
+++ b/conf/test_case_checklist.json
@@ -510,9 +510,7 @@
                 "fortpark_TLV",
                 "sagepond",
                 "sageville",
-                "cavium_a063",
-                "cavium_a064",
-		"carlsville"
+                "carlsville"
             ],
             "Target": [
                 "ALL"
diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py
index f81fda1..9cb3879 100644
--- a/tests/TestSuite_dual_vlan.py
+++ b/tests/TestSuite_dual_vlan.py
@@ -205,6 +205,9 @@ class TestDualVlan(TestCase):
         temp.append("on") if (caseDef & stripCase) != 0 else temp.append("off")
         temp.append("on") if (caseDef & filterCase) != 0 else temp.append("off")
         temp.append("on") if (caseDef & qinqCase) != 0 else temp.append("off")
+        if (self.nic in ["cavium_a063", "cavium_a064"]) and temp[2] == "on":
+            ## Skip QinQ for cavium devices as it is not supported.
+            return
         self.mode_config(strip=temp[0], filter=temp[1], qinq=temp[2])
 
         if (caseDef & txCase) != 0:
-- 
1.7.9.5

Re: [dts] [PATCH] dual_vlan: Skip qinq on tests in random and synthetic tests for cavium devices

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of
> pvukkisala@marvell.com
> Sent: Friday, September 6, 2019 1:08 PM
> To: dts@dpdk.org
> Cc: avijay@marvell.com; fmasood@marvell.com; Phanendra Vukkisala
> <pvukkisala@marvell.com>
> Subject: [dts] [PATCH] dual_vlan: Skip qinq on tests in random and synthetic
> tests for cavium devices
> 
> From: Phanendra Vukkisala <pvukkisala@marvell.com>
> 
> Configuring QinQ ON is not supported now in cavium devices
> 
> Signed-off-by: Phanendra Vukkisala <pvukkisala@marvell.com>
> ---
>  conf/test_case_checklist.json |    4 +---
>  tests/TestSuite_dual_vlan.py  |    3 +++
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/conf/test_case_checklist.json b/conf/test_case_checklist.json
> index 71faa19..504a089 100644
> --- a/conf/test_case_checklist.json
> +++ b/conf/test_case_checklist.json
> @@ -510,9 +510,7 @@
>                  "fortpark_TLV",
>                  "sagepond",
>                  "sageville",
> -                "cavium_a063",
> -                "cavium_a064",
> -		"carlsville"
> +                "carlsville"
>              ],
>              "Target": [
>                  "ALL"
> diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py
> index f81fda1..9cb3879 100644
> --- a/tests/TestSuite_dual_vlan.py
> +++ b/tests/TestSuite_dual_vlan.py
> @@ -205,6 +205,9 @@ class TestDualVlan(TestCase):
>          temp.append("on") if (caseDef & stripCase) != 0 else temp.append("off")
>          temp.append("on") if (caseDef & filterCase) != 0 else temp.append("off")
>          temp.append("on") if (caseDef & qinqCase) != 0 else temp.append("off")
> +        if (self.nic in ["cavium_a063", "cavium_a064"]) and temp[2] == "on":
> +            ## Skip QinQ for cavium devices as it is not supported.
> +            return
>          self.mode_config(strip=temp[0], filter=temp[1], qinq=temp[2])
> 
>          if (caseDef & txCase) != 0:
> --
> 1.7.9.5