X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FDPDK%2FL2fwdTest.py;h=70ca93c5122d8ff66f4de2bbac2aba35a0790d2f;hb=374ea2f45d17f361aa612becba657ecaade0d0b5;hp=b662eeb5d03b299471ab3651899f0e8b2a00262d;hpb=c7eb2002bcd007520309feb3e11a26ff847a4e05;p=csit.git

diff --git a/resources/libraries/python/DPDK/L2fwdTest.py b/resources/libraries/python/DPDK/L2fwdTest.py
index b662eeb5d0..70ca93c512 100644
--- a/resources/libraries/python/DPDK/L2fwdTest.py
+++ b/resources/libraries/python/DPDK/L2fwdTest.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -16,8 +16,8 @@ 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
+from resources.libraries.python.Constants import Constants
+from resources.libraries.python.topology import NodeType, Topology
 
 
 class L2fwdTest(object):
@@ -33,25 +33,28 @@ class L2fwdTest(object):
         :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: Are jumbo frames used or not.
+        :param jumbo_frames: Indication if the jumbo frames are used (True) or
+                             not (False).
         :type dut_node: dict
         :type cpu_cores: str
         :type nb_cores: str
         :type queue_nums: str
-        :type jumbo_frames: str
-        :returns: none
+        :type jumbo_frames: bool
         :raises RuntimeError: If the script "run_l2fwd.sh" fails.
         """
-
-        ssh = SSH()
-        ssh.connect(dut_node)
-
-        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 RuntimeError('Failed to execute l2fwd test at node {0}'.
-                               format(dut_node['host']))
+        if dut_node['type'] == NodeType.DUT:
+            ssh = SSH()
+            ssh.connect(dut_node)
+
+            arch = Topology.get_node_arch(dut_node)
+            jumbo = 'yes' if jumbo_frames else 'no'
+            cmd = '{fwdir}/tests/dpdk/dpdk_scripts/run_l2fwd.sh {cpu_cores} ' \
+                  '{nb_cores} {queues} {jumbo} {arch}'.\
+                  format(fwdir=Constants.REMOTE_FW_DIR, cpu_cores=cpu_cores,
+                         nb_cores=nb_cores, queues=queue_nums,
+                         jumbo=jumbo, arch=arch)
+
+            ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=600)
+            if ret_code != 0:
+                raise RuntimeError('Failed to execute l2fwd test at node '
+                                   '{name}'.format(name=dut_node['host']))