CSIT-1065 High failure rate with K8s/Ligato orchestration

- Update Ligato Bootstrap for latest changes
- Update Ligato Test cases for latest vpp-agent changes
- Convert TC to new format
- Add Hyperthreading support

Change-Id: Id7c8513b01c66ee6c652b6294ddc50bc10be8f7d
Signed-off-by: Peter Mikus <pmikus@cisco.com>
(cherry picked from commit 1bb5beef46104f8b5bfb844ace3633ed40fc3915)

40 files changed, 3494 insertions, 6304 deletions

diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..c3b1216a99
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
@@ -0,0 +1,164 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | L2BDBASE | BASE | MEMIF
+| ... | K8S | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER | PARALLEL
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2BD test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
+| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
+| ... | 2p10GE NIC X520 Niantic by Intel.
+| ... | VNF Container is connected to VSWITCH container via Memif interface. All
+| ... | containers is running same VPP version. Containers are deployed with
+| ... | Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 64B | 1C | THIS
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 3b2a463630..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright (c) 2017 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | L2BDBASE | BASE | MEMIF
-| ... | K8S | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER | PARALLEL
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
-| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X520 Niantic by Intel.
-| ... | VNF Container is connected to VSWITCH container via Memif interface. All
-| ... | containers is running same VPP version. Containers are deployed with
-| ... | Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${avg_imix_framesize}= | ${357.833}
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Bridge Domain Binary Search
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Set Variable If
-| | ... | "${framesize}" == "IMIX_v4_1" | ${avg_imix_framesize} | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
-| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..e395166989
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
@@ -0,0 +1,171 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
+| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2BD test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
+| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
+| ... | 2p10GE NIC X520 Niantic by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 54b4918cab..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright (c) 2017 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
-| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
-| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X520 Niantic by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${avg_imix_framesize}= | ${357.833}
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Bridge Domain Binary Search
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Set Variable If
-| | ... | "${framesize}" == "IMIX_v4_1" | ${avg_imix_framesize} | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
-| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..6530ae8cab
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
@@ -0,0 +1,185 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
+| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2BD test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
+| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
+| ... | 2p10GE NIC X520 Niantic by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes VNF'3' startup config on all DUTs
+| | Create Kubernetes VNF'4' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdrdisc.robot
deleted file mode 100644
index fa56b03f87..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright (c) 2017 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
-| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
-| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X520 Niantic by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${avg_imix_framesize}= | ${357.833}
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Bridge Domain Binary Search
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Set Variable If
-| | ... | "${framesize}" == "IMIX_v4_1" | ${avg_imix_framesize} | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
-| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes VNF'3' startup config on all DUTs
-| | Create Kubernetes VNF'4' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..d25c9ae094
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
@@ -0,0 +1,171 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
+| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2BD test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
+| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
+| ... | 2p10GE NIC X520 Niantic by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
deleted file mode 100644
index dc78715aa0..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright (c) 2017 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
-| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
-| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X520 Niantic by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${avg_imix_framesize}= | ${357.833}
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Bridge Domain Binary Search
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Set Variable If
-| | ... | "${framesize}" == "IMIX_v4_1" | ${avg_imix_framesize} | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
-| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..26336a23a2
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
@@ -0,0 +1,185 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
+| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2BD test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
+| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
+| ... | 2p10GE NIC X520 Niantic by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes VNF'3' startup config on all DUTs
+| | Create Kubernetes VNF'4' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 154b0c9c1a..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright (c) 2017 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
-| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
-| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X520 Niantic by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${avg_imix_framesize}= | ${357.833}
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Bridge Domain Binary Search
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Set Variable If
-| | ... | "${framesize}" == "IMIX_v4_1" | ${avg_imix_framesize} | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
-| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes VNF'3' startup config on all DUTs
-| | Create Kubernetes VNF'4' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..3dd36bee90
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
@@ -0,0 +1,163 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | L2XCBASE | MEMIF
+| ... | K8S | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER | PARALLEL
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2XC test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
+| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
+| ... | VNF Container is connected to VSWITCH container via Memif interface. All
+| ... | containers is running same VPP version. Containers are deployed with
+| ... | Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 3edbb5d6e0..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright (c) 2017 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | L2XCBASE | MEMIF
-| ... | K8S | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER | PARALLEL
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2XC test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | VNF Container is connected to VSWITCH container via Memif interface. All
-| ... | containers is running same VPP version. Containers are deployed with
-| ... | Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${avg_imix_framesize}= | ${357.833}
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Cross Connect Binary Search
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Set Variable If
-| | ... | "${framesize}" == "IMIX_v4_1" | ${avg_imix_framesize} | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..dbf21524ba
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
@@ -0,0 +1,170 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
+| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2XC test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
+| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdrdisc.robot
deleted file mode 100644
index c6244f9377..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright (c) 2017 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
-| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2XC test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${avg_imix_framesize}= | ${357.833}
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Cross Connect Binary Search
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Set Variable If
-| | ... | "${framesize}" == "IMIX_v4_1" | ${avg_imix_framesize} | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..b77304658b
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
@@ -0,0 +1,184 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
+| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2XC test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
+| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes VNF'3' startup config on all DUTs
+| | Create Kubernetes VNF'4' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 774d2da0f0..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright (c) 2017 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
-| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2XC test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${avg_imix_framesize}= | ${357.833}
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Cross Connect Binary Search
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Set Variable If
-| | ... | "${framesize}" == "IMIX_v4_1" | ${avg_imix_framesize} | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes VNF'3' startup config on all DUTs
-| | Create Kubernetes VNF'4' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..e83b16d124
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
@@ -0,0 +1,170 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
+| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2XC test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
+| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 7a96e99ebf..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright (c) 2017 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
-| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2XC test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${avg_imix_framesize}= | ${357.833}
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Cross Connect Binary Search
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Set Variable If
-| | ... | "${framesize}" == "IMIX_v4_1" | ${avg_imix_framesize} | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..2a35d960f2
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
@@ -0,0 +1,184 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
+| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2XC test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
+| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes VNF'3' startup config on all DUTs
+| | Create Kubernetes VNF'4' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdrdisc.robot
deleted file mode 100644
index b348dce9b6..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright (c) 2017 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
-| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2XC test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${avg_imix_framesize}= | ${357.833}
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Cross Connect Binary Search
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Set Variable If
-| | ... | "${framesize}" == "IMIX_v4_1" | ${avg_imix_framesize} | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes VNF'3' startup config on all DUTs
-| | Create Kubernetes VNF'4' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..02dc99027e
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
@@ -0,0 +1,164 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | BASE | MEMIF
+| ... | K8S | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER | PARALLEL
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X710
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2BD test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
+| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
+| ... | 2p10GE NIC X710 by Intel.
+| ... | VNF Container is connected to VSWITCH container via Memif interface. All
+| ... | containers is running same VPP version. Containers are deployed with
+| ... | Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X710 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
deleted file mode 100644
index ab0ff27a61..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,306 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | BASE | MEMIF
-| ... | K8S | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER | PARALLEL
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
-| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X710 by Intel.
-| ... | VNF Container is connected to VSWITCH container via Memif interface. All
-| ... | containers is running same VPP version. Containers are deployed with
-| ... | Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 254 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X710 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Bridge Domain Binary Search
-| | ...
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | ...
-| | # Test Variables required for test execution and test teardown
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | Set Test Variable | ${min_rate}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
-| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..10d2f4d9c2
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
@@ -0,0 +1,171 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
+| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X710
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2BD test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
+| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
+| ... | 2p10GE NIC X710 by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X710 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 0c781a6476..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,313 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
-| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
-| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X710 by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 254 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X710 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Bridge Domain Binary Search
-| | ...
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | ...
-| | # Test Variables required for test execution and test teardown
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | Set Test Variable | ${min_rate}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
-| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..afead74273
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
@@ -0,0 +1,185 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
+| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X710
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2BD test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
+| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
+| ... | 2p10GE NIC X710 by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X710 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes VNF'3' startup config on all DUTs
+| | Create Kubernetes VNF'4' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 69f47af620..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,327 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
-| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
-| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X710 by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 254 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X710 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Bridge Domain Binary Search
-| | ...
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | ...
-| | # Test Variables required for test execution and test teardown
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | Set Test Variable | ${min_rate}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
-| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes VNF'3' startup config on all DUTs
-| | Create Kubernetes VNF'4' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..b0abe57f48
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
@@ -0,0 +1,171 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
+| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X710
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2BD test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
+| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
+| ... | 2p10GE NIC X710 by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X710 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 62dcb51c07..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,313 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
-| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
-| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X710 by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 254 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X710 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Bridge Domain Binary Search
-| | ...
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | ...
-| | # Test Variables required for test execution and test teardown
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | Set Test Variable | ${min_rate}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
-| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..93e5747e8a
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
@@ -0,0 +1,185 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
+| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X710
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2BD test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
+| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
+| ... | 2p10GE NIC X710 by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X710 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes VNF'3' startup config on all DUTs
+| | Create Kubernetes VNF'4' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 5487118863..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,327 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_IntelX710 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF
-| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with two L2
-| ... | bridge domains and MAC learning enabled. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X710 by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 254 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X710 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Bridge Domain Binary Search
-| | ...
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | ...
-| | # Test Variables required for test execution and test teardown
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | Set Test Variable | ${min_rate}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
-| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes VNF'3' startup config on all DUTs
-| | Create Kubernetes VNF'4' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..70a66a2cf4
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
@@ -0,0 +1,163 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2XCFWD | BASE | L2XCBASE | MEMIF
+| ... | K8S | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER | PARALLEL
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X710
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2XC test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
+| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X710 by Intel.
+| ... | VNF Container is connected to VSWITCH container via Memif interface. All
+| ... | containers is running same VPP version. Containers are deployed with
+| ... | Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X710 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 7d0d1e6dd6..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,303 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X710 | ETH | L2XCFWD | BASE | L2XCBASE | MEMIF
-| ... | K8S | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER | PARALLEL
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2XC test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X710 by Intel.
-| ... | VNF Container is connected to VSWITCH container via Memif interface. All
-| ... | containers is running same VPP version. Containers are deployed with
-| ... | Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 254 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X710 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Cross Connect Binary Search
-| | ...
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | ...
-| | # Test Variables required for test execution and test teardown
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | Set Test Variable | ${min_rate}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..0298614afd
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
@@ -0,0 +1,170 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
+| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X710
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2XC test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
+| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X710 by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X710 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 085968c17d..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,310 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X710 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
-| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2XC test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X710 by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 254 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X710 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Cross Connect Binary Search
-| | ...
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | ...
-| | # Test Variables required for test execution and test teardown
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | Set Test Variable | ${min_rate}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..a287b3c57d
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
@@ -0,0 +1,184 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
+| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X710
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2XC test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
+| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X710 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes VNF'3' startup config on all DUTs
+| | Create Kubernetes VNF'4' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 1f7723aa83..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,324 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X710 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
-| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2XC test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X710 by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 254 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X710 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Cross Connect Binary Search
-| | ...
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | ...
-| | # Test Variables required for test execution and test teardown
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | Set Test Variable | ${min_rate}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes VNF'3' startup config on all DUTs
-| | Create Kubernetes VNF'4' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..b33c5c7bdd
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
@@ -0,0 +1,170 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
+| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X710
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2XC test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
+| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X710 by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X710 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
deleted file mode 100644
index d88b4b9a87..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,310 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
-| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2XC test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X710 by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 254 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X710 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Cross Connect Binary Search
-| | ...
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | ...
-| | # Test Variables required for test execution and test teardown
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | Set Test Variable | ${min_rate}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
new file mode 100644
index 0000000000..9ebb772d45
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
@@ -0,0 +1,184 @@
+# Copyright (c) 2017 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
+| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
+| ...
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X710
+| ...
+| Test Setup | Set up performance test with Ligato Kubernetes
+| ...
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Teardown | Tear down performance test with Ligato Kubernetes
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput L2XC test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
+| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X710 by Intel.
+| ... | VNF Containers are connected to VSWITCH container via Memif interface.
+| ... | All containers are running same VPP version. Containers are deployed
+| ... | with Kubernetes. Configuration is applied by vnf-agent.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
+| ... | of packets transmitted. NDR and PDR are discovered for different
+| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | TG traffic profile contains two L3 flow-groups
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
+| ... | payload. MAC addresses are matching MAC addresses of the TG node
+| ... | interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+# X710 bandwidth limit
+| ${s_limit} | ${10000000000}
+# SFC profile
+| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+# CPU settings
+| ${system_cpus}= | ${1}
+| ${vswitch_cpus}= | ${5}
+| ${vnf_cpus}= | ${2}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Container orchestrated config.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | ${framesize}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | ...
+| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
+| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
+| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
+| | Create Kubernetes VSWITCH startup config on all DUTs
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
+| | Create Kubernetes VNF'1' startup config on all DUTs
+| | Create Kubernetes VNF'2' startup config on all DUTs
+| | Create Kubernetes VNF'3' startup config on all DUTs
+| | Create Kubernetes VNF'4' startup config on all DUTs
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
+| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
+| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
+| | Apply Kubernetes resource on node | ${dut1}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
+| | Apply Kubernetes resource on node | ${dut2}
+| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
+| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
+| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
+| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
+| | Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
+
+*** Test Cases ***
+| tc01-64B-1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
+
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdrdisc.robot
deleted file mode 100644
index 35e342094c..0000000000
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdrdisc.robot
+++ /dev/null
@@ -1,324 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X710 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF
-| ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710
-| ...
-| Test Setup | Set up performance test with Ligato Kubernetes
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Teardown | Tear down performance test with Ligato Kubernetes
-| ...
-| Documentation | *RFC2544: Pkt throughput L2XC test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X710 by Intel.
-| ... | VNF Containers are connected to VSWITCH container via Memif interface.
-| ... | All containers are running same VPP version. Containers are deployed
-| ... | with Kubernetes. Configuration is applied by vnf-agent.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 254 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X710 bandwidth limit
-| ${s_limit} | ${10000000000}
-# SFC profile
-| ${sfc_profile} | configmaps/eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${2}
-
-*** Keywords ***
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${framesize} - L2 framesize. Type: integer
-| | ... | - ${wt} - Worker threads. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${64} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2}
-| | ${cpu_cnt}= | Evaluate | ${wt}+1
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut1} | cpu_cnt=${cpu_cnt} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut1_if1_pci} | if2=${dut1_if2_pci}
-| | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | ... | node=${dut2} | cpu_cnt=${cpu_cnt} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${system_cpus} | smt_used=${False}
-| | ... | filename=/tmp/vswitch.conf | framesize=${framesize} | rxq=${rxq}
-| | ... | if1=${dut2_if1_pci} | if2=${dut2_if2_pci}
-
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | cpu_cnt=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | cpu_cnt=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | smt_used=${False} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-
-| L2 Cross Connect Binary Search
-| | ...
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type}
-| | ...
-| | # Test Variables required for test execution and test teardown
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
-| | Set Test Variable | ${min_rate}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | ${dut1_if1_name}= | Get interface name | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2}
-| | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize}
-| | ... | ${wt} | ${rxq}
-| | Create Kubernetes VNF'1' startup config on all DUTs
-| | Create Kubernetes VNF'2' startup config on all DUTs
-| | Create Kubernetes VNF'3' startup config on all DUTs
-| | Create Kubernetes VNF'4' startup config on all DUTs
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vswitch-vpp-cfg | vpp.conf=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf1-vpp-cfg | vpp.conf=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf2-vpp-cfg | vpp.conf=/tmp/vnf2.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf3-vpp-cfg | vpp.conf=/tmp/vnf3.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | csit
-| | ... | name=vnf4-vpp-cfg | vpp.conf=/tmp/vnf4.conf
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf1
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf2
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf3
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | pods/contiv-vnf.yaml | $$VNF$$=vnf4
-| | Apply Kubernetes resource on node | ${dut1}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut1_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut1_if2_name}
-| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
-| | ... | $$VSWITCH_IF1$$=${dut2_if1_name}
-| | ... | $$VSWITCH_IF2$$=${dut2_if2_name}
-| | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit
-| | Set Kubernetes PODs affinity on all DUTs | ${nodes}
-| | Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc02-64B-1t1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc03-IMIX-1t1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc04-IMIX-1t1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc05-1518B-1t1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
-
-| tc06-1518B-1t1c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
-
-| tc07-64B-2t2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc08-64B-2t2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc09-IMIX-2t2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc10-IMIX-2t2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | ...
-| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
-
-| tc11-1518B-2t2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
-
-| tc12-1518B-2t2c-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 50kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | [Template] | L2 Cross Connect Binary Search
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR