[dts] [PATCH V2] tests/TestSuite_dual_vlan: Enable CVL25G&100G nic support DUAL VLAN CASE

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces at dpdk.org] On Behalf Of zhiwei.he
> Sent: Friday, August 30, 2019 10:17 PM
> To: dts at dpdk.org
> Cc: He, Zhiwei <zhiwei.he at intel.com>
> Subject: [dts] [PATCH V2] tests/TestSuite_dual_vlan: Enable CVL25G&100G
> nic support DUAL VLAN CASE
> 
> From: "zhiwei.he" <zhiwei.he at intel.com>
> 
> Signed-off-by: zhiwei.he <zhiwei.he at intel.com>
> ---
>  tests/TestSuite_dual_vlan.py | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py
> index 1160ed3..f81fda1 100644
> --- a/tests/TestSuite_dual_vlan.py
> +++ b/tests/TestSuite_dual_vlan.py
> @@ -149,7 +149,7 @@ class TestDualVlan(TestCase):
>          """
> 
>          for mode in modeName:
> -            if self.nic in ["fortville_eagle", "fortville_spirit",
> "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville"]:
> +            if self.nic in ["columbiaville_25g", "columbiaville_100g",
> "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g",
> "fortpark_TLV", "carlsville"]:
>                  # fortville NIC vlan filter can't close, if want close need remove
> rx_vlan
>                  if mode == "filter":
>                      if modeName[mode] == "off":
> @@ -166,7 +166,7 @@ class TestDualVlan(TestCase):
> 
>          out = self.dut.send_expect("show port info %s" % dutRxPortId,
> "testpmd> ")
>          for mode in modeName:
> -            if self.nic in ["fortville_eagle", "fortville_spirit",
> "fortville_spirit_single", "fortville_25g","fortpark_TLV", "carlsville"]:
> +            if self.nic in ["columbiaville_25g", "columbiaville_100g",
> "fortville_eagle", "fortville_spirit", "fortville_spirit_single",
> "fortville_25g","fortpark_TLV", "carlsville"]:
>                  # fortville NIC vlan filter can't close, if want close need remove
> rx_vlan
>                  if mode == "filter":
>                      if modeName[mode] == "off":
> @@ -283,7 +283,7 @@ class TestDualVlan(TestCase):
>          print out
>          self.verify(out is not None and "vlan %s" % outvlan not in out, "Vlan
> filter enable error: " + out)
> 
> -        if self.nic not in ["fortville_eagle", "fortville_spirit",
> "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville"]:
> +        if self.nic not in ["columbiaville_25g", "columbiaville_100g",
> "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g",
> "fortpark_TLV", "carlsville"]:
>              self.mode_config(filter="off")
>              self.vlan_send_packet(outvlan)
>              out = self.get_tcpdump_package() @@ -322,7 +322,7 @@ class
> TestDualVlan(TestCase):
>          self.mode_config(filter="off")
>          self.mode_config(qinq="off")
>          self.mode_config(strip="on")
> -        if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single",
> "fortville_25g", "fortpark_TLV", "carlsville"]:
> +        if self.nic in [ "columbiaville_25g", "columbiaville_100g",
> "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g",
> "fortpark_TLV", "carlsville"]:
>              self.dut.send_expect('rx_vlan add %s %s' % (outvlan, dutRxPortId),
> "testpmd> ")
>          self.vlan_send_packet(outvlan)
>          out = self.get_tcpdump_package() @@ -332,14 +332,14 @@ class
> TestDualVlan(TestCase):
>          self.vlan_send_packet(outvlan)
>          out = self.get_tcpdump_package()
>          self.verify("vlan %s" % outvlan in out, "Vlan strip disable error: " + out)
> -        if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single",
> "fortville_25g", "fortpark_TLV", "carlsville"]:
> +        if self.nic in ["columbiaville_25g", "columbiaville_100g",
> "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g",
> "fortpark_TLV", "carlsville"]:
>              self.dut.send_expect('rx_vlan rm %s %s' % (outvlan, dutRxPortId),
> "testpmd> ")
> 
>      def test_vlan_stripq_config(self):
>          """
>          Enable/Disable VLAN packets strip on queue
>          """
> -        self.verify(self.nic not in ["fortville_eagle", "fortville_spirit",
> "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "cavium_a063",
> "cavium_a064", "carlsville"], "%s NIC not support queue vlan strip " % self.nic)
> +        self.verify(self.nic not in ["columbiaville_25g",
> + "columbiaville_100g", "fortville_eagle", "fortville_spirit",
> + "fortville_spirit_single", "fortville_25g", "fortpark_TLV",
> + "cavium_a063", "cavium_a064", "carlsville"], "%s NIC not support queue
> + vlan strip " % self.nic)
> 
>          self.mode_config(filter="off")
>          self.mode_config(qinq="off")
> @@ -361,7 +361,7 @@ class TestDualVlan(TestCase):
>          self.vlan_send_packet(outvlan)
>          out = self.get_tcpdump_package()
>          self.verify("vlan %s" % outvlan in out, "vlan strip queue disable error: "
> + out)
> -        if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single",
> "fortville_25g", "fortpark_TLV", "carlsville"]:
> +        if self.nic in ["columbiaville_25g", "columbiaville_100g",
> "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g",
> "fortpark_TLV", "carlsville"]:
>              self.dut.send_expect('rx_vlan rm %s %s' % (outvlan, dutRxPortId),
> "testpmd> ")
> 
>      def test_vlan_insert_config(self):
> @@ -401,7 +401,7 @@ class TestDualVlan(TestCase):
>          """
>          Configure receive port out vlan TPID
>          """
> -        self.verify(self.nic not in ["fortville_eagle", "fortville_spirit",
> "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "hartwell",
> "carlsville"], "%s NIC not support tcpid " % self.nic)
> +        self.verify(self.nic not in ["columbiaville_25g",
> + "columbiaville_100g", "fortville_eagle", "fortville_spirit",
> + "fortville_spirit_single", "fortville_25g", "fortpark_TLV",
> + "hartwell", "carlsville"], "%s NIC not support tcpid " % self.nic)
> 
>          self.mode_config(filter="on", strip="on", qinq="on")
>          # nic only support inner model, except fortville nic
> --
> 1.8.3.1