Update DPDK to 18.02

- Update DPDK version to 18.02
- Code cleanup.

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

9 files changed, 98 insertions, 88 deletions

diff --git a/resources/libraries/python/DPDK/DPDKTools.py b/resources/libraries/python/DPDK/DPDKTools.py
index 5435dffe51..a256ae5ddc 100644
--- a/resources/libraries/python/DPDK/DPDKTools.py
+++ b/resources/libraries/python/DPDK/DPDKTools.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:
@@ -15,8 +15,8 @@
 """This module implements initialization and cleanup of DPDK environment."""
 
 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 DPDKTools(object):
@@ -40,23 +40,25 @@ class DPDKTools(object):
         :returns: none
         :raises RuntimeError: If it fails to bind the interfaces to igb_uio.
         """
-        pci_address1 = Topology.get_interface_pci_addr(dut_node, dut_if1)
-        pci_address2 = Topology.get_interface_pci_addr(dut_node, dut_if2)
+        if dut_node['type'] == NodeType.DUT:
+            pci_address1 = Topology.get_interface_pci_addr(dut_node, dut_if1)
+            pci_address2 = Topology.get_interface_pci_addr(dut_node, dut_if2)
 
-        ssh = SSH()
-        ssh.connect(dut_node)
+            ssh = SSH()
+            ssh.connect(dut_node)
 
-        arch = Topology.get_node_arch(dut_node)
-        cmd = 'cd {0}/tests/dpdk/dpdk_scripts/ &&'\
-              'sudo ./init_dpdk.sh {1} {2} {3}' .format(con.REMOTE_FW_DIR,
-                                                        pci_address1,
-                                                        pci_address2,
-                                                        arch)
+            arch = Topology.get_node_arch(dut_node)
+            cmd = '{fwdir}/tests/dpdk/dpdk_scripts/init_dpdk.sh '\
+                  '{pci1} {pci2} {arch}'.format(fwdir=Constants.REMOTE_FW_DIR,
+                                                pci1=pci_address1,
+                                                pci2=pci_address2,
+                                                arch=arch)
 
-        (ret_code, _, _) = ssh.exec_command(cmd, timeout=600)
-        if ret_code != 0:
-            raise RuntimeError('Failed to bind the interfaces to igb_uio at '
-                               'node {0}'.format(dut_node['host']))
+            ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=600)
+            if ret_code != 0:
+                raise RuntimeError('Failed to bind the interfaces to igb_uio '
+                                   'at node {name}'.\
+                                    format(name=dut_node['host']))
 
     @staticmethod
     def cleanup_dpdk_environment(dut_node, dut_if1, dut_if2):
@@ -73,19 +75,21 @@ class DPDKTools(object):
         :returns: none
         :raises RuntimeError: If it fails to cleanup the dpdk.
         """
-        pci_address1 = Topology.get_interface_pci_addr(dut_node, dut_if1)
-        if1_driver = Topology.get_interface_driver(dut_node, dut_if1)
-        pci_address2 = Topology.get_interface_pci_addr(dut_node, dut_if2)
-        if2_driver = Topology.get_interface_driver(dut_node, dut_if2)
+        if dut_node['type'] == NodeType.DUT:
+            pci_address1 = Topology.get_interface_pci_addr(dut_node, dut_if1)
+            if1_driver = Topology.get_interface_driver(dut_node, dut_if1)
+            pci_address2 = Topology.get_interface_pci_addr(dut_node, dut_if2)
+            if2_driver = Topology.get_interface_driver(dut_node, dut_if2)
 
-        ssh = SSH()
-        ssh.connect(dut_node)
+            ssh = SSH()
+            ssh.connect(dut_node)
 
-        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)
+            cmd = '{fwdir}/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh ' \
+                  '{drv1} {pci1} {drv2} {pci2}'.\
+                  format(fwdir=Constants.REMOTE_FW_DIR, drv1=if1_driver,
+                         pci1=pci_address1, drv2=if2_driver, pci2=pci_address2)
 
-        (ret_code, _, _) = ssh.exec_command(cmd, timeout=600)
-        if ret_code != 0:
-            raise RuntimeError('Failed to cleanup the dpdk at node {0}'
-                               .format(dut_node['host']))
+            ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=600)
+            if ret_code != 0:
+                raise RuntimeError('Failed to cleanup the dpdk at node {name}'
+                                   .format(name=dut_node['host']))
diff --git a/resources/libraries/python/DPDK/L2fwdTest.py b/resources/libraries/python/DPDK/L2fwdTest.py
index b662eeb5d0..cfaa39991d 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):
@@ -42,16 +42,18 @@ class L2fwdTest(object):
         :returns: none
         :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)
