[dts] [PATCH] framework: quick fix for dpdk tool name change

[dts] [PATCH] framework: quick fix for dpdk tool name change

[Marvin Liu]

Signed-off-by: Marvin Liu <yong.liu@intel.com>

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