From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 33F3C4AC7 for ; Wed, 27 Jul 2016 05:57:15 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 26 Jul 2016 20:57:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,428,1464678000"; d="scan'208";a="1029842043" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga002.fm.intel.com with ESMTP; 26 Jul 2016 20:57:13 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id u6R3v9rJ014000; Wed, 27 Jul 2016 11:57:09 +0800 Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1]) by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id u6R3v6nr004189; Wed, 27 Jul 2016 11:57:08 +0800 Received: (from yufengmx@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id u6R3v6G8004185; Wed, 27 Jul 2016 11:57:06 +0800 From: Yufen Mo To: dts@dpdk.org Cc: yufengmx Date: Wed, 27 Jul 2016 11:57:02 +0800 Message-Id: <1469591822-4147-2-git-send-email-yufengx.mo@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1469591822-4147-1-git-send-email-yufengx.mo@intel.com> References: <1469591822-4147-1-git-send-email-yufengx.mo@intel.com> Subject: [dts] [PATCH V2]Ethtool: update automation testing script 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: Wed, 27 Jul 2016 03:57:15 -0000 From: yufengmx *. close eeprom test case on FVL for FVL series firmware not supported *. set port to up status when port is on down status *. reset ring parameter after ring parameter is used *. set packet src mac with a non-zero value *. set testing content the same user space ethtool dumped Signed-off-by: yufengmx --- tests/TestSuite_userspace_ethtool.py | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/tests/TestSuite_userspace_ethtool.py b/tests/TestSuite_userspace_ethtool.py index c718a58..e33da39 100644 --- a/tests/TestSuite_userspace_ethtool.py +++ b/tests/TestSuite_userspace_ethtool.py @@ -34,6 +34,7 @@ DPDK Test suite. Test support of userspace ethtool feature """ +import os import dts import time import re @@ -67,6 +68,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): self.pause_time = 65535 self.frame_size = 64 self.pause_rate = 0.50 + self.src_mac = "11:22:33:44:55:66" # update IxiaPacketGenerator function from local self.tester.extend_external_packet_generator(TestUserspaceEthtool, self) @@ -128,8 +130,8 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): return 1518 def resize_linux_eeprom_file(self, dpdk_eeprom_file, linux_eeprom_file): - basePath = self.dut.base_dir - with open( basePath + dpdk_eeprom_file, 'rb') as fpDpdk: + basePath = os.sep + "root" + self.dut.base_dir[1:] + os.sep + with open( basePath + os.sep + dpdk_eeprom_file, 'rb') as fpDpdk: dpdk_bytes = fpDpdk.read() dpdk_length = len(dpdk_bytes) @@ -152,6 +154,13 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): else: return "" + def check_port_up(self, intf): + self.tester.send_expect("ifconfig %s | grep -i up"%intf, "#") + if self.tester.send_expect("echo $?", "#") != "0": + self.tester.send_expect("ifconfig %s up"%intf, "#") + time.sleep(1) + self.verify( self.tester.send_expect("echo $?", "#") == "0", "Tester [%s] boot up failed"%intf) + def test_dump_driver_info(self): """ Test ethtool can dump basic information @@ -200,10 +209,12 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): time.sleep(5) # check port stats function - pkt = Packet(pkt_type='UDP') + pkt = Packet() + pkt.config_layer('ether', {'src': self.src_mac}) for port in self.ports: tester_port = self.tester.get_local_port(port) intf = self.tester.get_interface(tester_port) + self.check_port_up(intf) ori_rx_pkts, ori_tx_pkts = self.strip_portstats(port) pkt.send_pkt(tx_port=intf) time.sleep(1) @@ -220,7 +231,10 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): portsinfo = [] ori_drivers = [] - + + if self.nic.startswith("fortville"): + return + for portid in range(len(self.ports)): self.dut.send_expect("regs %d regs_%d.bin" % (portid, portid), "EthApp>") portinfo = {'portid': portid, 'reg_file': 'regs_%d.bin' % portid} @@ -300,8 +314,8 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): """ Test ethtool app ring parameter getting and setting """ - self.dut.send_expect(self.cmd, "EthApp>", 60) for index in range(len(self.ports)): + self.dut.send_expect(self.cmd, "EthApp>", 60) port = self.ports[index] ori_rx_pkts, ori_tx_pkts = self.strip_portstats(port) _, rx_max, _, tx_max = self.strip_ringparam(index) @@ -310,13 +324,15 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): self.verify(rx_ring == rx_max, "Userspace tool failed to set Rx ring parameter") self.verify(tx_ring == tx_max, "Userspace tool failed to set Tx ring parameter") pkt = Packet() + pkt.config_layer('ether', {'src': self.src_mac}) tester_port = self.tester.get_local_port(port) intf = self.tester.get_interface(tester_port) + self.check_port_up(intf) pkt.send_pkt(tx_port=intf) + time.sleep(1) rx_pkts, tx_pkts = self.strip_portstats(index) self.verify(rx_pkts == ori_rx_pkts + 1, "Failed to forward after ring parameter changed") - - self.dut.send_expect("quit", "# ") + self.dut.send_expect("quit", "# ") def test_ethtool_vlan(self): """ @@ -340,6 +356,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): # send correct vlan packet to port pkt = Packet(pkt_type='VLAN_UDP') + pkt.config_layer('ether', {'src': self.src_mac}) pkt.config_layer('vlan', {'vlan': vlan}) tester_port = self.tester.get_local_port(port) intf = self.tester.get_interface(tester_port) @@ -386,6 +403,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): self.verify(dump_mac == valid_mac, "Userspace tool failed to set mac") # check forwarded mac has been changed pkt = Packet() + pkt.config_layer('ether', {'src': self.src_mac}) tester_port = self.tester.get_local_port(port) intf = self.tester.get_interface(tester_port) # send and sniff packet @@ -419,6 +437,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): self.dut.send_expect("stop %d" % index, "EthApp>") # check packet not forwarded when port is stop pkt = Packet() + pkt.config_layer('ether', {'src': self.src_mac}) tester_port = self.tester.get_local_port(port) intf = self.tester.get_interface(tester_port) pkt.send_pkt(tx_port=intf) @@ -455,10 +474,12 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): ori_rx_pkts, _ = self.strip_portstats(index) pkt_size = mtu + HEADER_SIZE['eth'] pkt = Packet(pkt_len=pkt_size) + pkt.config_layer('ether', {'src': self.src_mac}) pkt.send_pkt(tx_port=intf) rx_pkts, _ = self.strip_portstats(index) self.verify(rx_pkts == ori_rx_pkts, "Packet match mtu not forwarded as expected") pkt = Packet(pkt_len=mtu + 1) + pkt.config_layer('ether', {'src': self.src_mac}) pkt.send_pkt(tx_port=intf) rx_pkts_over, _ = self.strip_portstats(index) self.verify(rx_pkts == rx_pkts_over, "Packet over mtu should not be forwarded") -- 1.9.3