From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A712FA00BE; Wed, 30 Oct 2019 09:27:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7FC961BE0C; Wed, 30 Oct 2019 09:27:25 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 651631BDFD for ; Wed, 30 Oct 2019 09:27:24 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Oct 2019 01:27:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,246,1569308400"; d="scan'208";a="212028789" Received: from unknown (HELO dpdk-wenjielx-dtspatch135.sh.intel.com) ([10.240.176.135]) by orsmga002.jf.intel.com with ESMTP; 30 Oct 2019 01:27:22 -0700 From: zhu wenhui To: dts@dpdk.org Cc: zhu wenhui Date: Wed, 30 Oct 2019 16:32:33 +0800 Message-Id: <1572424353-88768-1-git-send-email-wenhuix.zhu@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V2] tests/dual_vlan:replace qinq with extend X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Change the command according to the modification of DPDK-2a0b41984c7 Signed-off-by: zhu wenhui --- 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