From: Peter Mikus <pmikus@cisco.com>
Date: Wed, 5 Jul 2017 12:44:53 +0000 (+0200)
Subject: Fix: DPDK paths after code refactor
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=bc26e009026ea9b3bd3c02a313e71b9bb051e6de

Fix: DPDK paths after code refactor

Change-Id: I0cc83c48e0c91cdff13f78c65c521f45e551d7a3
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---

diff --git a/resources/libraries/python/DPDK/DPDKTools.py b/resources/libraries/python/DPDK/DPDKTools.py
index 178562355e..6d9eeddc19 100644
--- a/resources/libraries/python/DPDK/DPDKTools.py
+++ b/resources/libraries/python/DPDK/DPDKTools.py
@@ -46,7 +46,7 @@ class DPDKTools(object):
         ssh = SSH()
         ssh.connect(dut_node)
 
-        cmd = 'cd {0}/dpdk-tests/dpdk_scripts/ && sudo ./init_dpdk.sh {1} {2}' \
+        cmd = 'cd {0}/tests/dpdk/dpdk_scripts/ && sudo ./init_dpdk.sh {1} {2}' \
               .format(con.REMOTE_FW_DIR, pci_address1, pci_address2)
 
         (ret_code, _, _) = ssh.exec_command(cmd, timeout=600)
@@ -77,7 +77,7 @@ class DPDKTools(object):
         ssh = SSH()
         ssh.connect(dut_node)
 
-        cmd = 'cd {0}/dpdk-tests/dpdk_scripts/ && sudo ./cleanup_dpdk.sh ' \
+        cmd = 'cd {0}/tests/dpdk/dpdk_scripts/ && sudo ./cleanup_dpdk.sh ' \
               '{1} {2} {3} {4}'.format(con.REMOTE_FW_DIR, if1_driver,
                                        pci_address1, if2_driver, pci_address2)
 
diff --git a/resources/libraries/python/DPDK/L2fwdTest.py b/resources/libraries/python/DPDK/L2fwdTest.py
index 80a91e2ff6..f5f714a3e9 100644
--- a/resources/libraries/python/DPDK/L2fwdTest.py
+++ b/resources/libraries/python/DPDK/L2fwdTest.py
@@ -45,7 +45,7 @@ class L2fwdTest(object):
         ssh = SSH()
         ssh.connect(dut_node)
 
-        cmd = 'cd {0}/dpdk-tests/dpdk_scripts/ && sudo ./run_l2fwd.sh {1} ' \
+        cmd = 'cd {0}/tests/dpdk/dpdk_scripts/ && sudo ./run_l2fwd.sh {1} ' \
               '{2} {3} {4}'.format(con.REMOTE_FW_DIR, cpu_cores, nb_cores,
                                    queue_nums, jumbo_frames)
 
diff --git a/resources/libraries/python/DPDK/L3fwdTest.py b/resources/libraries/python/DPDK/L3fwdTest.py
index 6219a08e0c..f52a871a7d 100644
--- a/resources/libraries/python/DPDK/L3fwdTest.py
+++ b/resources/libraries/python/DPDK/L3fwdTest.py
@@ -91,7 +91,7 @@ class L3fwdTest(object):
         ssh = SSH()
         ssh.connect(dut_node)
 
-        cmd = 'cd {0}/dpdk-tests/dpdk_scripts/ && ./run_l3fwd.sh ' \
+        cmd = 'cd {0}/tests/dpdk/dpdk_scripts/ && ./run_l3fwd.sh ' \
               '"{1}" "{2}" {3} {4} {5}'.format(con.REMOTE_FW_DIR, lcores_list, \
               port_config_param, adj_mac0, adj_mac1, jumbo_frames)
 
diff --git a/resources/libraries/python/DPDK/SetupDPDKTest.py b/resources/libraries/python/DPDK/SetupDPDKTest.py
index 06bb9ee9eb..0f70803ed7 100644
--- a/resources/libraries/python/DPDK/SetupDPDKTest.py
+++ b/resources/libraries/python/DPDK/SetupDPDKTest.py
@@ -131,7 +131,7 @@ def install_dpdk_test(node):
     ssh.connect(node)
 
     (ret_code, _, stderr) = ssh.exec_command(
-        'cd {0}/dpdk-tests/dpdk_scripts/ && ./install_dpdk.sh'
+        'cd {0}/tests/dpdk/dpdk_scripts/ && ./install_dpdk.sh'
         .format(con.REMOTE_FW_DIR), timeout=600)
 
     if ret_code != 0: