From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id D2B857D14 for ; Fri, 25 Aug 2017 05:14:58 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Aug 2017 20:14:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,423,1498546800"; d="scan'208";a="1187960014" Received: from unknown (HELO dpdk-fedora20.icx.intel.com) ([10.240.176.135]) by fmsmga001.fm.intel.com with ESMTP; 24 Aug 2017 20:14:56 -0700 From: "xu,huilong" To: dts@dpdk.org Cc: "xu,huilong" Date: Fri, 25 Aug 2017 11:16:12 +0800 Message-Id: <1503630972-89428-1-git-send-email-huilongx.xu@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V2] fix hotplug failed case 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: Fri, 25 Aug 2017 03:14:59 -0000 update list: 1. update dpdk-devbind tools path 2. update start/stop/close port process, add sleep time for update fortville link status 3. fix verify received packet type error 4. fix send packet with error port Signed-off-by: xu,huilong --- tests/TestSuite_hotplug.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/TestSuite_hotplug.py b/tests/TestSuite_hotplug.py index 9fa922a..7704253 100644 --- a/tests/TestSuite_hotplug.py +++ b/tests/TestSuite_hotplug.py @@ -69,15 +69,20 @@ class TestPortHotPlug(TestCase): """ attach port """ - self.dut.send_expect("port attach %s" % self.dut.ports_info[port]['pci'],"is attached",60) - self.dut.send_expect("port start %s" % port,"Link Up",60) + # dpdk hotplug discern NIC by pci bus not include domid + self.dut.send_expect("port attach %s" % self.dut.ports_info[port]['pci'][len("0000:"):],"is attached",60) + self.dut.send_expect("port start %s" % port,"Configuring Port",120) + # sleep 10 seconds for fortville update link stats + time.sleep(10) self.dut.send_expect("show port info %s" % port,"testpmd>",60) def detach(self, port): """ detach port """ - self.dut.send_expect("port stop %s" % port,"Link Down",60) + self.dut.send_expect("port stop %s" % port,"Stopping ports",60) + # sleep 10 seconds for fortville update link stats + time.sleep(10) self.dut.send_expect("port close %s" % port,"Closing ports...",60) self.dut.send_expect("port detach %s" % port,"is detached",60) @@ -88,7 +93,7 @@ class TestPortHotPlug(TestCase): cmd = "./x86_64-native-linuxapp-gcc/app/testpmd -c %s -n %s -- -i" % (self.coremask,self.dut.get_memory_channels()) self.dut.send_expect(cmd,"testpmd>",60) session_secondary = self.dut.new_session() - session_secondary.send_expect("./tools/dpdk-devbind.py --bind=igb_uio %s" % self.dut.ports_info[self.port]['pci'], "#", 60) + session_secondary.send_expect("./usertools/dpdk-devbind.py --bind=igb_uio %s" % self.dut.ports_info[self.port]['pci'], "#", 60) self.dut.close_session(session_secondary) self.attach(self.port) self.dut.send_expect("start","testpmd>",60) @@ -103,15 +108,15 @@ class TestPortHotPlug(TestCase): out = self.dut.send_expect("show port stats %s" % self.port ,"testpmd>",60) packet = re.search("RX-packets:\s*(\d*)",out) sum_packet = packet.group(1) - self.verify(sum_packet = 1, "Insufficient the received package") + self.verify(int(sum_packet) == 1, "Insufficient the received package") self.dut.send_expect("quit","#",60) def send_packet(self, port): """ Send a packet to port """ - self.dmac = self.dut.get_mac_address(self.dut_ports[0]) - txport = self.tester.get_local_port(self.dut_ports[0]) + self.dmac = self.dut.get_mac_address(port) + txport = self.tester.get_local_port(port) self.txItf = self.tester.get_interface(txport) pkt = Packet(pkt_type='UDP') pkt.config_layer('ether', {'dst': self.dmac,}) @@ -134,7 +139,7 @@ class TestPortHotPlug(TestCase): out = self.dut.send_expect("show port stats %s" % self.port ,"testpmd>",60) packet = re.search("RX-packets:\s*(\d*)",out) sum_packet = packet.group(1) - self.verify(sum_packet = 1, "Insufficient the received package") + self.verify(int(sum_packet) == 1, "Insufficient the received package") self.dut.send_expect("quit","#",60) -- 1.9.3