Fix DPDK nb_cores allocation

+ Migrate the call to main python util

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I8d00165071d4764121740c1c77819b8ffc65b3ba

2 files changed, 8 insertions, 5 deletions

diff --git a/resources/libraries/python/CpuUtils.py b/resources/libraries/python/CpuUtils.py
index f556c51814..b03e3e9bbc 100644
--- a/resources/libraries/python/CpuUtils.py
+++ b/resources/libraries/python/CpuUtils.py
@@ -500,9 +500,9 @@ class CpuUtils:
         return cpu_idle_list
 
     @staticmethod
-    def get_affinity_vpp_vswitch(
+    def get_affinity_vswitch(
             nodes, node, phy_cores, rx_queues=None, rxd=None, txd=None):
-        """Get affinity or VPP switch.
+        """Get affinity for vswitch.
 
         :param nodes: Topology nodes.
         :param node: Topology node string.
diff --git a/resources/libraries/python/DPDK/L3fwdTest.py b/resources/libraries/python/DPDK/L3fwdTest.py
index 07ffae9c43..fd3e51978f 100644
--- a/resources/libraries/python/DPDK/L3fwdTest.py
+++ b/resources/libraries/python/DPDK/L3fwdTest.py
@@ -21,6 +21,8 @@ from resources.libraries.python.ssh import exec_cmd_no_error, exec_cmd
 from resources.libraries.python.topology import NodeType, Topology
 
 
+NB_PORTS = 2
+
 class L3fwdTest:
     """Test the DPDK l3fwd performance."""
 
@@ -54,16 +56,17 @@ class L3fwdTest:
                 nodes, node, if1, if2
             )
 
-            list_cores = [int(item) for item in lcores_list.split(u",")]
+            lcores = [int(item) for item in lcores_list.split(u",")]
 
             # prepare the port config param
             nb_cores = int(nb_cores)
             index = 0
             port_config = ''
-            for port in range(0, 2):
+            for port in range(0, NB_PORTS):
                 for queue in range(0, int(queue_nums)):
                     index = 0 if nb_cores == 1 else index
-                    port_config += f"({port}, {queue}, {list_cores[index]}),"
+                    port_config += \
+                        f"({port}, {queue}, {lcores[index % NB_PORTS]}),"
                     index += 1
 
             if jumbo_frames: