add new topology parameter: arch

[csit.git] / resources / libraries / python / DPDK / L2fwdTest.py

diff --git a/resources/libraries/python/DPDK/L2fwdTest.py b/resources/libraries/python/DPDK/L2fwdTest.py
index fa2f879..b662eeb 100644 (file)
--- a/resources/libraries/python/DPDK/L2fwdTest.py
+++ b/resources/libraries/python/DPDK/L2fwdTest.py
@@ -11,44 +11,47 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-"""
-This module exists to provide the l2fwd test for DPDK on topology nodes.
+"""This module implements functionality which sets L2 forwarding for DPDK on
+DUT nodes.
 """
 
 from resources.libraries.python.ssh import SSH
 from resources.libraries.python.constants import Constants as con
+from resources.libraries.python.topology import Topology
+
 
 class L2fwdTest(object):
-    """Test the DPDK l2fwd performance."""
+    """Setup the DPDK for l2fwd performance test."""
 
     @staticmethod
-    def start_the_l2fwd_test(dut_node, cpu_coremask, nb_cores, queue_nums,
+    def start_the_l2fwd_test(dut_node, cpu_cores, nb_cores, queue_nums,
                              jumbo_frames):
         """
         Execute the l2fwd on the dut_node.
 
         :param dut_node: Will execute the l2fwd on this node.
-        :param cpu_coremask: The DPDK run core mask.
+        :param cpu_cores: The DPDK run cores.
         :param nb_cores: The cores number for the forwarding.
         :param queue_nums: The queues number for the NIC.
-        :param jumbo_frames: Is jumbo frames or not.
+        :param jumbo_frames: Are jumbo frames used or not.
         :type dut_node: dict
-        :type cpu_coremask: str
+        :type cpu_cores: str
         :type nb_cores: str
         :type queue_nums: str
         :type jumbo_frames: str
         :returns: none
+        :raises RuntimeError: If the script "run_l2fwd.sh" fails.
         """
+
         ssh = SSH()
         ssh.connect(dut_node)
 
-        cmd = 'cd {0}/dpdk-tests/dpdk_scripts/ && sudo ./run_l2fwd.sh ' \
-              '{1} {2} {3} {4}'.format(con.REMOTE_FW_DIR, cpu_coremask, \
-              nb_cores, queue_nums, jumbo_frames)
+        cmd = 'cd {0}/tests/dpdk/dpdk_scripts/ && sudo ./run_l2fwd.sh {1} ' \
+              '{2} {3} {4} {5}'.format(con.REMOTE_FW_DIR, cpu_cores, nb_cores,
+                                       queue_nums, jumbo_frames,
+                                       Topology.get_node_arch(dut_node))
 
         (ret_code, _, _) = ssh.exec_command(cmd, timeout=600)
         if ret_code != 0:
-            raise Exception('Failed to execute l2fwd test at node {0}'
-                            .format(dut_node['host']))
-
+            raise RuntimeError('Failed to execute l2fwd test at node {0}'.
+                               format(dut_node['host']))