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 0D240A0471 for ; Wed, 14 Aug 2019 10:48:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D04271BE0C; Wed, 14 Aug 2019 10:48:54 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id B38781BDAE for ; Wed, 14 Aug 2019 10:48:52 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Aug 2019 01:48:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,384,1559545200"; d="scan'208";a="188071913" Received: from unknown (HELO dpdk-wenjielx-dtspatch135.sh.intel.com) ([10.240.176.135]) by orsmga002.jf.intel.com with ESMTP; 14 Aug 2019 01:48:50 -0700 From: Peng Yuan To: dts@dpdk.org Cc: Peng Yuan Date: Wed, 14 Aug 2019 16:53:26 +0800 Message-Id: <1565772806-91639-1-git-send-email-yuan.peng@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH v2]tests: remove a case from TestSuite_vlan.py 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" Remove a case from TestSuite_vlan.py according to the test plan. Signed-off-by: Peng Yuan diff --git a/tests/TestSuite_vlan.py b/tests/TestSuite_vlan.py index 86e7eb5..9c58b0c 100644 --- a/tests/TestSuite_vlan.py +++ b/tests/TestSuite_vlan.py @@ -73,14 +73,10 @@ class TestVlan(TestCase): self.pmdout.start_testpmd("Default", "--portmask=%s --port-topology=loop" % portMask) self.dut.send_expect("set verbose 1", "testpmd> ") - out = self.dut.send_expect("set fwd mac", "testpmd> ") - - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortville_25g", "hi1822", "fastlinq_ql41000", "fastlinq_ql45000"]: - self.dut.send_expect("vlan set filter on %s" % dutRxPortId, "testpmd> ") - self.dut.send_expect("set promisc all off", "testpmd> ") - + self.dut.send_expect("set fwd mac", "testpmd> ") + self.dut.send_expect("set promisc all off", "testpmd> ") + self.dut.send_expect("vlan set filter on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("vlan set strip off %s" % dutRxPortId, "testpmd> ") - self.verify('Set mac packet forwarding mode' in out, "set fwd rxonly error") self.vlan = 51 if self.kdriver == "fm10k": @@ -128,9 +124,9 @@ class TestVlan(TestCase): """ pass - def test_vlan_enable_receipt(self): + def test_vlan_enable_receipt_strip_off(self): """ - Enable receipt of VLAN packets + Enable receipt of VLAN packets and strip off """ if self.kdriver == "fm10k": @@ -140,6 +136,7 @@ class TestVlan(TestCase): self.dut.send_expect("vlan set strip off %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("start", "testpmd> ", 120) out = self.dut.send_expect("show port info %s" % dutRxPortId, "testpmd> ", 20) + self.verify("strip off" in out, "Wrong strip:" + out) self.vlan_send_packet(self.vlan) out = self.get_tcpdump_package() @@ -157,8 +154,6 @@ class TestVlan(TestCase): """ Disable receipt of VLAN packets """ - self.dut.send_expect("vlan set filter on %s" % dutRxPortId, "testpmd> ") - self.dut.send_expect("rx_vlan rm %d %s" % (self.vlan, dutRxPortId), "testpmd> ") self.dut.send_expect("start", "testpmd> ", 120) self.vlan_send_packet(self.vlan) @@ -166,11 +161,12 @@ class TestVlan(TestCase): out = self.get_tcpdump_package() self.verify(len(out) == 0, "Received unexpected packet, filter not work!!!") self.verify(self.vlan not in out, "Wrong vlan:" + str(out)) + self.dut.send_expect("stop", "testpmd> ") - out = self.dut.send_expect("stop", "testpmd> ") - - def test_vlan_strip_config_on(self): - + def test_vlan_enable_receipt_strip_on(self): + """ + Enable receipt of VLAN packets and strip on + """ self.dut.send_expect("vlan set strip on %s" % dutRxPortId, "testpmd> ", 20) self.dut.send_expect("rx_vlan add %d %s" % (self.vlan, dutRxPortId), "testpmd> ", 20) out = self.dut.send_expect("show port info %s" % dutRxPortId, "testpmd> ", 20) @@ -181,23 +177,7 @@ class TestVlan(TestCase): out = self.get_tcpdump_package() self.verify(len(out), "Forwarded vlan packet not received!!!") self.verify(self.vlan not in out, "Wrong vlan:" + str(out)) - out = self.dut.send_expect("stop", "testpmd> ", 120) - - def test_vlan_strip_config_off(self): - - if self.kdriver == "fm10k": - print utils.RED("fm10k not support this case\n") - return - self.dut.send_expect("vlan set strip off %s" % dutRxPortId, "testpmd> ", 20) - self.dut.send_expect("rx_vlan add %d %s" % (self.vlan, dutRxPortId), "testpmd> ", 20) - out = self.dut.send_expect("show port info %s" % dutRxPortId, "testpmd> ", 20) - self.verify("strip off" in out, "Wrong strip:" + out) - self.dut.send_expect("set nbport 2", "testpmd> ") - self.dut.send_expect("start", "testpmd> ", 120) - self.vlan_send_packet(self.vlan) - out = self.get_tcpdump_package() - self.verify(self.vlan in out, "Vlan not found:" + str(out)) - out = self.dut.send_expect("stop", "testpmd> ", 120) + self.dut.send_expect("stop", "testpmd> ", 120) def test_vlan_enable_vlan_insertion(self): """ @@ -208,10 +188,6 @@ class TestVlan(TestCase): netobj.add_vlan(vlan_id = self.vlan) netobj.add_txvlan(vlan_id = self.vlan) - port = self.tester.get_local_port(dutTxPortId) - intf = self.tester.get_interface(port) - - self.dut.send_expect("set nbport 2", "testpmd> ") self.dut.send_expect("stop", "testpmd> ") self.dut.send_expect("port stop all", "testpmd> ") self.dut.send_expect("tx_vlan set %s %d" % (dutTxPortId, self.vlan), "testpmd> ") -- 2.7.4