From: zhu wenhui <wenhuix.zhu@intel.com>
To: dts@dpdk.org
Cc: zhu wenhui <wenhuix.zhu@intel.com>
Subject: [dts] [PATCH V2] tests/dual_vlan:replace qinq with extend
Date: Wed, 30 Oct 2019 16:32:33 +0800 [thread overview]
Message-ID: <1572424353-88768-1-git-send-email-wenhuix.zhu@intel.com> (raw)
Change the command according to the modification of DPDK-2a0b41984c7
Signed-off-by: zhu wenhui <wenhuix.zhu@intel.com>
---
tests/TestSuite_dual_vlan.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py
index 9cb3879..f9cb1c2 100644
--- a/tests/TestSuite_dual_vlan.py
+++ b/tests/TestSuite_dual_vlan.py
@@ -176,8 +176,8 @@ class TestDualVlan(TestCase):
self.dut.send_expect("rx_vlan rm %s %s" % (outvlan, dutRxPortId), "testpmd> ")
continue
- if mode == "qinq":
- self.verify("qinq(extend) %s" % modeName[mode] in out, "%s setting error" % mode)
+ if mode == "extend":
+ self.verify("extend %s" % modeName[mode] in out, "%s setting error" % mode)
continue
elif mode == "stripq":
continue
@@ -208,7 +208,7 @@ class TestDualVlan(TestCase):
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])
+ self.mode_config(strip=temp[0], filter=temp[1], extend=temp[2])
if (caseDef & txCase) != 0:
self.dut.send_expect('stop', "testpmd> ")
@@ -280,7 +280,7 @@ class TestDualVlan(TestCase):
"""
self.mode_config(filter="on")
self.mode_config(strip="off")
- self.mode_config(qinq="off")
+ self.mode_config(extend="off")
self.vlan_send_packet(outvlan)
out = self.get_tcpdump_package()
print out
@@ -305,7 +305,7 @@ class TestDualVlan(TestCase):
self.mode_config(filter="on")
self.mode_config(strip="off")
- self.mode_config(qinq="off")
+ self.mode_config(extend="off")
self.dut.send_expect("rx_vlan add %s %s" % (outvlan, dutRxPortId), "testpmd> ")
self.vlan_send_packet(outvlan)
@@ -323,7 +323,7 @@ class TestDualVlan(TestCase):
"""
self.mode_config(filter="off")
- self.mode_config(qinq="off")
+ self.mode_config(extend="off")
self.mode_config(strip="on")
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> ")
@@ -345,7 +345,7 @@ class TestDualVlan(TestCase):
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")
+ self.mode_config(extend="off")
self.mode_config(strip="off")
self.mode_config(stripq="off")
if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville"]:
@@ -372,7 +372,7 @@ class TestDualVlan(TestCase):
Enable/Disable VLAN packets inserting
"""
self.mode_config(filter="off")
- self.mode_config(qinq="off")
+ self.mode_config(extend="off")
# hartwell need to set CTRL.VME for vlan insert
if(self.nic == "hartwell"):
@@ -406,7 +406,7 @@ class TestDualVlan(TestCase):
"""
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")
+ self.mode_config(filter="on", strip="on", extend="on")
# 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)
--
2.17.2
next reply other threads:[~2019-10-30 8:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 8:32 zhu wenhui [this message]
2019-10-30 8:31 ` Zhu, ShuaiX
2019-11-22 2:51 ` Tu, Lijuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1572424353-88768-1-git-send-email-wenhuix.zhu@intel.com \
--to=wenhuix.zhu@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).