[dts] [PATCH V1] chang folder name tools to usertools

Liu, Yong yong.liu at intel.com
Fri Jan 6 04:25:21 CET 2017


Thanks, applied.

On 01/06/2017 09:29 AM, xu,huilong wrote:
> Signed-off-by: xu,huilong <huilongx.xu at intel.com>
> ---
>   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):
>           """



More information about the dts mailing list