FIX: VTS cpu list

Change-Id: Ic3ac22642e443f30a46914c18cd9a9b54064286b
Signed-off-by: Jan Gelety <jgelety@cisco.com>

diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
index 448fc2e..5abeca4 100644 (file)
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
@@ -108,9 +108,9 @@
 | | Run Keyword If | '${acl_type}' != '${EMPTY}'
 | | ... | Configure ACLs on a single interface | ${dut1} | ${dut1_if2} | input
 | | ... | ${acl_type} | @{permit_list}
-| | ${nf_cpus}= | Create network function CPU list | DUT1
-| | ... | chains=${1} | nodeness=${1} | chain_id=${1}
-| | ... | node_id=${1} | auto_scale=${True}
+| | ${nf_cpus}= | Get Affinity NF | ${nodes} | ${dut1} | nf_chains=${1}
+| | | ... | nf_nodes=${1} | nf_chain=${1} | nf_node=${1}
+| | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${cpu_count_int}
 | | ${vm1} = | And Configure guest VM with dpdk-testpmd connected via vhost-user
 | | ... | DUT1 | ${sock1} | ${sock2} | ${TEST NAME}DUT1_VM1 | ${nf_cpus}
 | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False}

diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
index 61c0f26..2159adf 100644 (file)
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
@@ -108,9 +108,9 @@
 | | Run Keyword If | '${acl_type}' != '${EMPTY}'
 | | ... | Configure ACLs on a single interface | ${dut1} | ${dut1_if2} | input
 | | ... | ${acl_type} | @{permit_list}
-| | ${nf_cpus}= | Create network function CPU list | DUT1
-| | ... | chains=${1} | nodeness=${1} | chain_id=${1}
-| | ... | node_id=${1} | auto_scale=${True}
+| | ${nf_cpus}= | Get Affinity NF | ${nodes} | ${dut1} | nf_chains=${1}
+| | | ... | nf_nodes=${1} | nf_chain=${1} | nf_node=${1}
+| | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${cpu_count_int}
 | | ${vm1} = | And Configure guest VM with dpdk-testpmd connected via vhost-user
 | | ... | DUT1 | ${sock1} | ${sock2} | ${TEST NAME}DUT1_VM1 | ${nf_cpus}
 | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False}

diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
index 0911c4a..78534d6 100644 (file)
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
@@ -108,9 +108,9 @@
 | | Run Keyword If | '${acl_type}' != '${EMPTY}'
 | | ... | Configure ACLs on a single interface | ${dut1} | ${dut1_if2} | input
 | | ... | ${acl_type} | @{permit_list}
-| | ${nf_cpus}= | Create network function CPU list | DUT1
-| | ... | chains=${1} | nodeness=${1} | chain_id=${1}
-| | ... | node_id=${1} | auto_scale=${True}
+| | ${nf_cpus}= | Get Affinity NF | ${nodes} | ${dut1} | nf_chains=${1}
+| | | ... | nf_nodes=${1} | nf_chain=${1} | nf_node=${1}
+| | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${cpu_count_int}
 | | ${vm1} = | And Configure guest VM with dpdk-testpmd connected via vhost-user
 | | ... | DUT1 | ${sock1} | ${sock2} | ${TEST NAME}DUT1_VM1 | ${nf_cpus}
 | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False}