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 045522C60 for ; Mon, 25 Jul 2016 04:29:32 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 24 Jul 2016 19:29:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,417,1464678000"; d="scan'208";a="739175238" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by FMSMGA003.fm.intel.com with ESMTP; 24 Jul 2016 19:29:31 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id u6P2TTUf013064; Mon, 25 Jul 2016 10:29:29 +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 u6P2TRum022298; Mon, 25 Jul 2016 10:29:29 +0800 Received: (from yliu84x@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id u6P2TRI6022294; Mon, 25 Jul 2016 10:29:27 +0800 From: Marvin Liu To: dts@dpdk.org Cc: Marvin Liu Date: Mon, 25 Jul 2016 10:29:26 +0800 Message-Id: <1469413766-22262-1-git-send-email-yong.liu@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dts] [PATCH] framework: quick fix for dpdk tool name change 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, 25 Jul 2016 02:29:33 -0000 Signed-off-by: Marvin Liu diff --git a/framework/dut.py b/framework/dut.py index 24916a3..2f4e53a 100644 --- a/framework/dut.py +++ b/framework/dut.py @@ -374,7 +374,7 @@ class Dut(Crb): self.logger.info("Not nic need bind driver: %s" % driver) return - self.send_expect('tools/dpdk_nic_bind.py %s' % binding_list, '# ') + self.send_expect('tools/dpdk-devbind.py %s' % binding_list, '# ') def unbind_interfaces_linux(self, nics_to_bind=None): """ @@ -398,7 +398,7 @@ class Dut(Crb): self.logger.info("Not nic need unbind driver") return - self.send_expect('tools/dpdk_nic_bind.py %s' % binding_list, '# ', 30) + self.send_expect('tools/dpdk-devbind.py %s' % binding_list, '# ', 30) def get_ports(self, nic_type='any', perf=None, socket=None): """ diff --git a/framework/etgen.py b/framework/etgen.py index 3102fc2..79dc505 100644 --- a/framework/etgen.py +++ b/framework/etgen.py @@ -64,7 +64,7 @@ class SoftwarePacketGenerator(): for port in ports: bind_cmd += " %s" % self.tester.ports_info[port]['pci'] - self.tester.send_expect("./dpdk_nic_bind.py --bind=igb_uio %s" % bind_cmd, "#") + self.tester.send_expect("./dpdk-devbind.py --bind=igb_uio %s" % bind_cmd, "#") # assgin core for ports map_cmd = "" diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py index 05930ad..4e44793 100644 --- a/framework/project_dpdk.py +++ b/framework/project_dpdk.py @@ -284,7 +284,7 @@ class DPDKdut(Dut): binding_list += '%s ' % (port_info['pci']) current_nic += 1 - self.send_expect('tools/dpdk_nic_bind.py %s' % binding_list, '# ') + self.send_expect('tools/dpdk-devbind.py %s' % binding_list, '# ') def unbind_interfaces_linux(self, nics_to_bind=None): """ @@ -299,7 +299,7 @@ class DPDKdut(Dut): binding_list += '%s ' % (port_info['pci']) current_nic += 1 - self.send_expect('tools/dpdk_nic_bind.py %s' % binding_list, '# ', 30) + self.send_expect('tools/dpdk-devbind.py %s' % binding_list, '# ', 30) def build_dpdk_apps(self, folder, extra_options=''): """ diff --git a/tests/TestSuite_kni.py b/tests/TestSuite_kni.py index 69a20fe..d1cd986 100644 --- a/tests/TestSuite_kni.py +++ b/tests/TestSuite_kni.py @@ -969,7 +969,7 @@ class TestKni(TestCase): port_virtual_interaces = [] for port in white_list: information = self.dut.send_expect( - "./tools/dpdk_nic_bind.py --status | grep '%s'" % port, "# ") + "./tools/dpdk-devbind.py --status | grep '%s'" % port, "# ") data = information.split(' ') for field in data: if field.rfind("if=") != -1: @@ -1005,7 +1005,7 @@ class TestKni(TestCase): for port in white_list: self.dut.send_expect( - "./tools/dpdk_nic_bind.py -b igb_uio %s" % (port), "# ") + "./tools/dpdk-devbind.py -b igb_uio %s" % (port), "# ") dts.results_table_print() def test_perf_routing(self): @@ -1133,7 +1133,7 @@ class TestKni(TestCase): # Enables the interfaces information = self.dut.send_expect( - "./tools/dpdk_nic_bind.py --status | grep '%s'" % port, "# ") + "./tools/dpdk-devbind.py --status | grep '%s'" % port, "# ") print information data = information.split(' ') for field in data: @@ -1201,7 +1201,7 @@ class TestKni(TestCase): for port in white_list: self.dut.send_expect( - "./tools/dpdk_nic_bind.py -b %s %s" % (dts.drivername, port), "# ") + "./tools/dpdk-devbind.py -b %s %s" % (dts.drivername, port), "# ") def tear_down(self): """ diff --git a/tests/TestSuite_link_status_interrupt.py b/tests/TestSuite_link_status_interrupt.py index 2a02fc9..bf73ba4 100644 --- a/tests/TestSuite_link_status_interrupt.py +++ b/tests/TestSuite_link_status_interrupt.py @@ -109,7 +109,7 @@ class TestLinkStatusInterrupt(TestCase): self.dut.send_expect("rmmod igb_uio", "# ") self.dut.send_expect( "insmod %s/kmod/igb_uio.ko %s" % (self.target, intr_mode[n]), "# ") - self.dut.send_expect("tools/dpdk_nic_bind.py --bind=igb_uio 03:00.0 03:00.1", "# ") + self.dut.send_expect("tools/dpdk-devbind.py --bind=igb_uio 03:00.0 03:00.1", "# ") out = self.dut.send_expect( "dmesg -c | grep '\<%s\>'" % (intr_mode_output[n]), "# ") self.verify( diff --git a/tests/TestSuite_vf_port_start_stop.py b/tests/TestSuite_vf_port_start_stop.py index b98d786..7657879 100644 --- a/tests/TestSuite_vf_port_start_stop.py +++ b/tests/TestSuite_vf_port_start_stop.py @@ -73,7 +73,7 @@ class TestVfPortStartStop(TestCase): self.tester_tx_pci = self.tester.ports_info[self.tester_tx_port]['pci'] port = self.tester.ports_info[self.tester_tx_port]['port'] self.tester_port_driver = port.get_nic_driver() - self.tester.send_expect("./dpdk_nic_bind.py --bind=igb_uio %s" % self.tester_tx_pci, "#") + self.tester.send_expect("./dpdk-devbind.py --bind=igb_uio %s" % self.tester_tx_pci, "#") src_mac = self.tester.get_mac(self.tester_tx_port) if src_mac == 'N/A': @@ -233,7 +233,7 @@ class TestVfPortStartStop(TestCase): def tear_down_all(self): self.pktgen_kill() - self.tester.send_expect("./dpdk_nic_bind.py --bind=%s %s" %(self.tester_port_driver, self.tester_tx_pci), "#") + self.tester.send_expect("./dpdk-devbind.py --bind=%s %s" %(self.tester_port_driver, self.tester_tx_pci), "#") if getattr(self, 'vm0', None): self.vm0.stop() -- 1.9.3