From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 909AB2C01 for ; Fri, 6 Jan 2017 02:28:32 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP; 05 Jan 2017 17:28:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,323,1477983600"; d="scan'208";a="1079734206" Received: from unknown (HELO dpdk-fedora20.icx.intel.com) ([10.240.176.135]) by orsmga001.jf.intel.com with ESMTP; 05 Jan 2017 17:28:18 -0800 From: "xu,huilong" To: dts@dpdk.org Cc: "xu,huilong" Date: Fri, 6 Jan 2017 09:29:25 +0800 Message-Id: <1483666165-29698-1-git-send-email-huilongx.xu@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V1] chang folder name tools to usertools 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, 06 Jan 2017 01:28:33 -0000 Signed-off-by: xu,huilong --- framework/dut.py | 4 ++-- framework/project_dpdk.py | 4 ++-- tests/TestSuite_hotplug.py | 6 +++--- tests/TestSuite_kni.py | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/framework/dut.py b/framework/dut.py index c8a3fe4..1d4a383 100644 --- a/framework/dut.py +++ b/framework/dut.py @@ -376,7 +376,7 @@ class Dut(Crb): self.logger.info("Not nic need bind driver: %s" % driver) return - self.send_expect('tools/dpdk-devbind.py %s' % binding_list, '# ') + self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, '# ') def unbind_interfaces_linux(self, nics_to_bind=None): """ @@ -400,7 +400,7 @@ class Dut(Crb): self.logger.info("Not nic need unbind driver") return - self.send_expect('tools/dpdk-devbind.py %s' % binding_list, '# ', 30) + self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, '# ', 30) def get_ports(self, nic_type='any', perf=None, socket=None): """ diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py index 5f10c8b..274e9a6 100644 --- a/framework/project_dpdk.py +++ b/framework/project_dpdk.py @@ -296,7 +296,7 @@ class DPDKdut(Dut): binding_list += '%s ' % (port_info['pci']) current_nic += 1 - self.send_expect('tools/dpdk-devbind.py %s' % binding_list, '# ') + self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, '# ') def unbind_interfaces_linux(self, nics_to_bind=None): """ @@ -311,7 +311,7 @@ class DPDKdut(Dut): binding_list += '%s ' % (port_info['pci']) current_nic += 1 - self.send_expect('tools/dpdk-devbind.py %s' % binding_list, '# ', 30) + self.send_expect('usertools/dpdk-devbind.py %s' % binding_list, '# ', 30) def build_dpdk_apps(self, folder, extra_options=''): """ diff --git a/tests/TestSuite_hotplug.py b/tests/TestSuite_hotplug.py index 4443ed0..9fa922a 100644 --- a/tests/TestSuite_hotplug.py +++ b/tests/TestSuite_hotplug.py @@ -63,7 +63,7 @@ class TestPortHotPlug(TestCase): """ Run before each test case. """ - self.dut.send_expect("./tools/dpdk-devbind.py -u %s" % self.dut.ports_info[self.port]['pci'],"#",60) + self.dut.send_expect("./usertools/dpdk-devbind.py -u %s" % self.dut.ports_info[self.port]['pci'],"#",60) def attach(self, port): """ @@ -122,7 +122,7 @@ class TestPortHotPlug(TestCase): first attach port after run testpmd """ 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) 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) @@ -142,7 +142,7 @@ class TestPortHotPlug(TestCase): """ Run after each test case. """ - self.dut.send_expect("./tools/dpdk-devbind.py --bind=igb_uio %s" % self.dut.ports_info[self.port]['pci'],"#",60) + self.dut.send_expect("./usertools/dpdk-devbind.py --bind=igb_uio %s" % self.dut.ports_info[self.port]['pci'],"#",60) self.dut.kill_all() time.sleep(2) diff --git a/tests/TestSuite_kni.py b/tests/TestSuite_kni.py index 3836c57..00f1e25 100644 --- a/tests/TestSuite_kni.py +++ b/tests/TestSuite_kni.py @@ -971,7 +971,7 @@ class TestKni(TestCase): port_virtual_interaces = [] for port in white_list: information = self.dut.send_expect( - "./tools/dpdk-devbind.py --status | grep '%s'" % port, "# ") + "./usertools/dpdk-devbind.py --status | grep '%s'" % port, "# ") data = information.split(' ') for field in data: if field.rfind("if=") != -1: @@ -1007,7 +1007,7 @@ class TestKni(TestCase): for port in white_list: self.dut.send_expect( - "./tools/dpdk-devbind.py -b igb_uio %s" % (port), "# ") + "./usertools/dpdk-devbind.py -b igb_uio %s" % (port), "# ") self.result_table_print() def test_perf_routing(self): @@ -1135,7 +1135,7 @@ class TestKni(TestCase): # Enables the interfaces information = self.dut.send_expect( - "./tools/dpdk-devbind.py --status | grep '%s'" % port, "# ") + "./usertools/dpdk-devbind.py --status | grep '%s'" % port, "# ") print information data = information.split(' ') for field in data: @@ -1203,7 +1203,7 @@ class TestKni(TestCase): for port in white_list: self.dut.send_expect( - "./tools/dpdk-devbind.py -b %s %s" % (self.drivername, port), "# ") + "./usertools/dpdk-devbind.py -b %s %s" % (self.drivername, port), "# ") def tear_down(self): """ -- 1.9.3