+            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_frames, 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']))
diff --git a/resources/libraries/python/DPDK/L3fwdTest.py b/resources/libraries/python/DPDK/L3fwdTest.py
index d26267fba1..773c125b92 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:
@@ -16,8 +16,8 @@ This module exists to provide the l3fwd test for DPDK on topology 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 L3fwdTest(object):
     """Test the DPDK l3fwd performance."""
@@ -46,38 +46,43 @@ class L3fwdTest(object):
         :type jumbo_frames: str
         :return: none
         """
-        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 = '({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
-
-        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.rstrip(','), adj_mac0, adj_mac1, jumbo_frames)
-
-        (ret_code, _, _) = ssh.exec_command(cmd, timeout=600)
-        if ret_code != 0:
-            raise Exception('Failed to execute l3fwd test at node {0}'
-                            .format(dut_node['host']))
+        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):
diff --git a/resources/libraries/python/DPDK/SetupDPDKTest.py b/resources/libraries/python/DPDK/SetupDPDKTest.py
index d3725d9e9b..d94a383786 100644
--- a/resources/libraries/python/DPDK/SetupDPDKTest.py
+++ b/resources/libraries/python/DPDK/SetupDPDKTest.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:
diff --git a/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh b/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
index c3b023f52f..f43746c221 100755
--- a/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
+++ b/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
@@ -3,7 +3,7 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.11
+DPDK_VERSION=dpdk-18.02
 ROOTDIR=/tmp/openvpp-testing
 TESTPMDLOG=screenlog.0
 PWDDIR=$(pwd)
diff --git a/tests/dpdk/dpdk_scripts/init_dpdk.sh b/tests/dpdk/dpdk_scripts/init_dpdk.sh
index db9dee5d2d..2bf4125f83 100755
--- a/tests/dpdk/dpdk_scripts/init_dpdk.sh
+++ b/tests/dpdk/dpdk_scripts/init_dpdk.sh
@@ -3,7 +3,7 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.11
+DPDK_VERSION=dpdk-18.02
 ROOTDIR=/tmp/openvpp-testing
 PWDDIR=$(pwd)
 
diff --git a/tests/dpdk/dpdk_scripts/install_dpdk.sh b/tests/dpdk/dpdk_scripts/install_dpdk.sh
index 945defe9a2..57085f3591 100755
--- a/tests/dpdk/dpdk_scripts/install_dpdk.sh
+++ b/tests/dpdk/dpdk_scripts/install_dpdk.sh
@@ -7,7 +7,6 @@ set -x
 # set arch, default to x86_64 if none given
 ARCH=${1:-"x86_64"}
 
-
 # dpdk prefers "arm64" to "aarch64" and does not allow arm64 native target
 if [ $ARCH == "aarch64" ]; then
     ARCH="arm64"
@@ -16,7 +15,7 @@ else
     MACHINE="native"
 fi
 
-DPDK_VERSION=dpdk-17.11
+DPDK_VERSION=dpdk-18.02
 DPDK_DIR=${DPDK_VERSION}
 DPDK_PACKAGE=${DPDK_DIR}.tar.xz
 ROOTDIR=/tmp/openvpp-testing
diff --git a/tests/dpdk/dpdk_scripts/run_l2fwd.sh b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
index 80b688eccf..83ee1d3240 100755
--- a/tests/dpdk/dpdk_scripts/run_l2fwd.sh
+++ b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
@@ -3,7 +3,7 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.11
+DPDK_VERSION=dpdk-18.02
 ROOTDIR=/tmp/openvpp-testing
 TESTPMDLOG=screenlog.0
 PWDDIR=$(pwd)
diff --git a/tests/dpdk/dpdk_scripts/run_l3fwd.sh b/tests/dpdk/dpdk_scripts/run_l3fwd.sh
index 1a5adf196e..e2c2d4d575 100755
--- a/tests/dpdk/dpdk_scripts/run_l3fwd.sh
+++ b/tests/dpdk/dpdk_scripts/run_l3fwd.sh
@@ -3,7 +3,7 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.11
+DPDK_VERSION=dpdk-18.02
 ROOTDIR=/tmp/openvpp-testing
 L3FWDLOG=screenlog.0
 PWDDIR=$(pwd)