From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 100121B2FB for ; Mon, 12 Feb 2018 07:48:38 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2018 22:48:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,500,1511856000"; d="scan'208";a="30027535" Received: from unknown (HELO dpdk-fedora20.icx.intel.com) ([10.240.176.135]) by fmsmga001.fm.intel.com with ESMTP; 11 Feb 2018 22:48:36 -0800 From: "xu,gang" To: dts@dpdk.org Cc: "xu,gang" Date: Mon, 12 Feb 2018 14:49:50 +0800 Message-Id: <1518418190-54182-1-git-send-email-gangx.xu@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V4] fix shutdown_api RX TX different 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: , X-List-Received-Date: Mon, 12 Feb 2018 06:48:39 -0000 add vlan_strip option, when vlan_strip is off, RX-bytes and TX-bytes equal. rx_vlan add|rm need open vlan filter Signed-off-by: xu,gang --- tests/TestSuite_shutdown_api.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py index f81c3d5..af0b77d 100644 --- a/tests/TestSuite_shutdown_api.py +++ b/tests/TestSuite_shutdown_api.py @@ -83,14 +83,14 @@ class TestShutdownApi(TestCase): stats = output.get_pmd_stats(portid) return stats - def check_forwarding(self, ports=None, pktSize=68, received=True, vlan=False, promisc=False): + def check_forwarding(self, ports=None, pktSize=68, received=True, vlan=False, promisc=False, vlan_strip=False): if ports is None: ports = self.ports if len(ports) == 1: - self.send_packet(ports[0], ports[0], pktSize, received, vlan, promisc) + self.send_packet(ports[0], ports[0], pktSize, received, vlan, promisc, vlan_strip) return - def send_packet(self, txPort, rxPort, pktSize=68, received=True, vlan=False, promisc=False): + def send_packet(self, txPort, rxPort, pktSize=68, received=True, vlan=False, promisc=False, vlan_strip=False): """ Send packages according to parameters. """ @@ -138,7 +138,7 @@ class TestShutdownApi(TestCase): # RRC will always strip rx/tx crc rx_bytes_exp -= 4 tx_bytes_exp -= 4 - if vlan is True: + if vlan_strip is True: # RRC will always strip rx/tx vlan rx_bytes_exp -= 4 tx_bytes_exp -= 4 @@ -146,8 +146,8 @@ class TestShutdownApi(TestCase): # some NIC will always include tx crc rx_bytes_exp -= 4 tx_bytes_exp -= 4 - if vlan is True: - # vlan strip default is on + if vlan_strip is True: + # vlan strip default is off tx_bytes_exp -= 4 # fortville nic enable send lldp packet function when port setup @@ -337,6 +337,7 @@ class TestShutdownApi(TestCase): out = self.dut.send_expect("vlan set strip off all", "testpmd> ") if "fail" not in out: for port in self.ports: + self.dut.send_expect("vlan set filter on %d" % port, "testpmd> ") self.dut.send_expect("rx_vlan add 1 %d" % port, "testpmd> ") self.dut.send_expect("set fwd mac", "testpmd>") self.dut.send_expect("port start all", "testpmd> ", 100) @@ -347,10 +348,15 @@ class TestShutdownApi(TestCase): vlan_jumbo_size = jumbo_size + 4 else: vlan_jumbo_size = jumbo_size - - self.check_forwarding(pktSize=vlan_jumbo_size - 1, vlan=True) - self.check_forwarding(pktSize=vlan_jumbo_size, vlan=True) - self.check_forwarding(pktSize=vlan_jumbo_size + 1, received=False, vlan=True) + out = self.dut.send_expect("show port cap %d" % port, "testpmd> ") + state = re.findall("VLAN stripped:\s*([a-z]*)", out) + if state[0] == 'on': + vlan_strip = True + else: + vlan_strip = False + self.check_forwarding(pktSize=vlan_jumbo_size - 1, vlan=True, vlan_strip=vlan_strip) + self.check_forwarding(pktSize=vlan_jumbo_size, vlan=True, vlan_strip=vlan_strip) + self.check_forwarding(pktSize=vlan_jumbo_size + 1, received=False, vlan=True, vlan_strip=vlan_strip) self.dut.send_expect("stop", "testpmd> ") -- 1.9.3