X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FDPDK%2FL3fwdTest.py;h=d7e9305391ad29783ed0d6efd28ed8e73720e6d9;hp=f52a871a7d1c519da7bf308cbf4d46a7e21206cd;hb=4c6fe5602edcbd9857a846e5b13a21d5c671a2c8;hpb=bc26e009026ea9b3bd3c02a313e71b9bb051e6de

diff --git a/resources/libraries/python/DPDK/L3fwdTest.py b/resources/libraries/python/DPDK/L3fwdTest.py
index f52a871a7d..d7e9305391 100644
--- a/resources/libraries/python/DPDK/L3fwdTest.py
+++ b/resources/libraries/python/DPDK/L3fwdTest.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:
@@ -11,16 +11,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 """
 This module exists to provide the l3fwd test for DPDK on topology nodes.
 """
 
-from robot.api import logger
-
 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 L3fwdTest(object):
     """Test the DPDK l3fwd performance."""
@@ -47,9 +44,62 @@ class L3fwdTest(object):
         :type lcores_list: str
         :type queue_nums: str
         :type jumbo_frames: str
-        :return: none
+        :returns: none
+        """
+        if dut_node['type'] == NodeType.DUT:
+            adj_mac0, adj_mac1 = L3fwdTest.get_adj_mac(nodes_info, dut_node,
+                                                       dut_if1, dut_if2)
+
+            list_cores = lcores_list.split(',')
+
+            # prepare the port config param
+            index = 0
+            port_config = ''
+            for port in range(0, 2):
+                for queue in range(0, int(queue_nums)):
+                    if int(nb_cores) == 1:
+                        index = 0
+                        temp_str = '({port}, {queue}, {core}),'.\
+                        format(port=port, queue=queue,
+                               core=int(list_cores[index]))
+                    else:
+                        temp_str = '({port}, {queue}, {core}),'.\
+                        format(port=port, queue=queue,
+                               core=int(list_cores[index]))
+
+                    port_config += temp_str
+                    index = index + 1
+
+            ssh = SSH()
+            ssh.connect(dut_node)
+
+            cmd = '{fwdir}/tests/dpdk/dpdk_scripts/run_l3fwd.sh ' \
+                  '"{lcores}" "{ports}" {mac1} {mac2} {jumbo}'.\
+                  format(fwdir=Constants.REMOTE_FW_DIR, lcores=lcores_list,
+                         ports=port_config.rstrip(','), mac1=adj_mac0,
+                         mac2=adj_mac1, jumbo=jumbo_frames)
+
+            ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=600)
+            if ret_code != 0:
+                raise Exception('Failed to execute l3fwd test at node {name}'
+                                .format(name=dut_node['host']))
+
+    @staticmethod
+    def get_adj_mac(nodes_info, dut_node, dut_if1, dut_if2):
         """
+        Get adjacency MAC addresses of the DUT node.
 
+        :param nodes_info: All the nodes info in the topology file.
+        :param dut_node: Will execute the l3fwd on this node
+        :param dut_if1: The test link interface 1.
+        :param dut_if2: The test link interface 2.
+        :type nodes_info: dict
+        :type dut_node: dict
+        :type dut_if1: str
+        :type dut_if2: str
+        :returns: Returns MAC addresses of adjacency DUT nodes.
+        :rtype: str
+        """
         if_key0 = dut_if1
         if_key1 = dut_if2
         if_pci0 = Topology.get_interface_pci_addr(dut_node, if_key0)
@@ -58,7 +108,6 @@ class L3fwdTest(object):
         # detect which is the port 0
         if min(if_pci0, if_pci1) != if_pci0:
             if_key0, if_key1 = if_key1, if_key0
-            if_pci0, if_pci1 = if_pci1, if_pci0
 
         adj_node0, adj_if_key0 = Topology.get_adjacent_node_and_interface( \
                                  nodes_info, dut_node, if_key0)
@@ -68,36 +117,4 @@ class L3fwdTest(object):
         adj_mac0 = Topology.get_interface_mac(adj_node0, adj_if_key0)
         adj_mac1 = Topology.get_interface_mac(adj_node1, adj_if_key1)
 
-        list_cores = lcores_list.split(',')
-
-        # prepare the port config param
-        index = 0
-        port_config = ''
-        for port in range(0, 2):
-            for queue in range(0, int(queue_nums)):
-                if int(nb_cores) == 1:
-                    index = 0
-                    temp_str = '({0}, {1}, {2}),'.format(port, queue, \
-                                                    int(list_cores[index]))
-                else:
-                    temp_str = '({0}, {1}, {2}),'.format(port, queue, \
-                                                    int(list_cores[index]))
-
-                port_config += temp_str
-                index = index + 1
-
-        port_config_param = port_config.rstrip(',')
-
-        ssh = SSH()
-        ssh.connect(dut_node)
-
-        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)
-
-        (ret_code, _, stderr) = ssh.exec_command(cmd, timeout=600)
-        if ret_code != 0:
-            logger.error('Execute the l3fwd error: {0}'.format(stderr))
-            raise Exception('Failed to execute l3fwd test at node {0}'
-                            .format(dut_node['host']))
-
+        return adj_mac0, adj_mac1