From: Peter Mikus <pmikus@cisco.com>
Date: Fri, 17 Apr 2020 16:34:35 +0000 (+0000)
Subject: FIX: Proper NUMA compute
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=b778a14874e220995dd6a7f63cd6747911a0c192

FIX: Proper NUMA compute

+ FIX for Vratko's FIX

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

diff --git a/resources/libraries/python/NodePath.py b/resources/libraries/python/NodePath.py
index 04e8e5ef3c..8ee50666c1 100644
--- a/resources/libraries/python/NodePath.py
+++ b/resources/libraries/python/NodePath.py
@@ -268,6 +268,9 @@ class NodePath:
                 t_dict[f"{n_pfx}_pf_pci"] = []
             t_dict[f"{n_pfx}_pf_pci"].append(
                 Topology.get_interface_pci_addr(node, interface))
+            if f"{n_pfx}_pf_keys" not in t_dict:
+                t_dict[f"{n_pfx}_pf_keys"] = []
+            t_dict[f"{n_pfx}_pf_keys"].append(interface)
             # Backward compatibility below
             t_dict[f"{n_pfx.lower()}_{i_pfx}"] = interface
             t_dict[f"{n_pfx.lower()}_{i_pfx}_mac"] = \
diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot
index 0ec86cbb99..d3206a1349 100644
--- a/resources/libraries/robot/shared/default.robot
+++ b/resources/libraries/robot/shared/default.robot
@@ -187,7 +187,7 @@
 | | ${txd_count_int}= | Set variable | ${txd}
 | | FOR | ${dut} | IN | @{duts}
 | | | ${numa}= | Get interfaces numa node
-| | | ... | ${nodes['${dut}']} | @{${dut}_pf1}
+| | | ... | ${nodes['${dut}']} | @{${dut}_pf_keys}
 | | | ${smt_used}= | Is SMT enabled | ${nodes['${dut}']['cpuinfo']}
 | | | ${skip_cnt}= | Set variable | ${CPU_CNT_SYSTEM}
 | | | ${cpu_main}= | Cpu list per node str | ${nodes['${dut}']} | ${numa}