From 5f0655d09148c84f02a3419a3f9f8acd3c50d696 Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Mon, 14 Jan 2019 15:39:15 +0000
Subject: CSIT-1390 Implement multichain configuration for l2bd with
 vhost/l3fwd.

Change-Id: I36ab0bc7c9eada4c3f7bb5cb8f53de7d267ff910
Signed-off-by: Peter Mikus <pmikus@cisco.com>
(cherry picked from commit 88e6c1f979f530397a0743e4300d42faf9b538f5)
---
 ...bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr.robot | 5 ++++-
 ...asemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot | 5 ++++-
 ...aclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr.robot | 5 ++++-
 ...rn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot | 5 ++++-
 ...n-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr.robot | 5 ++++-
 ...2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot | 5 ++++-
 6 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'tests/vpp/perf/vts')

diff --git a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr.robot
index ece1b11bc2..787f40d1cc 100644
--- a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr.robot
@@ -107,8 +107,11 @@
 | | 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}
 | | ${vm1} = | And Configure guest VM with dpdk-testpmd connected via vhost-user
-| | ... | DUT1 | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | DUT1 | ${sock1} | ${sock2} | DUT1_VM1 | ${nf_cpus}
 | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False}
 | | Set Test Variable | &{dut1_vm_refs} | DUT1_VM1=${vm1}
 | | Then Traffic should pass with maximum rate
diff --git a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
index 325e3dd97d..583d5b8a6e 100644
--- a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
@@ -114,8 +114,11 @@
 | | 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}
 | | ${vm1} = | And Configure guest VM with dpdk-testpmd connected via vhost-user
-| | ... | DUT1 | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | DUT1 | ${sock1} | ${sock2} | DUT1_VM1 | ${nf_cpus}
 | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False}
 | | Set Test Variable | &{dut1_vm_refs} | DUT1_VM1=${vm1}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr.robot
index 1d303a2226..14831c1052 100644
--- a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr.robot
@@ -107,8 +107,11 @@
 | | 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}
 | | ${vm1} = | And Configure guest VM with dpdk-testpmd connected via vhost-user
-| | ... | DUT1 | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | DUT1 | ${sock1} | ${sock2} | DUT1_VM1 | ${nf_cpus}
 | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False}
 | | Set Test Variable | &{dut1_vm_refs} | DUT1_VM1=${vm1}
 | | Then Traffic should pass with maximum rate
diff --git a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
index c9d12219bf..bb0314cc00 100644
--- a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
@@ -114,8 +114,11 @@
 | | 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}
 | | ${vm1} = | And Configure guest VM with dpdk-testpmd connected via vhost-user
-| | ... | DUT1 | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | DUT1 | ${sock1} | ${sock2} | DUT1_VM1 | ${nf_cpus}
 | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False}
 | | Set Test Variable | &{dut1_vm_refs} | DUT1_VM1=${vm1}
 | | Then Find NDR and PDR intervals using optimized search
diff --git a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr.robot
index fedf4177c5..bbbe2179be 100644
--- a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr.robot
@@ -107,8 +107,11 @@
 | | 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}
 | | ${vm1} = | And Configure guest VM with dpdk-testpmd connected via vhost-user
-| | ... | DUT1 | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | DUT1 | ${sock1} | ${sock2} | DUT1_VM1 | ${nf_cpus}
 | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False}
 | | Set Test Variable | &{dut1_vm_refs} | DUT1_VM1=${vm1}
 | | Then Traffic should pass with maximum rate
diff --git a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
index c103ae6ce8..63e7d24744 100644
--- a/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
@@ -114,8 +114,11 @@
 | | 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}
 | | ${vm1} = | And Configure guest VM with dpdk-testpmd connected via vhost-user
-| | ... | DUT1 | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | DUT1 | ${sock1} | ${sock2} | DUT1_VM1 | ${nf_cpus}
 | | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False}
 | | Set Test Variable | &{dut1_vm_refs} | DUT1_VM1=${vm1}
 | | Then Find NDR and PDR intervals using optimized search
-- 
cgit 1.2.3-korg