From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 32330A046B for ; Wed, 26 Jun 2019 12:10:58 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 172C92B99; Wed, 26 Jun 2019 12:10:58 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 710AA2B99 for ; Wed, 26 Jun 2019 12:10:56 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2019 03:10:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,419,1557212400"; d="scan'208";a="245382099" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.240.176.135]) by orsmga001.jf.intel.com with ESMTP; 26 Jun 2019 03:10:54 -0700 From: Peng Yuan To: dts@dpdk.org Cc: Peng Yuan Date: Wed, 26 Jun 2019 18:15:36 +0800 Message-Id: <1561544136-73369-1-git-send-email-yuan.peng@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH] tests: remove a test 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 test case from TestSuite_vlan.py Signed-off-by: Peng Yuan diff --git a/tests/TestSuite_vlan.py b/tests/TestSuite_vlan.py index 4bf0ae8..421efc6 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"]: - 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": @@ -97,7 +93,7 @@ class TestVlan(TestCase): def vlan_send_packet(self, vid, num=1): """ - Send $num of packet to portid, if vid is -1, it means send pakcage not include vlan id. + Send $num of packets to portid, if vid is -1, it means send a packet which does not include a vlan id. """ # The package stream : testTxPort->dutRxPort->dutTxport->testRxPort port = self.tester.get_local_port(dutRxPortId) @@ -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,18 +136,24 @@ 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() self.verify(self.vlan in out, "Wrong vlan:" + str(out)) + notmatch_vlan = self.vlan + 1 + self.vlan_send_packet(notmatch_vlan) + out = self.get_tcpdump_package() + self.verify(len(out) == 0, "Received unexpected packet, filter not work!!!") + self.verify(notmatch_vlan not in out, "Wrong vlan:" + str(out)) + self.dut.send_expect("stop", "testpmd> ") def test_vlan_disable_receipt(self): """ 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) @@ -161,9 +163,12 @@ class TestVlan(TestCase): self.verify(len(out) == 0, "Received unexpected packet, filter not work!!!") self.verify(self.vlan not in out, "Wrong vlan:" + str(out)) - out = self.dut.send_expect("stop", "testpmd> ") + 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) @@ -175,23 +180,8 @@ 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("stop", "testpmd> ", 120) 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) def test_vlan_enable_vlan_insertion(self): """ @@ -202,10 +192,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.14.3