[dts] [dts 1/2]i[PATCH V2] update ixgbe nic tpid command

[dts] [dts 1/2]i[PATCH V2] update ixgbe nic tpid command

[xu,huilong]

Signed-off-by: xu,huilong <huilongx.xu@intel.com>
---
 tests/TestSuite_dual_vlan.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py
index 84552f5..a4ae23e 100644
--- a/tests/TestSuite_dual_vlan.py
+++ b/tests/TestSuite_dual_vlan.py
@@ -364,14 +364,15 @@ class TestDualVlan(TestCase):
         self.verify(self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "hartwell"], "%s NIC not support tcpid " % self.nic)
 
         self.mode_config(filter="on", strip="on", qinq="on")
-        self.dut.send_expect("vlan set tpid 1234 %s" % dutRxPortId, "testpmd> ")
+        # nic only support inner model, except fortville nic
+        self.dut.send_expect("vlan set inner tpid 1234 %s" % dutRxPortId, "testpmd> ")
         self.vlan_send_packet(outvlan, invlan)
 
         out = self.get_tcpdump_package()
         self.verify("vlan %s" % outvlan in out, "vlan tpid disable error: " + out)
         self.verify("vlan %s" % invlan in out, "vlan tpid disable error: " + out)
 
-        self.dut.send_expect("vlan set tpid 0x8100 %s" % dutRxPortId, "testpmd> ")
+        self.dut.send_expect("vlan set inner tpid 0x8100 %s" % dutRxPortId, "testpmd> ")
         self.vlan_send_packet(outvlan, invlan)
 
         out = self.get_tcpdump_package()
-- 
1.9.3

[dts] [dts 2/2][PATCH V2] update dual vlan tpid test plan

[xu,huilong]

Signed-off-by: xu,huilong <huilongx.xu@intel.com>
---
 test_plans/dual_vlan_test_plan.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test_plans/dual_vlan_test_plan.rst b/test_plans/dual_vlan_test_plan.rst
index fa434cc..dd4e2cc 100644
--- a/test_plans/dual_vlan_test_plan.rst
+++ b/test_plans/dual_vlan_test_plan.rst
@@ -289,8 +289,8 @@ Check whether the mode is setted successfully::
       qinq(extend) on
 
 Set Tag Protocol ID ``0x1234`` on port ``0``::
-
-    testpmd> vlan set tpid 0x1234 0
+nic only support inner model, except fortville::
+    testpmd> vlan set inner tpid 0x1234 0
 
 Enable vlan packet filtering and strip on port ``0`` ::
 
@@ -304,7 +304,7 @@ received on port ``B``.
 
 Set Tag Protocol ID ``0x8100`` on port ``0``::
 
-    testpmd> vlan set tpid 0x8100 0
+    testpmd> vlan set inner tpid 0x8100 0
     
 Configure the traffic generator to send VLAN packet whose outer vlan tag is ``0x1``, 
 inter vlan tag is ``0x2`` and outer Tag Protocol ID is ``0x8100`` and send 1 packet 
-- 
1.9.3

Re: [dts] [dts 1/2]i[PATCH V2] update ixgbe nic tpid command

[Liu, Yong]

Thanks, applied with commit modified.

On 03/18/2016 03:19 PM, xu,huilong wrote:
> Signed-off-by: xu,huilong <huilongx.xu@intel.com>
> ---
>   tests/TestSuite_dual_vlan.py | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py
> index 84552f5..a4ae23e 100644
> --- a/tests/TestSuite_dual_vlan.py
> +++ b/tests/TestSuite_dual_vlan.py
> @@ -364,14 +364,15 @@ class TestDualVlan(TestCase):
>           self.verify(self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "hartwell"], "%s NIC not support tcpid " % self.nic)
>   
>           self.mode_config(filter="on", strip="on", qinq="on")
> -        self.dut.send_expect("vlan set tpid 1234 %s" % dutRxPortId, "testpmd> ")
> +        # nic only support inner model, except fortville nic
> +        self.dut.send_expect("vlan set inner tpid 1234 %s" % dutRxPortId, "testpmd> ")
>           self.vlan_send_packet(outvlan, invlan)
>   
>           out = self.get_tcpdump_package()
>           self.verify("vlan %s" % outvlan in out, "vlan tpid disable error: " + out)
>           self.verify("vlan %s" % invlan in out, "vlan tpid disable error: " + out)
>   
> -        self.dut.send_expect("vlan set tpid 0x8100 %s" % dutRxPortId, "testpmd> ")
> +        self.dut.send_expect("vlan set inner tpid 0x8100 %s" % dutRxPortId, "testpmd> ")
>           self.vlan_send_packet(outvlan, invlan)
>   
>           out = self.get_tcpdump_package()