aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bootstrap-verify-perf-ligato.sh9
-rw-r--r--resources/libraries/bash/config/config5
-rw-r--r--resources/libraries/bash/config/defaults12
-rwxr-xr-xresources/libraries/bash/k8s_setup.sh86
-rw-r--r--resources/libraries/bash/shell/dpdk_utils.sh92
-rw-r--r--resources/libraries/bash/shell/k8s_utils.sh125
-rw-r--r--resources/libraries/bash/shell/qemu_utils.sh81
-rw-r--r--resources/libraries/python/KubernetesUtils.py306
-rw-r--r--resources/libraries/robot/performance/performance_setup.robot26
-rw-r--r--resources/templates/kubernetes/calico_v2.6.3.yaml (renamed from resources/templates/kubernetes/calico_v2.4.1.yaml)126
-rw-r--r--resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml72
-rw-r--r--resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml108
-rw-r--r--resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml72
-rw-r--r--resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc.yaml108
-rw-r--r--resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc.yaml72
-rw-r--r--resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc.yaml108
-rw-r--r--resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc.yaml72
-rw-r--r--resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc.yaml108
-rw-r--r--resources/templates/kubernetes/configmaps/pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml62
-rw-r--r--resources/templates/kubernetes/configmaps/pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml54
-rw-r--r--resources/templates/kubernetes/configmaps/vnf-agent-cfg.yaml15
-rw-r--r--resources/templates/kubernetes/configmaps/vswitch-agent-cfg.yaml15
-rw-r--r--resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml206
-rw-r--r--resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml271
-rw-r--r--resources/templates/kubernetes/eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml206
-rw-r--r--resources/templates/kubernetes/eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml271
-rw-r--r--resources/templates/kubernetes/namespaces/csit.yaml (renamed from resources/templates/kubernetes/csit.yaml)0
-rw-r--r--resources/templates/kubernetes/pods/contiv-sfc-controller.yaml22
-rw-r--r--resources/templates/kubernetes/pods/contiv-vnf.yaml45
-rw-r--r--resources/templates/kubernetes/pods/contiv-vswitch.yaml52
-rw-r--r--resources/templates/kubernetes/pods/etcdv3.yaml (renamed from resources/templates/kubernetes/etcd.yaml)2
-rw-r--r--resources/templates/kubernetes/pods/kafka.yaml (renamed from resources/templates/kubernetes/kafka.yaml)2
-rw-r--r--tests/kubernetes/perf/__init__.robot5
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot (renamed from tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot)68
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot324
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot (renamed from tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot)69
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot323
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot310
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot324
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot309
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot323
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x520-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot (renamed from tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot)66
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x520-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot (renamed from tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot)61
43 files changed, 3723 insertions, 1270 deletions
diff --git a/bootstrap-verify-perf-ligato.sh b/bootstrap-verify-perf-ligato.sh
index 10470dc9ea..e11b5e77b3 100644
--- a/bootstrap-verify-perf-ligato.sh
+++ b/bootstrap-verify-perf-ligato.sh
@@ -88,7 +88,7 @@ tar -zcvf ${SCRIPT_DIR}/vpp.tar.gz vpp/* && rm -R vpp
LIGATO_REPO_URL=$(cat ${SCRIPT_DIR}/LIGATO_REPO_URL)
VPP_AGENT_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_AGENT_STABLE_VER)
VPP_AGENT_STABLE_COMMIT="$( expr match `cat VPP_AGENT_STABLE_VER` '.*g\(.*\)' )"
-DOCKER_DEB="docker-ce_17.06.2~ce-0~ubuntu_amd64.deb"
+DOCKER_DEB="docker-ce_17.09.0~ce-0~ubuntu_amd64.deb"
# Clone & checkout stable vnf-agent
cd .. && git clone ${LIGATO_REPO_URL}/vpp-agent
@@ -123,16 +123,15 @@ sudo docker images
cd ${SCRIPT_DIR}/../vpp-agent/docker/prod_vpp_agent/ &&\
mv ${SCRIPT_DIR}/vpp.tar.gz . &&\
./extract_agent_files.sh &&\
- sudo docker build -t prod_vpp_agent --no-cache . &&\
- ./shrink.sh
+ sudo docker build -t prod_vpp_agent --no-cache .
# Export Docker image
-sudo docker save prod_vpp_agent_shrink | gzip > prod_vpp_agent_shrink.tar.gz
+sudo docker save prod_vpp_agent | gzip > prod_vpp_agent.tar.gz
# If image build fails, complain clearly and exit
if [ $? != 0 ]; then
echo "Failed to build vpp-agent Docker image."
exit 1
fi
-DOCKER_IMAGE="$( readlink -f prod_vpp_agent_shrink.tar.gz | tr '\n' ' ' )"
+DOCKER_IMAGE="$( readlink -f prod_vpp_agent.tar.gz | tr '\n' ' ' )"
cd ${SCRIPT_DIR}
diff --git a/resources/libraries/bash/config/config b/resources/libraries/bash/config/config
new file mode 100644
index 0000000000..2b71edcc49
--- /dev/null
+++ b/resources/libraries/bash/config/config
@@ -0,0 +1,5 @@
+QEMU_INSTALL_DIR=/opt
+QEMU_INSTALL_VERSION=qemu-2.5.0
+
+DPDK_INSTALL_DIR=/opt
+DPDK_INSTALL_VERSION=dpdk-17.11 \ No newline at end of file
diff --git a/resources/libraries/bash/config/defaults b/resources/libraries/bash/config/defaults
new file mode 100644
index 0000000000..1547452982
--- /dev/null
+++ b/resources/libraries/bash/config/defaults
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+typeset -A cfg
+cfg=( # set default values in config array
+ [QEMU_INSTALL_DIR]="/opt"
+ [QEMU_INSTALL_VERSION]="qemu-2.5.0"
+ [DPDK_INSTALL_DIR]=/opt
+ [DPDK_INSTALL_VERSION]=dpdk-17.11
+ [K8S_CALICO]="${SCRIPT_DIR}/../../templates/kubernetes/calico_v2.6.3.yaml"
+ [K8S_CONTIV_VPP]="https://raw.githubusercontent.com/contiv/vpp/master/k8s/contiv-vpp.yaml"
+ [K8S_CSIT]="${SCRIPT_DIR}/../../templates/kubernetes/csit.yaml"
+) \ No newline at end of file
diff --git a/resources/libraries/bash/k8s_setup.sh b/resources/libraries/bash/k8s_setup.sh
index 0649c711c6..f9f6c61ec7 100755
--- a/resources/libraries/bash/k8s_setup.sh
+++ b/resources/libraries/bash/k8s_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# 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:
@@ -16,39 +16,59 @@ set -xo pipefail
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-K8S_CALICO="${SCRIPT_DIR}/../../templates/kubernetes/calico_v2.4.1.yaml"
-K8S_CSIT="${SCRIPT_DIR}/../../templates/kubernetes/csit.yaml"
+# Include
+source ${SCRIPT_DIR}/config/defaults
+source ${SCRIPT_DIR}/shell/dpdk_utils.sh
+source ${SCRIPT_DIR}/shell/k8s_utils.sh
-trap "sudo kubeadm reset && sudo rm -rf $HOME/.kube" ERR
+# Read configuration
+while read line
+do
+ if echo $line | grep -F = &>/dev/null
+ then
+ varname=$(echo "$line" | cut -d '=' -f 1)
+ cfg[$varname]=$(echo "$line" | cut -d '=' -f 2-)
+ fi
+done < ${script_dir}/../config/config
-# Revert any changes made to this host by 'kubeadm init' or 'kubeadm join'
-sudo kubeadm reset && sudo rm -rf $HOME/.kube || \
- { echo "Failed to reset kubeadm"; exit 1; }
+trap "k8s_utils.destroy" ERR
-# Ret up the Kubernetes master
-sudo -E kubeadm init --token-ttl 0 --pod-network-cidr=192.168.0.0/16 || \
- { echo "Failed to init kubeadm"; exit 1; }
+case "$1" in
+ prepare)
+ # Revert any changes made to this host by 'kubeadm init'
+ k8s_utils.destroy
+ # Sets up the Kubernetes master
+ k8s_utils.prepare
+ ;;
+ deploy_calico)
+ # Revert any changes made to this host by 'kubeadm init'
+ k8s_utils.destroy
+ # Load kernel modules uio/uio_pci_generic
+ dpdk_utils.load_modules
+ # Sets up the Kubernetes master
+ k8s_utils.prepare "--pod-network-cidr=192.168.0.0/16"
+ # Apply resources
+ k8s_utils.calico_deploy ${cfg[K8S_CALICO]}
+ # Dump Kubernetes objects ...
+ k8s_utils.dump_all
+ ;;
+ affinity_non_vpp)
+ # Set affinity for all non VPP docker containers to CPU 0
+ k8s_utils.affinity_non_vpp
+ ;;
+ destroy)
+ # Revert any changes made to this host by 'kubeadm init'
+ k8s_utils.destroy
+ ;;
+ *)
+ echo "usage: $0 function"
+ echo "function:"
+ echo " prepare"
+ echo " deploy_calico"
+ echo " affinity_non_vpp"
+ echo " destroy"
+ exit 1
+esac
+shift
-# Make cgroup non-exclusive for CPU and MEM
-sudo cgset -r cpuset.cpu_exclusive=0 /kubepods
-sudo cgset -r cpuset.mem_exclusive=0 /kubepods
-
-rm -rf $HOME/.kube
-mkdir -p $HOME/.kube
-sudo cp -i /etc/kubernetes/admin.conf $HOME/.kube/config
-sudo chown $(id -u):$(id -g) $HOME/.kube/config
-
-# Apply resources
-kubectl apply -f ${K8S_CALICO} || \
- { echo "Failed to apply Calico resources"; exit 1; }
-kubectl apply -f ${K8S_CSIT} || \
- { echo "Failed to apply CSIT resource"; exit 1; }
-
-# Update the taints
-kubectl taint nodes --all node-role.kubernetes.io/master- || \
- { echo "Failed to taint nodes"; exit 1; }
-
-# Dump Kubernetes objects ...
-kubectl get all --all-namespaces
-
-echo Kubernetes is ready
+echo Kubernetes setup finished
diff --git a/resources/libraries/bash/shell/dpdk_utils.sh b/resources/libraries/bash/shell/dpdk_utils.sh
new file mode 100644
index 0000000000..9f81aaabce
--- /dev/null
+++ b/resources/libraries/bash/shell/dpdk_utils.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+# 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.
+
+function dpdk_utils.dpdk_delete {
+ # Deletes the DPDK directory
+ # DPDK install directory
+ dpdk_install_dir=$1
+ # DPDK install version
+ dpdk_install_ver=$2
+
+ [ -d ${dpdk_install_dir}/${dpdk_install_ver} ] && \
+ sudo rm -r ${dpdk_install_dir}/${dpdk_install_ver} && \
+ echo "${dpdk_install_dir}/${dpdk_install_ver} removed"
+}
+
+function dpdk_utils.dpdk_install {
+ # Downloads and installs DPDK
+ # DPDK install directory
+ dpdk_install_dir=$1
+ # DPDK install version
+ dpdk_install_ver=$2
+ # DPDK compile target
+ dpdk_target=x86_64-native-linuxapp-gcc
+ # Force install (if true then remove previous installation; default false)
+ force_install=${3:-false}
+
+ if [ "$force_install" = true ]; then
+ # Cleanup DPDK DIR
+ dpdk_utils.dpdk_delete ${dpdk_install_dir} ${dpdk_install_ver}
+ else
+ # Test if DPDK was installed previously
+ test -d ${dpdk_install_dir}/${dpdk_install_ver} && \
+ { echo "DPDK ${dpdk_install_ver} ready"; exit 0; }
+ fi
+
+ # Download the DPDK package if no local copy exists
+ if [ ! -f ${dpdk_install_dir}/${dpdk_install_ver}.tar.xz ]; then
+ sudo wget -e use_proxy=yes -P ${dpdk_install_dir} -q \
+ fast.dpdk.org/rel/${dpdk_install_ver}.tar.xz || \
+ { echo "Failed to download ${dpdk_install_ver}"; exit 1; }
+ fi
+
+ # Create DPDK install dir if not exists and extract
+ sudo mkdir -p ${dpdk_install_dir} || \
+ { echo "Failed to create ${dpdk_install_dir}"; exit 1; }
+ sudo tar -xJf ${dpdk_install_dir}/${dpdk_install_ver}.tar.xz \
+ -C ${dpdk_install_dir} || \
+ { echo "Failed to extract ${dpdk_install_ver}.tar.xz"; exit 1; }
+
+ cd ${dpdk_install_dir}/${dpdk_install_ver}
+
+ # Compile and install the DPDK
+ sudo make install T=${dpdk_target} -j DESTDIR=install || \
+ { echo "Installation of ${dpdk_install_ver} failed"; exit 1; }
+
+ echo "DPDK ${dpdk_install_ver} ready"
+}
+
+function dpdk_utils.load_modules {
+ # Loads kernel modules and bind interfaces to drivers
+ # Use igb_uio [true|false]
+ use_igb_uio=${1:-false}
+ # DPDK install directory
+ dpdk_install_dir=$2
+ # DPDK install version
+ dpdk_install_ver=$3
+
+ sudo modprobe uio
+ sudo modprobe uio_pci_generic
+
+ if [ "${use_igb_uio}" = true ]; then
+ sudo rmmod igb_uio
+ # Try to insert IGB_UIO module
+ sudo insmod ${dpdk_install_dir}/${dpdk_install_ver}/x86_64-native-linuxapp-gcc/kmod/igb_uio.ko
+ # If failed then download/compile DPDK
+ if [ $? -ne 0 ]; then
+ dpdk_utils.dpdk_install ${dpdk_install_dir} ${dpdk_install_ver} true
+ sudo insmod ${dpdk_install_dir}/${dpdk_install_ver}/x86_64-native-linuxapp-gcc/kmod/igb_uio.ko
+ fi
+ fi
+}
diff --git a/resources/libraries/bash/shell/k8s_utils.sh b/resources/libraries/bash/shell/k8s_utils.sh
new file mode 100644
index 0000000000..55d3d815c9
--- /dev/null
+++ b/resources/libraries/bash/shell/k8s_utils.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+# 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.
+
+function k8s_utils.destroy {
+ # Destroy existing Kubernetes deployment
+ kubectl drain $HOSTNAME --delete-local-data --force --ignore-daemonsets
+ kubectl delete node $HOSTNAME
+
+ # Revert any changes made to this host by 'kubeadm init' or 'kubeadm join'
+ sudo kubeadm reset && sudo rm -rf $HOME/.kube || \
+ { echo "Failed to reset kubeadm"; exit 1; }
+}
+
+function k8s_utils.prepare {
+ # Sets up the Kubernetes master
+
+ # Disable swap
+ sudo swapoff --all
+
+ # Set up the Kubernetes master
+ sudo -E kubeadm init --token-ttl 0 ${1} || \
+ { echo "Failed to init kubeadm"; exit 1; }
+
+ # Make cgroup non-exclusive for CPU and MEM
+ sudo cgset -r cpuset.cpu_exclusive=0 /kubepods
+ sudo cgset -r cpuset.mem_exclusive=0 /kubepods
+
+ rm -rf $HOME/.kube
+ mkdir -p $HOME/.kube
+ sudo cp -i /etc/kubernetes/admin.conf $HOME/.kube/config
+ sudo chown $(id -u):$(id -g) $HOME/.kube/config
+}
+
+function k8s_utils.taint {
+ # Updates the taints
+ kubectl taint nodes --all node-role.kubernetes.io/master- || \
+ { echo "Failed to taint nodes"; exit 1; }
+}
+
+function k8s_utils.calico_deploy {
+ # Calico yaml URL or file
+ k8s_calico=$1
+
+ # Apply resources
+ kubectl apply -f ${k8s_calico} || \
+ { echo "Failed to apply ${k8s_calico}"; exit 1; }
+
+ # Update the taints
+ k8s_utils.taint
+}
+
+function k8s_utils.contiv_vpp_deploy {
+ # Contiv yaml URL or file
+ k8s_contiv=$1
+ k8s_contiv_patch="kubecon.contiv-vpp-yaml-patch.diff"
+
+ # Pull the most recent Docker images
+ bash <(curl -s https://raw.githubusercontent.com/contiv/vpp/master/k8s/pull-images.sh)
+
+ # Apply resources
+ wget ${k8s_contiv}
+ patch contiv-vpp.yaml -i ${k8s_contiv_patch} -o - | kubectl apply -f - || \
+ { echo "Failed to apply Contiv resources"; exit 1; }
+ rm contiv-vpp.yaml
+
+ # Update the taints
+ k8s_utils.taint
+}
+
+function k8s_utils.cri_shim_install {
+ # Install the CRI Shim on host
+ sudo su root -c 'bash <(curl -s https://raw.githubusercontent.com/contiv/vpp/master/k8s/cri-install.sh)'
+}
+
+function k8s_utils.cri_shim_uninstall {
+ # Uninstall the CRI Shim on host
+ sudo su root -c 'bash <(curl -s https://raw.githubusercontent.com/contiv/vpp/master/k8s/cri-install.sh) --uninstall'
+}
+
+function k8s_utils.kube_proxy_install {
+ # Installing custom version of Kube-Proxy to enable Kubernetes services
+ bash <(curl -s https://raw.githubusercontent.com/contiv/vpp/master/k8s/proxy-install.sh)
+}
+
+function k8s_utils.apply {
+ # Resource yaml URL or file
+ k8s_resource=$1
+
+ # Apply resources
+ kubectl apply -f ${k8s_resource} || \
+ { echo "Failed to apply ${k8s_resource}"; exit 1; }
+}
+
+function k8s_utils.resource_delete {
+ # Resource yaml URL or file
+ k8s_resource=$1
+
+ # Delete resources
+ kubectl delete -f ${k8s_resource} || \
+ { echo "Failed to delete ${k8s_resource}"; exit 1; }
+}
+
+function k8s_utils.affinity_non_vpp {
+ # Set affinity for all non VPP docker containers to CPU 0
+ for i in `sudo docker ps --format "{{.ID}} {{.Names}}" | grep -v vpp | cut -d' ' -f1`; do
+ sudo docker update --cpuset-cpus 0 ${i}
+ done
+}
+
+function k8s_utils.dump_all {
+ # Dumps the kubernetes objects
+ kubectl get all --all-namespaces
+ kubectl describe nodes
+}
diff --git a/resources/libraries/bash/shell/qemu_utils.sh b/resources/libraries/bash/shell/qemu_utils.sh
new file mode 100644
index 0000000000..510d9f2838
--- /dev/null
+++ b/resources/libraries/bash/shell/qemu_utils.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+# 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.
+
+function qemu_utils.qemu_delete {
+ # Deletes the QEMU directory
+ # QEMU install directory
+ qemu_install_dir=$1
+ # QEMU install version
+ qemu_install_ver=$2
+
+ [ -d ${qemu_install_dir}/${qemu_install_ver} ] && \
+ sudo rm -r ${qemu_install_dir}/${qemu_install_ver} && \
+ echo "${qemu_install_dir}/${qemu_install_ver} removed"
+}
+
+function qemu_utils.qemu_install {
+ # Downloads and installs QEMU
+ # QEMU install directory
+ qemu_install_dir=$1
+ # QEMU install version
+ qemu_install_ver=$2
+ # QEMU patch
+ qemu_patch=$3
+ # Force install (if true then remove previous installation; default false)
+ force_install=${4:-false}
+ # QEMU repo URL
+ qemu_package_url="http://download.qemu-project.org/${qemu_install_ver}.tar.xz"
+
+ if [ $force_install ]; then
+ # Cleanup QEMU dir
+ qemu_utils.qemu_delete $qemu_install_dir $qemu_install_ver
+ else
+ # Test if QEMU was installed previously
+ test -d $qemu_install_dir && \
+ { echo "Qemu already installed: $qemu_install_dir"; exit 0; }
+ fi
+
+ tmp_dir=$(mktemp -d) || \
+ { echo "Failed to create temporary working dir"; exit 1; }
+ trap "rm -r ${tmp_dir}" EXIT
+
+ # Download QEMU source code if no local copy exists
+ if [ ! -f /opt/${qemu_install_ver}.tar.xz ]; then
+ sudo wget -e use_proxy=yes -P /opt -q ${qemu_package_url} || \
+ { echo "Failed to download ${qemu_install_ver}"; exit 1; }
+ fi
+ tar --strip-components 1 -xvJf ${tmp_dir}/${qemu_install_ver}.tar.xz -C ${tmp_dir} && \
+ { echo "Failed to exctract ${qemu_install_ver}.tar.xz"; exit 1; }
+
+ cd ${tmp_dir}
+ sudo mkdir -p ${qemu_install_dir} || \
+ { echo "Failed to create ${qemu_install_dir}"; exit 1; }
+
+ # Apply additional patches
+ if [ $qemu_patch ]
+ then
+ chmod +x ${SCRIPT_DIR}/qemu_patches/${qemu_install_ver}/*
+ run-parts --verbose --report ${SCRIPT_DIR}/qemu_patches/${qemu_install_ver}
+ fi
+
+ # Build
+ sudo ./configure --target-list=x86_64-softmmu --prefix=${qemu_install_dir}/${qemu_install_ver} || \
+ { echo "Failed to configure ${qemu_install_ver}"; exit 1; }
+ sudo make -j`nproc` || \
+ { echo "Failed to compile ${qemu_install_ver}"; exit 1; }
+ sudo make install || \
+ { echo "Failed to install ${qemu_install_ver}"; exit 1; }
+
+ echo "QEMU ${qemu_install_ver} ready"
+} \ No newline at end of file
diff --git a/resources/libraries/python/KubernetesUtils.py b/resources/libraries/python/KubernetesUtils.py
index bcbb7f5dff..ceeab0b07e 100644
--- a/resources/libraries/python/KubernetesUtils.py
+++ b/resources/libraries/python/KubernetesUtils.py
@@ -13,8 +13,7 @@
"""Library to control Kubernetes kubectl."""
-import time
-import yaml
+from time import sleep
from resources.libraries.python.constants import Constants
from resources.libraries.python.topology import NodeType
@@ -24,6 +23,8 @@ from resources.libraries.python.VppConfigGenerator import VppConfigGenerator
__all__ = ["KubernetesUtils"]
+# Maximum number of retries to check if PODs are running or deleted.
+MAX_RETRY = 48
class KubernetesUtils(object):
"""Kubernetes utilities class."""
@@ -43,9 +44,10 @@ class KubernetesUtils(object):
ssh = SSH()
ssh.connect(node)
- cmd = '{dir}/{lib}/k8s_setup.sh '.format(dir=Constants.REMOTE_FW_DIR,
- lib=Constants.RESOURCES_LIB_SH)
- (ret_code, _, _) = ssh.exec_command(cmd, timeout=120)
+ cmd = '{dir}/{lib}/k8s_setup.sh deploy_calico'\
+ .format(dir=Constants.REMOTE_FW_DIR,
+ lib=Constants.RESOURCES_LIB_SH)
+ (ret_code, _, _) = ssh.exec_command(cmd, timeout=240)
if int(ret_code) != 0:
raise RuntimeError('Failed to setup Kubernetes on {node}.'
.format(node=node['host']))
@@ -65,6 +67,36 @@ class KubernetesUtils(object):
KubernetesUtils.setup_kubernetes_on_node(node)
@staticmethod
+ def destroy_kubernetes_on_node(node):
+ """Destroy Kubernetes on node.
+
+ :param node: DUT node.
+ :type node: dict
+ :raises RuntimeError: If destroying Kubernetes failed.
+ """
+ ssh = SSH()
+ ssh.connect(node)
+
+ cmd = '{dir}/{lib}/k8s_setup.sh destroy'\
+ .format(dir=Constants.REMOTE_FW_DIR,
+ lib=Constants.RESOURCES_LIB_SH)
+ (ret_code, _, _) = ssh.exec_command(cmd, timeout=120)
+ if int(ret_code) != 0:
+ raise RuntimeError('Failed to destroy Kubernetes on {node}.'
+ .format(node=node['host']))
+
+ @staticmethod
+ def destroy_kubernetes_on_all_duts(nodes):
+ """Destroy Kubernetes on all DUTs.
+
+ :param nodes: Topology nodes.
+ :type nodes: dict
+ """
+ for node in nodes.values():
+ if node['type'] == NodeType.DUT:
+ KubernetesUtils.destroy_kubernetes_on_node(node)
+
+ @staticmethod
def apply_kubernetes_resource_on_node(node, yaml_file, **kwargs):
"""Apply Kubernetes resource on node.
@@ -79,18 +111,15 @@ class KubernetesUtils(object):
ssh = SSH()
ssh.connect(node)
- stream = file('{tpl}/{yaml}'.format(tpl=Constants.RESOURCES_TPL_K8S,
- yaml=yaml_file), 'r')
-
- for data in yaml.load_all(stream):
+ fqn_file = '{tpl}/{yaml}'.format(tpl=Constants.RESOURCES_TPL_K8S,
+ yaml=yaml_file)
+ with open(fqn_file, 'r') as src_file:
+ stream = src_file.read()
data = reduce(lambda a, kv: a.replace(*kv), kwargs.iteritems(),
- yaml.dump(data, default_flow_style=False))
- # Workaround to avoid using RAW string anotated with | in YAML as
- # library + bash is misinterpreting spaces.
- data = data.replace('.conf:\n', '.conf: |\n')
+ stream)
cmd = 'cat <<EOF | kubectl apply -f - \n{data}\nEOF'.format(
data=data)
- (ret_code, _, _) = ssh.exec_command_sudo(cmd, timeout=120)
+ (ret_code, _, _) = ssh.exec_command_sudo(cmd)
if int(ret_code) != 0:
raise RuntimeError('Failed to apply Kubernetes template {yaml} '
'on {node}.'.format(yaml=yaml_file,
@@ -114,141 +143,169 @@ class KubernetesUtils(object):
**kwargs)
@staticmethod
- def create_kubernetes_cm_from_file_on_node(node, name, key, src_file):
+ def create_kubernetes_cm_from_file_on_node(node, nspace, name, **kwargs):
"""Create Kubernetes ConfigMap from file on node.
:param node: DUT node.
+ :param nspace: Kubernetes namespace.
:param name: ConfigMap name.
- :param key: Key (destination file).
- :param src_file: Source file.
+ :param kwargs: Named parameters.
:type node: dict
+ :type nspace: str
:type name: str
- :type key: str
- :type src_file: str
+ :param kwargs: dict
:raises RuntimeError: If creating Kubernetes ConfigMap failed.
"""
ssh = SSH()
ssh.connect(node)
- cmd = 'kubectl create -n csit configmap {name} --from-file={key}='\
- '{src_file}'.format(name=name, key=key, src_file=src_file)
- (ret_code, _, _) = ssh.exec_command_sudo(cmd, timeout=120)
+ nspace = '-n {nspace}'.format(nspace=nspace) if nspace else ''
+
+ from_file = '{0}'.format(' '.join('--from-file={0}={1} '\
+ .format(key, kwargs[key]) for key in kwargs))
+
+ cmd = 'kubectl create {nspace} configmap {name} {from_file}'\
+ .format(nspace=nspace, name=name, from_file=from_file)
+ (ret_code, _, _) = ssh.exec_command_sudo(cmd)
if int(ret_code) != 0:
- raise RuntimeError('Failed to create Kubernetes ConfigMap {name} '
- 'on {node}.'.format(name=name,
- node=node['host']))
+ raise RuntimeError('Failed to create Kubernetes ConfigMap '
+ 'on {node}.'.format(node=node['host']))
@staticmethod
- def create_kubernetes_cm_from_file_on_all_duts(nodes, name, key, src_file):
+ def create_kubernetes_cm_from_file_on_all_duts(nodes, nspace, name,
+ **kwargs):
"""Create Kubernetes ConfigMap from file on all DUTs.
:param nodes: Topology nodes.
+ :param nspace: Kubernetes namespace.
:param name: ConfigMap name.
- :param key: Key (destination file).
- :param src_file: Source file.
+ :param kwargs: Named parameters.
:type nodes: dict
+ :type nspace: str
:type name: str
- :type key: str
- :type src_file: str
+ :param kwargs: dict
"""
for node in nodes.values():
if node['type'] == NodeType.DUT:
KubernetesUtils.create_kubernetes_cm_from_file_on_node(node,
+ nspace,
name,
- key,
- src_file)
+ **kwargs)
@staticmethod
- def delete_kubernetes_resource_on_node(node, rtype='po,cm', name=None):
+ def delete_kubernetes_resource_on_node(node, nspace, name=None,
+ rtype='po,cm,deploy,rs,rc,svc'):
"""Delete Kubernetes resource on node.
:param node: DUT node.
+ :param nspace: Kubernetes namespace.
:param rtype: Kubernetes resource type.
- :param name: Name of resource.
+ :param name: Name of resource (Default: all).
:type node: dict
+ :type nspace: str
:type rtype: str
:type name: str
- :raises RuntimeError: If deleting Kubernetes resource failed.
+ :raises RuntimeError: If retrieving or deleting Kubernetes resource
+ failed.
"""
ssh = SSH()
ssh.connect(node)
name = '{name}'.format(name=name) if name else '--all'
+ nspace = '-n {nspace}'.format(nspace=nspace) if nspace else ''
- cmd = 'kubectl delete -n csit {rtype} {name}'\
- .format(rtype=rtype, name=name)
- (ret_code, _, _) = ssh.exec_command_sudo(cmd, timeout=120)
+ cmd = 'kubectl delete {nspace} {rtype} {name}'\
+ .format(nspace=nspace, rtype=rtype, name=name)
+ (ret_code, _, _) = ssh.exec_command_sudo(cmd)
if int(ret_code) != 0:
- raise RuntimeError('Failed to delete Kubernetes resources in CSIT '
- 'namespace on {node}.'.format(node=node['host']))
+ raise RuntimeError('Failed to delete Kubernetes resources '
+ 'on {node}.'.format(node=node['host']))
- cmd = 'kubectl get -n csit pods --no-headers'
- for _ in range(24):
- (ret_code, stdout, _) = ssh.exec_command_sudo(cmd, timeout=120)
- if int(ret_code) == 0:
- ready = True
+ cmd = 'kubectl get {nspace} pods -a --no-headers'\
+ .format(nspace=nspace)
+ for _ in range(MAX_RETRY):
+ (ret_code, stdout, stderr) = ssh.exec_command_sudo(cmd)
+ if int(ret_code) != 0:
+ raise RuntimeError('Failed to retrieve Kubernetes resources on '
+ '{node}.'.format(node=node['host']))
+ if name == '--all':
+ ready = False
+ for line in stderr.splitlines():
+ if 'No resources found.' in line:
+ ready = True
+ if ready:
+ break
+ else:
+ ready = False
for line in stdout.splitlines():
- if 'No resources found.' not in line:
+ try:
+ state = line.split()[1].split('/')
+ ready = True if 'Running' in line and\
+ state == state[::-1] else False
+ if not ready:
+ break
+ except (ValueError, IndexError):
ready = False
if ready:
break
- time.sleep(5)
+ sleep(5)
else:
- raise RuntimeError('Failed to delete Kubernetes resources in CSIT '
- 'namespace on {node}.'.format(node=node['host']))
+ raise RuntimeError('Failed to delete Kubernetes resources on '
+ '{node}.'.format(node=node['host']))
@staticmethod
- def delete_kubernetes_resource_on_all_duts(nodes, rtype='po,cm', name=None):
+ def delete_kubernetes_resource_on_all_duts(nodes, nspace, name=None,
+ rtype='po,cm,deploy,rs,rc,svc'):
"""Delete all Kubernetes resource on all DUTs.
:param nodes: Topology nodes.
+ :param nspace: Kubernetes namespace.
:param rtype: Kubernetes resource type.
:param name: Name of resource.
:type nodes: dict
+ :type nspace: str
:type rtype: str
:type name: str
"""
for node in nodes.values():
if node['type'] == NodeType.DUT:
- KubernetesUtils.delete_kubernetes_resource_on_node(node, rtype,
- name)
+ KubernetesUtils.delete_kubernetes_resource_on_node(node, nspace,
+ name, rtype)
@staticmethod
- def describe_kubernetes_resource_on_node(node, rtype='po,cm'):
- """Describe Kubernetes resource on node.
+ def describe_kubernetes_resource_on_node(node, nspace):
+ """Describe all Kubernetes PODs in namespace on node.
:param node: DUT node.
- :param rtype: Kubernetes resource type.
+ :param nspace: Kubernetes namespace.
:type node: dict
- :type rtype: str
- :raises RuntimeError: If describing Kubernetes resource failed.
+ :type nspace: str
"""
ssh = SSH()
ssh.connect(node)
- cmd = 'kubectl describe -n csit {rtype}'.format(rtype=rtype)
- (ret_code, _, _) = ssh.exec_command_sudo(cmd, timeout=120)
- if int(ret_code) != 0:
- raise RuntimeError('Failed to describe Kubernetes resource on '
- '{node}.'.format(node=node['host']))
+ nspace = '-n {nspace}'.format(nspace=nspace) if nspace else ''
+
+ cmd = 'kubectl describe {nspace} all'.format(nspace=nspace)
+ ssh.exec_command_sudo(cmd)
@staticmethod
- def describe_kubernetes_resource_on_all_duts(nodes, rtype='po,cm'):
- """Describe Kubernetes resource on all DUTs.
+ def describe_kubernetes_resource_on_all_duts(nodes, nspace):
+ """Describe all Kubernetes PODs in namespace on all DUTs.
:param nodes: Topology nodes.
- :param rtype: Kubernetes resource type.
+ :param nspace: Kubernetes namespace.
:type nodes: dict
- :type rtype: str
+ :type nspace: str
"""
for node in nodes.values():
if node['type'] == NodeType.DUT:
KubernetesUtils.describe_kubernetes_resource_on_node(node,
- rtype)
+ nspace)
@staticmethod
- def get_kubernetes_logs_on_node(node, nspace='csit'):
- """Get Kubernetes logs on node.
+ def get_kubernetes_logs_on_node(node, nspace):
+ """Get Kubernetes logs from all PODs in namespace on node.
:param node: DUT node.
:param nspace: Kubernetes namespace.
@@ -258,14 +315,16 @@ class KubernetesUtils(object):
ssh = SSH()
ssh.connect(node)
- cmd = "for p in $(kubectl get pods -n {namespace} --no-headers"\
- " | cut -f 1 -d ' '); do echo $p; kubectl logs -n {namespace} $p; "\
- "done".format(namespace=nspace)
- ssh.exec_command(cmd, timeout=120)
+ nspace = '-n {nspace}'.format(nspace=nspace) if nspace else ''
+
+ cmd = "for p in $(kubectl get pods {nspace} -o jsonpath="\
+ "'{{.items[*].metadata.name}}'); do echo $p; kubectl logs "\
+ "{nspace} $p; done".format(nspace=nspace)
+ ssh.exec_command_sudo(cmd)
@staticmethod
- def get_kubernetes_logs_on_all_duts(nodes, nspace='csit'):
- """Get Kubernetes logs on all DUTs.
+ def get_kubernetes_logs_on_all_duts(nodes, nspace):
+ """Get Kubernetes logs from all PODs in namespace on all DUTs.
:param nodes: Topology nodes.
:param nspace: Kubernetes namespace.
@@ -277,71 +336,46 @@ class KubernetesUtils(object):
KubernetesUtils.get_kubernetes_logs_on_node(node, nspace)
@staticmethod
- def reset_kubernetes_on_node(node):
- """Reset Kubernetes on node.
-
- :param node: DUT node.
- :type node: dict
- :raises RuntimeError: If resetting Kubernetes failed.
- """
- ssh = SSH()
- ssh.connect(node)
-
- cmd = 'kubeadm reset && rm -rf $HOME/.kube'
- (ret_code, _, _) = ssh.exec_command_sudo(cmd, timeout=120)
- if int(ret_code) != 0:
- raise RuntimeError('Failed to reset Kubernetes on {node}.'
- .format(node=node['host']))
-
- @staticmethod
- def reset_kubernetes_on_all_duts(nodes):
- """Reset Kubernetes on all DUTs.
-
- :param nodes: Topology nodes.
- :type nodes: dict
- """
- for node in nodes.values():
- if node['type'] == NodeType.DUT:
- KubernetesUtils.reset_kubernetes_on_node(node)
-
- @staticmethod
- def wait_for_kubernetes_pods_on_node(node, nspace='csit'):
- """Wait for Kubernetes PODs to become in 'Running' state on node.
+ def wait_for_kubernetes_pods_on_node(node, nspace):
+ """Wait for Kubernetes PODs to become ready on node.
:param node: DUT node.
:param nspace: Kubernetes namespace.
:type node: dict
:type nspace: str
- :raises RuntimeError: If Kubernetes PODs are not ready.
+ :raises RuntimeError: If Kubernetes PODs are not in Running state.
"""
ssh = SSH()
ssh.connect(node)
- cmd = 'kubectl get -n {namespace} pods --no-headers'\
- .format(namespace=nspace)
- for _ in range(48):
- (ret_code, stdout, _) = ssh.exec_command_sudo(cmd, timeout=120)
+ nspace = '-n {nspace}'.format(nspace=nspace) if nspace \
+ else '--all-namespaces'
+
+ cmd = 'kubectl get {nspace} pods -a --no-headers' \
+ .format(nspace=nspace)
+ for _ in range(MAX_RETRY):
+ (ret_code, stdout, _) = ssh.exec_command_sudo(cmd)
if int(ret_code) == 0:
ready = False
for line in stdout.splitlines():
try:
state = line.split()[1].split('/')
- ready = True if 'Running' in line and\
+ ready = True if 'Running' in line and \
state == state[::-1] else False
if not ready:
break
- except ValueError, IndexError:
+ except (ValueError, IndexError):
ready = False
if ready:
break
- time.sleep(5)
+ sleep(5)
else:
- raise RuntimeError('Kubernetes PODs are not ready on {node}.'
+ raise RuntimeError('Kubernetes PODs are not running on {node}.'
.format(node=node['host']))
@staticmethod
- def wait_for_kubernetes_pods_on_all_duts(nodes, nspace='csit'):
- """Wait for Kubernetes PODs to become in Running state on all DUTs.
+ def wait_for_kubernetes_pods_on_all_duts(nodes, nspace):
+ """Wait for Kubernetes to become ready on all DUTs.
:param nodes: Topology nodes.
:param nspace: Kubernetes namespace.
@@ -353,6 +387,32 @@ class KubernetesUtils(object):
KubernetesUtils.wait_for_kubernetes_pods_on_node(node, nspace)
@staticmethod
+ def set_kubernetes_pods_affinity_on_node(node):
+ """Set affinity for all Kubernetes PODs except VPP on node.
+
+ :param node: DUT node.
+ :type node: dict
+ """
+ ssh = SSH()
+ ssh.connect(node)
+
+ cmd = '{dir}/{lib}/k8s_setup.sh affinity_non_vpp'\
+ .format(dir=Constants.REMOTE_FW_DIR,
+ lib=Constants.RESOURCES_LIB_SH)
+ ssh.exec_command(cmd)
+
+ @staticmethod
+ def set_kubernetes_pods_affinity_on_all_duts(nodes):
+ """Set affinity for all Kubernetes PODs except VPP on all DUTs.
+
+ :param nodes: Topology nodes.
+ :type nodes: dict
+ """
+ for node in nodes.values():
+ if node['type'] == NodeType.DUT:
+ KubernetesUtils.set_kubernetes_pods_affinity_on_node(node)
+
+ @staticmethod
def create_kubernetes_vswitch_startup_config(**kwargs):
"""Create Kubernetes VSWITCH startup configuration.
@@ -394,21 +454,27 @@ class KubernetesUtils(object):
:param kwargs: Key-value pairs used to create configuration.
:param kwargs: dict
"""
- skip_cnt = kwargs['cpu_skip'] + (kwargs['i'] - 1) * kwargs['cpu_cnt']
+ skip_cnt = kwargs['cpu_skip'] + (kwargs['i'] - 1) * \
+ (kwargs['cpu_cnt'] - 1)
cpuset_cpus = \
CpuUtils.cpu_slice_of_list_per_node(node=kwargs['node'],
cpu_node=kwargs['cpu_node'],
skip_cnt=skip_cnt,
- cpu_cnt=kwargs['cpu_cnt'],
+ cpu_cnt=kwargs['cpu_cnt']-1,
+ smt_used=kwargs['smt_used'])
+ cpuset_main = \
+ CpuUtils.cpu_slice_of_list_per_node(node=kwargs['node'],
+ cpu_node=kwargs['cpu_node'],
+ skip_cnt=1,
+ cpu_cnt=1,
smt_used=kwargs['smt_used'])
-
# Create config instance
vpp_config = VppConfigGenerator()
vpp_config.set_node(kwargs['node'])
vpp_config.add_unix_cli_listen(value='0.0.0.0:5002')
vpp_config.add_unix_nodaemon()
# We will pop first core from list to be main core
- vpp_config.add_cpu_main_core(str(cpuset_cpus.pop(0)))
+ vpp_config.add_cpu_main_core(str(cpuset_main.pop(0)))
# if this is not only core in list, the rest will be used as workers.
if cpuset_cpus:
corelist_workers = ','.join(str(cpu) for cpu in cpuset_cpus)
diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index 68f84b664f..0453fad275 100644
--- a/resources/libraries/robot/performance/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -425,6 +425,22 @@
| | Reset VAT History On All DUTs | ${nodes}
| | Create base startup configuration of VPP on all DUTs
+| Set up performance test with Ligato Kubernetes
+| | [Documentation] | Common test setup for performance tests with Ligato \
+| | ... | Kubernetes.
+| | ...
+| | Apply Kubernetes resource on all duts | ${nodes} | namespaces/csit.yaml
+| | Apply Kubernetes resource on all duts | ${nodes} | pods/kafka.yaml
+| | Apply Kubernetes resource on all duts | ${nodes} | pods/etcdv3.yaml
+| | Apply Kubernetes resource on all duts | ${nodes}
+| | ... | configmaps/vswitch-agent-cfg.yaml
+| | Apply Kubernetes resource on all duts | ${nodes}
+| | ... | configmaps/vnf-agent-cfg.yaml
+| | Apply Kubernetes resource on all duts | ${nodes}
+| | ... | pods/contiv-sfc-controller.yaml
+| | Apply Kubernetes resource on all duts | ${nodes}
+| | ... | pods/contiv-vswitch.yaml
+
# Tests teardowns
| Tear down performance discovery test
@@ -613,3 +629,13 @@
| | ... | Vpp Log Macip Acl Settings | ${dut1}
| | Run Keyword And Ignore Error
| | ... | Vpp Log Macip Acl Interface Assignment | ${dut1}
+
+| Tear down performance test with Ligato Kubernetes
+| | [Documentation] | Common test teardown for ndrdisc and pdrdisc performance \
+| | ... | tests with Ligato Kubernetes.
+| | ...
+| | Run Keyword If Test Failed
+| | ... | Get Kubernetes logs on all DUTs | ${nodes} | csit
+| | Run Keyword If Test Failed
+| | ... | Describe Kubernetes resource on all DUTs | ${nodes} | csit
+| | Delete Kubernetes resource on all DUTs | ${nodes} | csit \ No newline at end of file
diff --git a/resources/templates/kubernetes/calico_v2.4.1.yaml b/resources/templates/kubernetes/calico_v2.6.3.yaml
index 921e6923ca..c77b19cccc 100644
--- a/resources/templates/kubernetes/calico_v2.4.1.yaml
+++ b/resources/templates/kubernetes/calico_v2.6.3.yaml
@@ -1,9 +1,9 @@
-# Calico Version v2.4.1
-# https://docs.projectcalico.org/v2.4/releases#v2.4.1
+# Calico Version v2.6.3
+# https://docs.projectcalico.org/v2.6/releases#v2.6.3
# This manifest includes the following component versions:
-# calico/node:v2.4.1
-# calico/cni:v1.10.0
-# calico/kube-policy-controller:v0.7.0
+# calico/node:v2.6.3
+# calico/cni:v1.11.1
+# calico/kube-controllers:v1.0.1
# This ConfigMap is used to configure a self-hosted Calico installation.
kind: ConfigMap
@@ -66,6 +66,11 @@ spec:
spec:
# Only run this pod on the master.
tolerations:
+ # this taint is set by all kubelets running `--cloud-provider=external`
+ # so we should tolerate it to schedule the calico pods
+ - key: node.cloudprovider.kubernetes.io/uninitialized
+ value: "true"
+ effect: NoSchedule
- key: node-role.kubernetes.io/master
effect: NoSchedule
# Allow this pod to be rescheduled while the node is in "critical add-ons only" mode.
@@ -142,6 +147,11 @@ spec:
spec:
hostNetwork: true
tolerations:
+ # this taint is set by all kubelets running `--cloud-provider=external`
+ # so we should tolerate it to schedule the calico pods
+ - key: node.cloudprovider.kubernetes.io/uninitialized
+ value: "true"
+ effect: NoSchedule
- key: node-role.kubernetes.io/master
effect: NoSchedule
# Allow this pod to be rescheduled while the node is in "critical add-ons only" mode.
@@ -149,12 +159,15 @@ spec:
- key: CriticalAddonsOnly
operator: Exists
serviceAccountName: calico-cni-plugin
+ # Minimize downtime during a rolling upgrade or deletion; tell Kubernetes to do a "force
+ # deletion": https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods.
+ terminationGracePeriodSeconds: 0
containers:
# Runs calico/node container on each Kubernetes node. This
# container programs network policy and routes on each
# host.
- name: calico-node
- image: quay.io/calico/node:v2.4.1
+ image: quay.io/calico/node:v2.6.3
env:
# The location of the Calico etcd cluster.
- name: ETCD_ENDPOINTS
@@ -171,6 +184,11 @@ spec:
# Cluster type to identify the deployment type
- name: CLUSTER_TYPE
value: "kubeadm,bgp"
+ # Set noderef for node controller.
+ - name: CALICO_K8S_NODE_REF
+ valueFrom:
+ fieldRef:
+ fieldPath: spec.nodeName
# Disable file logging so `kubectl logs` works.
- name: CALICO_DISABLE_FILE_LOGGING
value: "true"
@@ -191,11 +209,11 @@ spec:
# Set Felix logging to "info"
- name: FELIX_LOGSEVERITYSCREEN
value: "info"
- - name: FELIX_HEALTHENABLED
- value: "true"
# Auto-detect the BGP IP address.
- name: IP
value: ""
+ - name: FELIX_HEALTHENABLED
+ value: "true"
securityContext:
privileged: true
resources:
@@ -223,7 +241,7 @@ spec:
# This container installs the Calico CNI binaries
# and CNI network config file on each node.
- name: install-cni
- image: quay.io/calico/cni:v1.10.0
+ image: quay.io/calico/cni:v1.11.1
command: ["/install-cni.sh"]
env:
# The location of the Calico etcd cluster.
@@ -261,46 +279,51 @@ spec:
---
-# This manifest deploys the Calico policy controller on Kubernetes.
-# See https://github.com/projectcalico/k8s-policy
+# This manifest deploys the Calico Kubernetes controllers.
+# See https://github.com/projectcalico/kube-controllers
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: calico-policy-controller
+ name: calico-kube-controllers
namespace: kube-system
labels:
- k8s-app: calico-policy
+ k8s-app: calico-kube-controllers
spec:
- # The policy controller can only have a single active instance.
+ # The controllers can only have a single active instance.
replicas: 1
strategy:
type: Recreate
template:
metadata:
- name: calico-policy-controller
+ name: calico-kube-controllers
namespace: kube-system
labels:
- k8s-app: calico-policy-controller
+ k8s-app: calico-kube-controllers
annotations:
# Mark this pod as a critical add-on; when enabled, the critical add-on scheduler
# reserves resources for critical add-on pods so that they can be rescheduled after
# a failure. This annotation works in tandem with the toleration below.
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
- # The policy controller must run in the host network namespace so that
+ # The controllers must run in the host network namespace so that
# it isn't governed by policy that would prevent it from working.
hostNetwork: true
tolerations:
+ # this taint is set by all kubelets running `--cloud-provider=external`
+ # so we should tolerate it to schedule the calico pods
+ - key: node.cloudprovider.kubernetes.io/uninitialized
+ value: "true"
+ effect: NoSchedule
- key: node-role.kubernetes.io/master
effect: NoSchedule
# Allow this pod to be rescheduled while the node is in "critical add-ons only" mode.
# This, along with the annotation above marks this pod as a critical add-on.
- key: CriticalAddonsOnly
operator: Exists
- serviceAccountName: calico-policy-controller
+ serviceAccountName: calico-kube-controllers
containers:
- - name: calico-policy-controller
- image: quay.io/calico/kube-policy-controller:v0.7.0
+ - name: calico-kube-controllers
+ image: quay.io/calico/kube-controllers:v1.0.1
env:
# The location of the Calico etcd cluster.
- name: ETCD_ENDPOINTS
@@ -312,12 +335,52 @@ spec:
# service for API access.
- name: K8S_API
value: "https://kubernetes.default:443"
+ # Choose which controllers to run.
+ - name: ENABLED_CONTROLLERS
+ value: policy,profile,workloadendpoint,node
# Since we're running in the host namespace and might not have KubeDNS
# access, configure the container's /etc/hosts to resolve
# kubernetes.default to the correct service clusterIP.
- name: CONFIGURE_ETC_HOSTS
value: "true"
+
---
+
+# This deployment turns off the old "policy-controller". It should remain at 0 replicas, and then
+# be removed entirely once the new kube-controllers deployment has been deployed above.
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: calico-policy-controller
+ namespace: kube-system
+ labels:
+ k8s-app: calico-policy-controller
+spec:
+ # Turn this deployment off in favor of the kube-controllers deployment above.
+ replicas: 0
+ strategy:
+ type: Recreate
+ template:
+ metadata:
+ name: calico-policy-controller
+ namespace: kube-system
+ labels:
+ k8s-app: calico-policy-controller
+ spec:
+ hostNetwork: true
+ serviceAccountName: calico-kube-controllers
+ containers:
+ - name: calico-policy-controller
+ image: quay.io/calico/kube-controllers:v1.0.1
+ env:
+ - name: ETCD_ENDPOINTS
+ valueFrom:
+ configMapKeyRef:
+ name: calico-config
+ key: etcd_endpoints
+
+---
+
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
@@ -330,12 +393,13 @@ subjects:
- kind: ServiceAccount
name: calico-cni-plugin
namespace: kube-system
+
---
+
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: calico-cni-plugin
- namespace: kube-system
rules:
- apiGroups: [""]
resources:
@@ -343,31 +407,36 @@ rules:
- nodes
verbs:
- get
+
---
+
apiVersion: v1
kind: ServiceAccount
metadata:
name: calico-cni-plugin
namespace: kube-system
+
---
+
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
- name: calico-policy-controller
+ name: calico-kube-controllers
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
- name: calico-policy-controller
+ name: calico-kube-controllers
subjects:
- kind: ServiceAccount
- name: calico-policy-controller
+ name: calico-kube-controllers
namespace: kube-system
+
---
+
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
- name: calico-policy-controller
- namespace: kube-system
+ name: calico-kube-controllers
rules:
- apiGroups:
- ""
@@ -376,12 +445,15 @@ rules:
- pods
- namespaces
- networkpolicies
+ - nodes
verbs:
- watch
- list
+
---
+
apiVersion: v1
kind: ServiceAccount
metadata:
- name: calico-policy-controller
+ name: calico-kube-controllers
namespace: kube-system
diff --git a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml
new file mode 100644
index 0000000000..e06146fe86
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml
@@ -0,0 +1,72 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sfc-controller-cfg
+ namespace: csit
+data:
+ etcd.conf: |
+ insecure-transport: true
+ dial-timeout: 1000000000
+ endpoints:
+ - "172.17.0.1:22379"
+
+ sfc.conf: |
+ sfc_controller_config_version: 1
+ description: $$TEST_NAME$$
+ host_entities:
+ - name: vswitch
+ sfc_entities:
+ - name: vswitch-vnf1
+ description: vswitch to VNF1 - memif
+ type: 3
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF1$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf1
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vswitch-vnf2
+ description: VNF2 to vswitch - memif
+ type: 3
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF2$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf2
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf1-vnf2
+ description: vnf1 to vnf2 via vswitch - memifs
+ type: 8
+ elements:
+ - container: vnf1
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf2
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+
+ vnf.conf: |
+ vnf_plugin_config_version: 1
+ description: VNF config
+ vnf_entities:
+ - name: vnf1
+ container: vnf1
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf2
+ container: vnf2
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
diff --git a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml
new file mode 100644
index 0000000000..5cdf99e6ec
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml
@@ -0,0 +1,108 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sfc-controller-cfg
+ namespace: csit
+data:
+ etcd.conf: |
+ insecure-transport: true
+ dial-timeout: 1000000000
+ endpoints:
+ - "172.17.0.1:22379"
+
+ sfc.conf: |
+ sfc_controller_config_version: 1
+ description: $$TEST_NAME$$
+ host_entities:
+ - name: vswitch
+ sfc_entities:
+ - name: vswitch-vnf1
+ description: vswitch to VNF1 - memif
+ type: 4
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF1$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf1
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vswitch-vnf4
+ description: VNF4 to vswitch - memif
+ type: 4
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF2$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf4
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf1-vnf2
+ description: vnf1 to vnf2 via vswitch - memifs
+ type: 8
+ elements:
+ - container: vnf1
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf2
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf2-vnf3
+ description: vnf2 to vnf3 via vswitch memifs
+ type: 8
+ elements:
+ - container: vnf2
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf3
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf3-vnf4
+ description: vnf3 to vnf4 via vswitch memifs
+ type: 8
+ elements:
+ - container: vnf3
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf4
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+
+ vnf.conf: |
+ vnf_plugin_config_version: 1
+ description: VNF config
+ vnf_entities:
+ - name: vnf1
+ container: vnf1
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf2
+ container: vnf2
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf3
+ container: vnf3
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf4
+ container: vnf4
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
diff --git a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml
new file mode 100644
index 0000000000..150772ca25
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml
@@ -0,0 +1,72 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sfc-controller-cfg
+ namespace: csit
+data:
+ etcd.conf: |
+ insecure-transport: true
+ dial-timeout: 1000000000
+ endpoints:
+ - "172.17.0.1:22379"
+
+ sfc.conf: |
+ sfc_controller_config_version: 1
+ description: $$TEST_NAME$$
+ host_entities:
+ - name: vswitch
+ sfc_entities:
+ - name: vswitch-vnf1
+ description: vswitch to VNF1 - memif
+ type: 4
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF1$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf1
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vswitch-vnf2
+ description: VNF2 to vswitch - memif
+ type: 4
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF2$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf2
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf1-vnf2
+ description: vnf1 to vnf2 via vswitch - memifs
+ type: 5
+ elements:
+ - container: vnf1
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf2
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+
+ vnf.conf: |
+ vnf_plugin_config_version: 1
+ description: VNF config
+ vnf_entities:
+ - name: vnf1
+ container: vnf1
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf2
+ container: vnf2
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
diff --git a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc.yaml
new file mode 100644
index 0000000000..a9f07775e5
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc.yaml
@@ -0,0 +1,108 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sfc-controller-cfg
+ namespace: csit
+data:
+ etcd.conf: |
+ insecure-transport: true
+ dial-timeout: 1000000000
+ endpoints:
+ - "172.17.0.1:22379"
+
+ sfc.conf: |
+ sfc_controller_config_version: 1
+ description: $$TEST_NAME$$
+ host_entities:
+ - name: vswitch
+ sfc_entities:
+ - name: vswitch-vnf1
+ description: vswitch to VNF1 - memif
+ type: 4
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF1$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf1
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vswitch-vnf4
+ description: VNF4 to vswitch - memif
+ type: 4
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF2$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf4
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf1-vnf2
+ description: vnf1 to vnf2 via vswitch - memifs
+ type: 5
+ elements:
+ - container: vnf1
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf2
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf2-vnf3
+ description: vnf2 to vnf3 via vswitch memifs
+ type: 5
+ elements:
+ - container: vnf2
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf3
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf3-vnf4
+ description: vnf3 to vnf4 via vswitch memifs
+ type: 5
+ elements:
+ - container: vnf3
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf4
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+
+ vnf.conf: |
+ vnf_plugin_config_version: 1
+ description: VNF config
+ vnf_entities:
+ - name: vnf1
+ container: vnf1
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf2
+ container: vnf2
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf3
+ container: vnf3
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf4
+ container: vnf4
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
diff --git a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc.yaml
new file mode 100644
index 0000000000..c9693aa9a1
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc.yaml
@@ -0,0 +1,72 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sfc-controller-cfg
+ namespace: csit
+data:
+ etcd.conf: |
+ insecure-transport: true
+ dial-timeout: 1000000000
+ endpoints:
+ - "172.17.0.1:22379"
+
+ sfc.conf: |
+ sfc_controller_config_version: 1
+ description: $$TEST_NAME$$
+ host_entities:
+ - name: vswitch
+ sfc_entities:
+ - name: vswitch-vnf1
+ description: vswitch to VNF1 - memif
+ type: 3
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF1$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf1
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vswitch-vnf2
+ description: VNF2 to vswitch - memif
+ type: 3
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF2$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf2
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf1-vnf2
+ description: vnf1 to vnf2 via direct - memifs
+ type: 6
+ elements:
+ - container: vnf1
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf2
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+
+ vnf.conf: |
+ vnf_plugin_config_version: 1
+ description: VNF config
+ vnf_entities:
+ - name: vnf1
+ container: vnf1
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf2
+ container: vnf2
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
diff --git a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc.yaml
new file mode 100644
index 0000000000..4a2ba86977
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc.yaml
@@ -0,0 +1,108 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sfc-controller-cfg
+ namespace: csit
+data:
+ etcd.conf: |
+ insecure-transport: true
+ dial-timeout: 1000000000
+ endpoints:
+ - "172.17.0.1:22379"
+
+ sfc.conf: |
+ sfc_controller_config_version: 1
+ description: $$TEST_NAME$$
+ host_entities:
+ - name: vswitch
+ sfc_entities:
+ - name: vswitch-vnf1
+ description: vswitch to VNF1 - memif
+ type: 3
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF1$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf1
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vswitch-vnf4
+ description: VNF4 to vswitch - memif
+ type: 3
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF2$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf4
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf1-vnf2
+ description: vnf1 to vnf2 via direct - memifs
+ type: 6
+ elements:
+ - container: vnf1
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf2
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf2-vnf3
+ description: vnf2 to vnf3 via direct - memifs
+ type: 6
+ elements:
+ - container: vnf2
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf3
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf3-vnf4
+ description: vnf3 to vnf4 via direct - memifs
+ type: 6
+ elements:
+ - container: vnf3
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf4
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+
+ vnf.conf: |
+ vnf_plugin_config_version: 1
+ description: VNF config
+ vnf_entities:
+ - name: vnf1
+ container: vnf1
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf2
+ container: vnf2
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf3
+ container: vnf3
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf4
+ container: vnf4
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
diff --git a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc.yaml
new file mode 100644
index 0000000000..9b4c189cac
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc.yaml
@@ -0,0 +1,72 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sfc-controller-cfg
+ namespace: csit
+data:
+ etcd.conf: |
+ insecure-transport: true
+ dial-timeout: 1000000000
+ endpoints:
+ - "172.17.0.1:22379"
+
+ sfc.conf: |
+ sfc_controller_config_version: 1
+ description: $$TEST_NAME$$
+ host_entities:
+ - name: vswitch
+ sfc_entities:
+ - name: vswitch-vnf1
+ description: vswitch to VNF1 - memif
+ type: 4
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF1$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf1
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vswitch-vnf2
+ description: VNF2 to vswitch - memif
+ type: 4
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF2$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf2
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf1-vnf2
+ description: vnf1 to vnf2 via vswitch - memifs
+ type: 6
+ elements:
+ - container: vnf1
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf2
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+
+ vnf.conf: |
+ vnf_plugin_config_version: 1
+ description: VNF config
+ vnf_entities:
+ - name: vnf1
+ container: vnf1
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf2
+ container: vnf2
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
diff --git a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc.yaml
new file mode 100644
index 0000000000..eeffa52784
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc.yaml
@@ -0,0 +1,108 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sfc-controller-cfg
+ namespace: csit
+data:
+ etcd.conf: |
+ insecure-transport: true
+ dial-timeout: 1000000000
+ endpoints:
+ - "172.17.0.1:22379"
+
+ sfc.conf: |
+ sfc_controller_config_version: 1
+ description: $$TEST_NAME$$
+ host_entities:
+ - name: vswitch
+ sfc_entities:
+ - name: vswitch-vnf1
+ description: vswitch to VNF1 - memif
+ type: 4
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF1$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf1
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vswitch-vnf4
+ description: VNF4 to vswitch - memif
+ type: 4
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF2$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf4
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf1-vnf2
+ description: vnf1 to vnf2 via vswitch - memifs
+ type: 6
+ elements:
+ - container: vnf1
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf2
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf2-vnf3
+ description: vnf2 to vnf3 via direct memifs
+ type: 6
+ elements:
+ - container: vnf2
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf3
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf3-vnf4
+ description: vnf3 to vnf4 via direct memifs
+ type: 6
+ elements:
+ - container: vnf3
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - container: vnf4
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+
+ vnf.conf: |
+ vnf_plugin_config_version: 1
+ description: VNF config
+ vnf_entities:
+ - name: vnf1
+ container: vnf1
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf2
+ container: vnf2
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf3
+ container: vnf3
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
+ - name: vnf4
+ container: vnf4
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
diff --git a/resources/templates/kubernetes/configmaps/pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml b/resources/templates/kubernetes/configmaps/pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml
new file mode 100644
index 0000000000..b3b2d6ec80
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml
@@ -0,0 +1,62 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sfc-controller-cfg
+ namespace: csit
+data:
+ etcd.conf: |
+ insecure-transport: true
+ dial-timeout: 1000000000
+ endpoints:
+ - "172.17.0.1:22379"
+
+ sfc.conf: |
+ sfc_controller_config_version: 1
+ description: $$TEST_NAME$$
+ host_entities:
+ - name: vswitch
+ sfc_entities:
+ - name: vswitch-vnf1
+ description: vswitch to VNF1 - memif
+ type: 3
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF1$$
+ etcd_vpp_switch_key: vswitch
+ l2fib_macs:
+ - "$$TG_IF1_MAC1$$"
+ type: 5
+ - container: vnf1
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ l2fib_macs:
+ - "$$TG_IF2_MAC1$$"
+ type: 2
+ - name: vnf1-vswitch
+ description: VNF1 to vswitch - memif
+ type: 3
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF2$$
+ etcd_vpp_switch_key: vswitch
+ l2fib_macs:
+ - "$$TG_IF2_MAC1$$"
+ type: 5
+ - container: vnf1
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ l2fib_macs:
+ - "$$TG_IF1_MAC1$$"
+ type: 2
+
+ vnf.conf: |
+ vnf_plugin_config_version: 1
+ description: VNF config
+ vnf_entities:
+ - name: vnf1
+ container: vnf1
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2 \ No newline at end of file
diff --git a/resources/templates/kubernetes/configmaps/pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml b/resources/templates/kubernetes/configmaps/pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml
new file mode 100644
index 0000000000..ed23311278
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml
@@ -0,0 +1,54 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sfc-controller-cfg
+ namespace: csit
+data:
+ etcd.conf: |
+ insecure-transport: true
+ dial-timeout: 1000000000
+ endpoints:
+ - "172.17.0.1:22379"
+
+ sfc.conf: |
+ sfc_controller_config_version: 1
+ description: $$TEST_NAME$$
+ host_entities:
+ - name: vswitch
+ sfc_entities:
+ - name: vswitch-vnf1
+ description: vswitch to VNF1 - memif
+ type: 4
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF1$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf1
+ port_label: port1
+ etcd_vpp_switch_key: vswitch
+ type: 2
+ - name: vnf1-vswitch
+ description: VNF1 to vswitch - memif
+ type: 4
+ elements:
+ - container: vswitch
+ port_label: $$VSWITCH_IF2$$
+ etcd_vpp_switch_key: vswitch
+ type: 5
+ - container: vnf1
+ port_label: port2
+ etcd_vpp_switch_key: vswitch
+ type: 2
+
+ vnf.conf: |
+ vnf_plugin_config_version: 1
+ description: VNF config
+ vnf_entities:
+ - name: vnf1
+ container: vnf1
+ l2xconnects:
+ - port_labels:
+ - port1
+ - port2
diff --git a/resources/templates/kubernetes/configmaps/vnf-agent-cfg.yaml b/resources/templates/kubernetes/configmaps/vnf-agent-cfg.yaml
new file mode 100644
index 0000000000..77869d4111
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/vnf-agent-cfg.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: vnf-agent-cfg
+ namespace: csit
+data:
+ etcd.conf: |
+ insecure-transport: true
+ dial-timeout: 1000000000
+ endpoints:
+ - "172.17.0.1:22379"
+
+ kafka.conf: |
+ addrs:
+ - "172.17.0.1:9092" \ No newline at end of file
diff --git a/resources/templates/kubernetes/configmaps/vswitch-agent-cfg.yaml b/resources/templates/kubernetes/configmaps/vswitch-agent-cfg.yaml
new file mode 100644
index 0000000000..5c97b4d64f
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/vswitch-agent-cfg.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: vswitch-agent-cfg
+ namespace: csit
+data:
+ etcd.conf: |
+ insecure-transport: true
+ dial-timeout: 1000000000
+ endpoints:
+ - "172.17.0.1:22379"
+
+ kafka.conf: |
+ addrs:
+ - "172.17.0.1:9092" \ No newline at end of file
diff --git a/resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml b/resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml
deleted file mode 100644
index 726e9734ab..0000000000
--- a/resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml
+++ /dev/null
@@ -1,206 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: sfc-controller-cfg
- namespace: csit
-data:
- etcd.conf:
- insecure-transport: true
- dial-timeout: 1000000000
- endpoints:
- - "172.17.0.1:22379"
-
- sfc.conf:
- sfc_controller_config_version: 1
- description: $$TEST_NAME$$
- host_entities:
- - name: vswitch
- sfc_entities:
- - name: vswitch-vnf1
- description: vswitch to VNF1 - memif
- type: 3
- elements:
- - container: vswitch
- port_label: $$VSWITCH_IF1$$
- etcd_vpp_switch_key: vswitch
- type: 5
- - container: vnf1
- port_label: port1
- etcd_vpp_switch_key: vswitch
- type: 2
- - name: vnf1-vswitch
- description: VNF1 to vswitch - memif
- type: 3
- elements:
- - container: vswitch
- port_label: $$VSWITCH_IF2$$
- etcd_vpp_switch_key: vswitch
- type: 5
- - container: vnf1
- port_label: port2
- etcd_vpp_switch_key: vswitch
- type: 2
-
- vnf.conf:
- vnf_plugin_config_version: 1
- description: VNF config
- vnf_entities:
- - name: vnf1
- container: vnf1
- l2xconnects:
- - port_labels:
- - port1
- - port2
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: sfc-controller
- namespace: csit
-spec:
- containers:
- - name: "sfc-controller"
- image: prod_sfc_controller
- imagePullPolicy: IfNotPresent
- command:
- - /bin/sfc-controller
- - -etcdv3-config=/opt/sfc-controller/dev/etcd.conf
- - -sfc-config=/opt/sfc-controller/dev/sfc.conf
- - -vnf-config=/opt/sfc-controller/dev/vnf.conf
- volumeMounts:
- - name: controller-config
- mountPath: /opt/sfc-controller/dev
- volumes:
- - name: controller-config
- configMap:
- name: sfc-controller-cfg
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: vswitch-agent-cfg
- namespace: csit
-data:
- etcd.conf:
- insecure-transport: true
- dial-timeout: 1000000000
- endpoints:
- - "172.17.0.1:22379"
-
- kafka.conf:
- addrs:
- - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: vswitch-vpp
- namespace: csit
-spec:
- hostNetwork: true
- containers:
- - name: "vswitch"
- image: prod_vpp_agent_shrink
- imagePullPolicy: IfNotPresent
- securityContext:
- privileged: true
- ports:
- - containerPort: 5002
- - containerPort: 9191
- readinessProbe:
- httpGet:
- path: /readiness
- port: 9191
- periodSeconds: 1
- livenessProbe:
- httpGet:
- path: /liveness
- port: 9191
- periodSeconds: 1
- initialDelaySeconds: 15
- env:
- - name: MICROSERVICE_LABEL
- value: vswitch
- volumeMounts:
- - name: vpp-config
- mountPath: /etc/vpp
- - name: agent-config
- mountPath: /opt/vpp-agent/dev
- - name: memif-sockets
- mountPath: /tmp
- volumes:
- - name: vpp-config
- configMap:
- name: vswitch-vpp-cfg
- - name: agent-config
- configMap:
- name: vswitch-agent-cfg
- - name: memif-sockets
- hostPath:
- path: /tmp
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: vnf-agent-cfg
- namespace: csit
-data:
- etcd.conf:
- insecure-transport: true
- dial-timeout: 1000000000
- endpoints:
- - "172.17.0.1:22379"
-
- kafka.conf:
- addrs:
- - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: vnf-vpp
- namespace: csit
-spec:
- containers:
- - name: "vnf"
- image: prod_vpp_agent_shrink
- imagePullPolicy: IfNotPresent
- securityContext:
- privileged: true
- ports:
- - containerPort: 5002
- - containerPort: 9191
- readinessProbe:
- httpGet:
- path: /readiness
- port: 9191
- periodSeconds: 1
- livenessProbe:
- httpGet:
- path: /liveness
- port: 9191
- initialDelaySeconds: 15
- env:
- - name: MICROSERVICE_LABEL
- value: vnf1
- volumeMounts:
- - name: vpp-config
- mountPath: /etc/vpp
- - name: agent-config
- mountPath: /opt/vpp-agent/dev
- - name: memif-sockets
- mountPath: /tmp
- volumes:
- - name: vpp-config
- configMap:
- name: vnf-vpp-cfg
- - name: agent-config
- configMap:
- name: vnf-agent-cfg
- - name: memif-sockets
- hostPath:
- path: /tmp
diff --git a/resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml b/resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml
deleted file mode 100644
index 5bf290d0ee..0000000000
--- a/resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml
+++ /dev/null
@@ -1,271 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: sfc-controller-cfg
- namespace: csit
-data:
- etcd.conf:
- insecure-transport: true
- dial-timeout: 1000000000
- endpoints:
- - "172.17.0.1:22379"
-
- sfc.conf:
- sfc_controller_config_version: 1
- description: $$TEST_NAME$$
- host_entities:
- - name: vswitch
- sfc_entities:
- - name: vswitch-vnf1
- description: vswitch to VNF1 - memif
- type: 3
- elements:
- - container: vswitch
- port_label: $$VSWITCH_IF1$$
- etcd_vpp_switch_key: vswitch
- type: 5
- - container: vnf1
- port_label: port1
- etcd_vpp_switch_key: vswitch
- type: 2
- - name: vswitch-vnf2
- description: VNF2 to vswitch - memif
- type: 3
- elements:
- - container: vswitch
- port_label: $$VSWITCH_IF2$$
- etcd_vpp_switch_key: vswitch
- type: 5
- - container: vnf2
- port_label: port2
- etcd_vpp_switch_key: vswitch
- type: 2
- - name: vnf1-vnf2
- description: vnf1 to vnf2 via vswitch - memifs
- type: 2
- elements:
- - container: vnf1
- port_label: port2
- etcd_vpp_switch_key: vswitch
- type: 2
- - container: vnf2
- port_label: port1
- etcd_vpp_switch_key: vswitch
- type: 2
-
- vnf.conf:
- vnf_plugin_config_version: 1
- description: VNF config
- vnf_entities:
- - name: vnf1
- container: vnf1
- l2xconnects:
- - port_labels:
- - port1
- - port2
- - name: vnf2
- container: vnf2
- l2xconnects:
- - port_labels:
- - port1
- - port2
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: sfc-controller
- namespace: csit
-spec:
- containers:
- - name: "sfc-controller"
- image: prod_sfc_controller
- imagePullPolicy: IfNotPresent
- command:
- - /bin/sfc-controller
- - -etcdv3-config=/opt/sfc-controller/dev/etcd.conf
- - -sfc-config=/opt/sfc-controller/dev/sfc.conf
- - -vnf-config=/opt/sfc-controller/dev/vnf.conf
- volumeMounts:
- - name: controller-config
- mountPath: /opt/sfc-controller/dev
- volumes:
- - name: controller-config
- configMap:
- name: sfc-controller-cfg
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: vswitch-agent-cfg
- namespace: csit
-data:
- etcd.conf:
- insecure-transport: true
- dial-timeout: 1000000000
- endpoints:
- - "172.17.0.1:22379"
-
- kafka.conf:
- addrs:
- - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: vswitch-vpp
- namespace: csit
-spec:
- hostNetwork: true
- containers:
- - name: "vswitch"
- image: prod_vpp_agent_shrink
- imagePullPolicy: IfNotPresent
- securityContext:
- privileged: true
- ports:
- - containerPort: 5002
- - containerPort: 9191
- readinessProbe:
- httpGet:
- path: /readiness
- port: 9191
- periodSeconds: 1
- livenessProbe:
- httpGet:
- path: /liveness
- port: 9191
- periodSeconds: 1
- initialDelaySeconds: 15
- env:
- - name: MICROSERVICE_LABEL
- value: vswitch
- volumeMounts:
- - name: vpp-config
- mountPath: /etc/vpp
- - name: agent-config
- mountPath: /opt/vpp-agent/dev
- - name: memif-sockets
- mountPath: /tmp
- volumes:
- - name: vpp-config
- configMap:
- name: vswitch-vpp-cfg
- - name: agent-config
- configMap:
- name: vswitch-agent-cfg
- - name: memif-sockets
- hostPath:
- path: /tmp
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: vnf-agent-cfg
- namespace: csit
-data:
- etcd.conf:
- insecure-transport: true
- dial-timeout: 1000000000
- endpoints:
- - "172.17.0.1:22379"
-
- kafka.conf:
- addrs:
- - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: vnf1-vpp
- namespace: csit
-spec:
- containers:
- - name: "vnf1"
- image: prod_vpp_agent_shrink
- imagePullPolicy: IfNotPresent
- securityContext:
- privileged: true
- ports:
- - containerPort: 5002
- - containerPort: 9191
- readinessProbe:
- httpGet:
- path: /readiness
- port: 9191
- periodSeconds: 1
- livenessProbe:
- httpGet:
- path: /liveness
- port: 9191
- initialDelaySeconds: 15
- env:
- - name: MICROSERVICE_LABEL
- value: vnf1
- volumeMounts:
- - name: vpp-config
- mountPath: /etc/vpp
- - name: agent-config
- mountPath: /opt/vpp-agent/dev
- - name: memif-sockets
- mountPath: /tmp
- volumes:
- - name: vpp-config
- configMap:
- name: vnf1-vpp-cfg
- - name: agent-config
- configMap:
- name: vnf-agent-cfg
- - name: memif-sockets
- hostPath:
- path: /tmp
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: vnf2-vpp
- namespace: csit
-spec:
- containers:
- - name: "vnf2"
- image: prod_vpp_agent_shrink
- imagePullPolicy: IfNotPresent
- securityContext:
- privileged: true
- ports:
- - containerPort: 5002
- - containerPort: 9191
- readinessProbe:
- httpGet:
- path: /readiness
- port: 9191
- periodSeconds: 1
- livenessProbe:
- httpGet:
- path: /liveness
- port: 9191
- initialDelaySeconds: 15
- env:
- - name: MICROSERVICE_LABEL
- value: vnf2
- volumeMounts:
- - name: vpp-config
- mountPath: /etc/vpp
- - name: agent-config
- mountPath: /opt/vpp-agent/dev
- - name: memif-sockets
- mountPath: /tmp
- volumes:
- - name: vpp-config
- configMap:
- name: vnf2-vpp-cfg
- - name: agent-config
- configMap:
- name: vnf-agent-cfg
- - name: memif-sockets
- hostPath:
- path: /tmp
diff --git a/resources/templates/kubernetes/eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml b/resources/templates/kubernetes/eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml
deleted file mode 100644
index 7514eeb181..0000000000
--- a/resources/templates/kubernetes/eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml
+++ /dev/null
@@ -1,206 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: sfc-controller-cfg
- namespace: csit
-data:
- etcd.conf:
- insecure-transport: true
- dial-timeout: 1000000000
- endpoints:
- - "172.17.0.1:22379"
-
- sfc.conf:
- sfc_controller_config_version: 1
- description: $$TEST_NAME$$
- host_entities:
- - name: vswitch
- sfc_entities:
- - name: vswitch-vnf1
- description: vswitch to VNF1 - memif
- type: 4
- elements:
- - container: vswitch
- port_label: $$VSWITCH_IF1$$
- etcd_vpp_switch_key: vswitch
- type: 5
- - container: vnf1
- port_label: port1
- etcd_vpp_switch_key: vswitch
- type: 2
- - name: vnf1-vswitch
- description: VNF1 to vswitch - memif
- type: 4
- elements:
- - container: vswitch
- port_label: $$VSWITCH_IF2$$
- etcd_vpp_switch_key: vswitch
- type: 5
- - container: vnf1
- port_label: port2
- etcd_vpp_switch_key: vswitch
- type: 2
-
- vnf.conf:
- vnf_plugin_config_version: 1
- description: VNF config
- vnf_entities:
- - name: vnf1
- container: vnf1
- l2xconnects:
- - port_labels:
- - port1
- - port2
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: sfc-controller
- namespace: csit
-spec:
- containers:
- - name: "sfc-controller"
- image: prod_sfc_controller
- imagePullPolicy: IfNotPresent
- command:
- - /bin/sfc-controller
- - -etcdv3-config=/opt/sfc-controller/dev/etcd.conf
- - -sfc-config=/opt/sfc-controller/dev/sfc.conf
- - -vnf-config=/opt/sfc-controller/dev/vnf.conf
- volumeMounts:
- - name: controller-config
- mountPath: /opt/sfc-controller/dev
- volumes:
- - name: controller-config
- configMap:
- name: sfc-controller-cfg
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: vswitch-agent-cfg
- namespace: csit
-data:
- etcd.conf:
- insecure-transport: true
- dial-timeout: 1000000000
- endpoints:
- - "172.17.0.1:22379"
-
- kafka.conf:
- addrs:
- - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: vswitch-vpp
- namespace: csit
-spec:
- hostNetwork: true
- containers:
- - name: "vswitch"
- image: prod_vpp_agent_shrink
- imagePullPolicy: IfNotPresent
- securityContext:
- privileged: true
- ports:
- - containerPort: 5002
- - containerPort: 9191
- readinessProbe:
- httpGet:
- path: /readiness
- port: 9191
- periodSeconds: 1
- livenessProbe:
- httpGet:
- path: /liveness
- port: 9191
- periodSeconds: 1
- initialDelaySeconds: 15
- env:
- - name: MICROSERVICE_LABEL
- value: vswitch
- volumeMounts:
- - name: vpp-config
- mountPath: /etc/vpp
- - name: agent-config
- mountPath: /opt/vpp-agent/dev
- - name: memif-sockets
- mountPath: /tmp
- volumes:
- - name: vpp-config
- configMap:
- name: vswitch-vpp-cfg
- - name: agent-config
- configMap:
- name: vswitch-agent-cfg
- - name: memif-sockets
- hostPath:
- path: /tmp
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: vnf-agent-cfg
- namespace: csit
-data:
- etcd.conf:
- insecure-transport: true
- dial-timeout: 1000000000
- endpoints:
- - "172.17.0.1:22379"
-
- kafka.conf:
- addrs:
- - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: vnf-vpp
- namespace: csit
-spec:
- containers:
- - name: "vnf"
- image: prod_vpp_agent_shrink
- imagePullPolicy: IfNotPresent
- securityContext:
- privileged: true
- ports:
- - containerPort: 5002
- - containerPort: 9191
- readinessProbe:
- httpGet:
- path: /readiness
- port: 9191
- periodSeconds: 1
- livenessProbe:
- httpGet:
- path: /liveness
- port: 9191
- initialDelaySeconds: 15
- env:
- - name: MICROSERVICE_LABEL
- value: vnf1
- volumeMounts:
- - name: vpp-config
- mountPath: /etc/vpp
- - name: agent-config
- mountPath: /opt/vpp-agent/dev
- - name: memif-sockets
- mountPath: /tmp
- volumes:
- - name: vpp-config
- configMap:
- name: vnf-vpp-cfg
- - name: agent-config
- configMap:
- name: vnf-agent-cfg
- - name: memif-sockets
- hostPath:
- path: /tmp
diff --git a/resources/templates/kubernetes/eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml b/resources/templates/kubernetes/eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml
deleted file mode 100644
index f2b03e670a..0000000000
--- a/resources/templates/kubernetes/eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml
+++ /dev/null
@@ -1,271 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: sfc-controller-cfg
- namespace: csit
-data:
- etcd.conf:
- insecure-transport: true
- dial-timeout: 1000000000
- endpoints:
- - "172.17.0.1:22379"
-
- sfc.conf:
- sfc_controller_config_version: 1
- description: $$TEST_NAME$$
- host_entities:
- - name: vswitch
- sfc_entities:
- - name: vswitch-vnf1
- description: vswitch to VNF1 - memif
- type: 4
- elements:
- - container: vswitch
- port_label: $$VSWITCH_IF1$$
- etcd_vpp_switch_key: vswitch
- type: 5
- - container: vnf1
- port_label: port1
- etcd_vpp_switch_key: vswitch
- type: 2
- - name: vswitch-vnf2
- description: VNF2 to vswitch - memif
- type: 4
- elements:
- - container: vswitch
- port_label: $$VSWITCH_IF2$$
- etcd_vpp_switch_key: vswitch
- type: 5
- - container: vnf2
- port_label: port2
- etcd_vpp_switch_key: vswitch
- type: 2
- - name: vnf1-vnf2
- description: vnf1 to vnf2 via vswitch - memifs
- type: 5
- elements:
- - container: vnf1
- port_label: port2
- etcd_vpp_switch_key: vswitch
- type: 2
- - container: vnf2
- port_label: port1
- etcd_vpp_switch_key: vswitch
- type: 2
-
- vnf.conf:
- vnf_plugin_config_version: 1
- description: VNF config
- vnf_entities:
- - name: vnf1
- container: vnf1
- l2xconnects:
- - port_labels:
- - port1
- - port2
- - name: vnf2
- container: vnf2
- l2xconnects:
- - port_labels:
- - port1
- - port2
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: sfc-controller
- namespace: csit
-spec:
- containers:
- - name: "sfc-controller"
- image: prod_sfc_controller
- imagePullPolicy: IfNotPresent
- command:
- - /bin/sfc-controller
- - -etcdv3-config=/opt/sfc-controller/dev/etcd.conf
- - -sfc-config=/opt/sfc-controller/dev/sfc.conf
- - -vnf-config=/opt/sfc-controller/dev/vnf.conf
- volumeMounts:
- - name: controller-config
- mountPath: /opt/sfc-controller/dev
- volumes:
- - name: controller-config
- configMap:
- name: sfc-controller-cfg
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: vswitch-agent-cfg
- namespace: csit
-data:
- etcd.conf:
- insecure-transport: true
- dial-timeout: 1000000000
- endpoints:
- - "172.17.0.1:22379"
-
- kafka.conf:
- addrs:
- - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: vswitch-vpp
- namespace: csit
-spec:
- hostNetwork: true
- containers:
- - name: "vswitch"
- image: prod_vpp_agent_shrink
- imagePullPolicy: IfNotPresent
- securityContext:
- privileged: true
- ports:
- - containerPort: 5002
- - containerPort: 9191
- readinessProbe:
- httpGet:
- path: /readiness
- port: 9191
- periodSeconds: 1
- livenessProbe:
- httpGet:
- path: /liveness
- port: 9191
- periodSeconds: 1
- initialDelaySeconds: 15
- env:
- - name: MICROSERVICE_LABEL
- value: vswitch
- volumeMounts:
- - name: vpp-config
- mountPath: /etc/vpp
- - name: agent-config
- mountPath: /opt/vpp-agent/dev
- - name: memif-sockets
- mountPath: /tmp
- volumes:
- - name: vpp-config
- configMap:
- name: vswitch-vpp-cfg
- - name: agent-config
- configMap:
- name: vswitch-agent-cfg
- - name: memif-sockets
- hostPath:
- path: /tmp
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: vnf-agent-cfg
- namespace: csit
-data:
- etcd.conf:
- insecure-transport: true
- dial-timeout: 1000000000
- endpoints:
- - "172.17.0.1:22379"
-
- kafka.conf:
- addrs:
- - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: vnf1-vpp
- namespace: csit
-spec:
- containers:
- - name: "vnf1"
- image: prod_vpp_agent_shrink
- imagePullPolicy: IfNotPresent
- securityContext:
- privileged: true
- ports:
- - containerPort: 5002
- - containerPort: 9191
- readinessProbe:
- httpGet:
- path: /readiness
- port: 9191
- periodSeconds: 1
- livenessProbe:
- httpGet:
- path: /liveness
- port: 9191
- initialDelaySeconds: 15
- env:
- - name: MICROSERVICE_LABEL
- value: vnf1
- volumeMounts:
- - name: vpp-config
- mountPath: /etc/vpp
- - name: agent-config
- mountPath: /opt/vpp-agent/dev
- - name: memif-sockets
- mountPath: /tmp
- volumes:
- - name: vpp-config
- configMap:
- name: vnf1-vpp-cfg
- - name: agent-config
- configMap:
- name: vnf-agent-cfg
- - name: memif-sockets
- hostPath:
- path: /tmp
-
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: vnf2-vpp
- namespace: csit
-spec:
- containers:
- - name: "vnf2"
- image: prod_vpp_agent_shrink
- imagePullPolicy: IfNotPresent
- securityContext:
- privileged: true
- ports:
- - containerPort: 5002
- - containerPort: 9191
- readinessProbe:
- httpGet:
- path: /readiness
- port: 9191
- periodSeconds: 1
- livenessProbe:
- httpGet:
- path: /liveness
- port: 9191
- initialDelaySeconds: 15
- env:
- - name: MICROSERVICE_LABEL
- value: vnf2
- volumeMounts:
- - name: vpp-config
- mountPath: /etc/vpp
- - name: agent-config
- mountPath: /opt/vpp-agent/dev
- - name: memif-sockets
- mountPath: /tmp
- volumes:
- - name: vpp-config
- configMap:
- name: vnf2-vpp-cfg
- - name: agent-config
- configMap:
- name: vnf-agent-cfg
- - name: memif-sockets
- hostPath:
- path: /tmp
diff --git a/resources/templates/kubernetes/csit.yaml b/resources/templates/kubernetes/namespaces/csit.yaml
index 4ae72063e7..4ae72063e7 100644
--- a/resources/templates/kubernetes/csit.yaml
+++ b/resources/templates/kubernetes/namespaces/csit.yaml
diff --git a/resources/templates/kubernetes/pods/contiv-sfc-controller.yaml b/resources/templates/kubernetes/pods/contiv-sfc-controller.yaml
new file mode 100644
index 0000000000..4fa946dcf3
--- /dev/null
+++ b/resources/templates/kubernetes/pods/contiv-sfc-controller.yaml
@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: Pod
+metadata:
+ name: sfc-controller
+ namespace: csit
+spec:
+ containers:
+ - name: "sfc-controller"
+ image: ligato/prod_sfc_controller
+ imagePullPolicy: IfNotPresent
+ command:
+ - /bin/sfc-controller
+ - -etcdv3-config=/opt/sfc-controller/dev/etcd.conf
+ - -sfc-config=/opt/sfc-controller/dev/sfc.conf
+ - -vnf-config=/opt/sfc-controller/dev/vnf.conf
+ volumeMounts:
+ - name: controller-config
+ mountPath: /opt/sfc-controller/dev
+ volumes:
+ - name: controller-config
+ configMap:
+ name: sfc-controller-cfg \ No newline at end of file
diff --git a/resources/templates/kubernetes/pods/contiv-vnf.yaml b/resources/templates/kubernetes/pods/contiv-vnf.yaml
new file mode 100644
index 0000000000..5ef89b5716
--- /dev/null
+++ b/resources/templates/kubernetes/pods/contiv-vnf.yaml
@@ -0,0 +1,45 @@
+apiVersion: v1
+kind: Pod
+metadata:
+ name: $$VNF$$-vpp
+ namespace: csit
+spec:
+ containers:
+ - name: $$VNF$$
+ image: prod_vpp_agent
+ imagePullPolicy: IfNotPresent
+ securityContext:
+ privileged: true
+ ports:
+ - containerPort: 5002
+ - containerPort: 9191
+ readinessProbe:
+ httpGet:
+ path: /readiness
+ port: 9191
+ periodSeconds: 1
+ livenessProbe:
+ httpGet:
+ path: /liveness
+ port: 9191
+ initialDelaySeconds: 15
+ env:
+ - name: MICROSERVICE_LABEL
+ value: $$VNF$$
+ volumeMounts:
+ - name: vpp-config
+ mountPath: /etc/vpp
+ - name: agent-config
+ mountPath: /opt/vpp-agent/dev
+ - name: memif-sockets
+ mountPath: /tmp
+ volumes:
+ - name: vpp-config
+ configMap:
+ name: $$VNF$$-vpp-cfg
+ - name: agent-config
+ configMap:
+ name: vnf-agent-cfg
+ - name: memif-sockets
+ hostPath:
+ path: /tmp \ No newline at end of file
diff --git a/resources/templates/kubernetes/pods/contiv-vswitch.yaml b/resources/templates/kubernetes/pods/contiv-vswitch.yaml
new file mode 100644
index 0000000000..ed0f449e2d
--- /dev/null
+++ b/resources/templates/kubernetes/pods/contiv-vswitch.yaml
@@ -0,0 +1,52 @@
+apiVersion: v1
+kind: Pod
+metadata:
+ name: vswitch-vpp
+ namespace: csit
+spec:
+ hostNetwork: true
+ containers:
+ - name: "vswitch"
+ image: prod_vpp_agent
+ imagePullPolicy: IfNotPresent
+ securityContext:
+ privileged: true
+ ports:
+ - containerPort: 5002
+ - containerPort: 9191
+ readinessProbe:
+ httpGet:
+ path: /readiness
+ port: 9191
+ periodSeconds: 1
+ livenessProbe:
+ httpGet:
+ path: /liveness
+ port: 9191
+ periodSeconds: 1
+ initialDelaySeconds: 15
+ env:
+ - name: MICROSERVICE_LABEL
+ value: vswitch
+ volumeMounts:
+ - name: vpp-config
+ mountPath: /etc/vpp
+ - name: agent-config
+ mountPath: /opt/vpp-agent/dev
+ - name: memif-sockets
+ mountPath: /tmp
+ - name: device-uio
+ mountPath: /dev
+ volumes:
+ - name: vpp-config
+ configMap:
+ name: vswitch-vpp-cfg
+ - name: agent-config
+ configMap:
+ name: vswitch-agent-cfg
+ - name: memif-sockets
+ hostPath:
+ path: /tmp
+ - name: device-uio
+ hostPath:
+ path: /dev
diff --git a/resources/templates/kubernetes/etcd.yaml b/resources/templates/kubernetes/pods/etcdv3.yaml
index 66c1a57fad..f5f6b32435 100644
--- a/resources/templates/kubernetes/etcd.yaml
+++ b/resources/templates/kubernetes/pods/etcdv3.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Pod
metadata:
- name: etcdv3-server
+ name: etcdv3
namespace: csit
spec:
hostNetwork: true
diff --git a/resources/templates/kubernetes/kafka.yaml b/resources/templates/kubernetes/pods/kafka.yaml
index 55d165f31b..0bb8f1e5d7 100644
--- a/resources/templates/kubernetes/kafka.yaml
+++ b/resources/templates/kubernetes/pods/kafka.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Pod
metadata:
- name: kafka-server
+ name: kafka
namespace: csit
spec:
hostNetwork: true
diff --git a/tests/kubernetes/perf/__init__.robot b/tests/kubernetes/perf/__init__.robot
index b4b6557831..9b58f3d7f6 100644
--- a/tests/kubernetes/perf/__init__.robot
+++ b/tests/kubernetes/perf/__init__.robot
@@ -30,10 +30,9 @@
| ... | skip_tg=${True}
| ... | AND | Update NIC interface names on all duts | ${nodes}
| ...
-| Suite Teardown | Reset Kubernetes on all duts | ${nodes}
-| ...
-*** Keywords ***
+| Suite Teardown | Destroy Kubernetes on all duts | ${nodes}
+*** Keywords ***
| Setup performance global Variables
| | [Documentation]
| | ... | Setup suite Variables. Variables are used across performance testing.
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot
index ace97fe2cc..2f5ee13f8d 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot
@@ -16,21 +16,16 @@
| ...
| 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
+| ... | 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 | Run Keywords
-| ... | Apply Kubernetes resource on all duts | ${nodes} | kafka.yaml
-| ... | AND | Apply Kubernetes resource on all duts | ${nodes} | etcd.yaml
+| Test Setup | Set up performance test with Ligato Kubernetes
| ...
| Suite Teardown | Tear down 3-node performance topology
| ...
-| Test Teardown | Run Keywords
-| ... | Get Kubernetes logs on all DUTs | ${nodes} | AND
-| ... | Describe Kubernetes resource on all DUTs | ${nodes} | AND
-| ... | Delete Kubernetes resource on all duts | ${nodes}
+| Test Teardown | Tear down performance test with Ligato Kubernetes
| ...
| Documentation | *RFC2544: Pkt throughput L2BD test cases*
| ...
@@ -61,14 +56,14 @@
| ${avg_imix_framesize}= | ${357.833}
# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
-# Kubernetes profile
-| ${kubernetes_profile} | eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc
+# SFC profile
+| ${sfc_profile} | configmaps/ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc
# Traffic profile:
| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
# CPU settings
| ${system_cpus}= | ${1}
| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${3}
+| ${vnf_cpus}= | ${2}
*** Keywords ***
| Create Kubernetes VSWITCH startup config on all DUTs
@@ -143,21 +138,30 @@
| | ... | ${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} | name=vswitch-vpp-cfg
-| | ... | key=vpp.conf | src_file=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | name=vnf1-vpp-cfg
-| | ... | key=vpp.conf | src_file=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | name=vnf2-vpp-cfg
-| | ... | key=vpp.conf | src_file=/tmp/vnf2.conf
+| | 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}
-| | ... | ${kubernetes_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | 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}
-| | ... | ${kubernetes_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | ${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}
+| | 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}
@@ -169,7 +173,7 @@
| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc
+| tc01-64B-1t1c-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -180,7 +184,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR
-| tc02-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc
+| tc02-64B-1t1c-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -191,7 +195,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR
-| tc03-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc
+| tc03-IMIX-1t1c-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -203,7 +207,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
-| tc04-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc
+| tc04-IMIX-1t1c-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -215,7 +219,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
-| tc05-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc
+| tc05-1518B-1t1c-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -226,7 +230,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
-| tc06-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc
+| tc06-1518B-1t1c-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -237,7 +241,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
-| tc07-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc
+| tc07-64B-2t2c-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -248,7 +252,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR
-| tc08-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc
+| tc08-64B-2t2c-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -259,7 +263,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR
-| tc09-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc
+| tc09-IMIX-2t2c-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -271,7 +275,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
-| tc10-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc
+| tc10-IMIX-2t2c-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -283,7 +287,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
-| tc11-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc
+| tc11-1518B-2t2c-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -294,7 +298,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
-| tc12-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc
+| tc12-1518B-2t2c-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot
new file mode 100644
index 0000000000..f8cfac7260
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot
@@ -0,0 +1,324 @@
+# 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/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc
+# 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}
+| | 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-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc02-64B-1t1c-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc03-IMIX-1t1c-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 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 10kpps.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc04-IMIX-1t1c-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 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 10kpps, LT=0.5%.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc05-1518B-1t1c-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc06-1518B-1t1c-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc07-64B-2t2c-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc08-64B-2t2c-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR
+
+| tc09-IMIX-2t2c-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 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 10kpps.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc10-IMIX-2t2c-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 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 10kpps, LT=0.5%.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
+
+| tc11-1518B-2t2c-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc12-1518B-2t2c-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot
index e10d21ca3a..62b42a4ea2 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot
@@ -16,21 +16,16 @@
| ...
| 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
+| ... | 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 | Run Keywords
-| ... | Apply Kubernetes resource on all duts | ${nodes} | kafka.yaml
-| ... | AND | Apply Kubernetes resource on all duts | ${nodes} | etcd.yaml
+| Test Setup | Set up performance test with Ligato Kubernetes
| ...
| Suite Teardown | Tear down 3-node performance topology
| ...
-| Test Teardown | Run Keywords
-| ... | Get Kubernetes logs on all DUTs | ${nodes} | AND
-| ... | Describe Kubernetes resource on all DUTs | ${nodes} | AND
-| ... | Delete Kubernetes resource on all duts | ${nodes}
+| Test Teardown | Tear down performance test with Ligato Kubernetes
| ...
| Documentation | *RFC2544: Pkt throughput L2XC test cases*
| ...
@@ -60,14 +55,14 @@
| ${avg_imix_framesize}= | ${357.833}
# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
-# Kubernetes profile
-| ${kubernetes_profile} | eth-1drcl2xcbase-eth-4memif-2drcl2xc
+# SFC profile
+| ${sfc_profile} | configmaps/ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc
# Traffic profile:
| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
# CPU settings
| ${system_cpus}= | ${1}
| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${3}
+| ${vnf_cpus}= | ${2}
*** Keywords ***
| Create Kubernetes VSWITCH startup config on all DUTs
@@ -142,22 +137,30 @@
| | ... | ${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} | name=vswitch-vpp-cfg
-| | ... | key=vpp.conf | src_file=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | name=vnf1-vpp-cfg
-| | ... | key=vpp.conf | src_file=/tmp/vnf1.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | name=vnf2-vpp-cfg
-| | ... | key=vpp.conf | src_file=/tmp/vnf2.conf
+| | 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}
-| | ... | ${kubernetes_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | 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}
-| | ... | ${kubernetes_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | ${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}
-| | Describe Kubernetes resource on all DUTs | ${nodes}
+| | 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}
@@ -169,7 +172,7 @@
| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
+| tc01-64B-1t1c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -180,7 +183,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR
-| tc02-64B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
+| tc02-64B-1t1c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -191,7 +194,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR
-| tc03-IMIX-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
+| tc03-IMIX-1t1c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -203,7 +206,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
-| tc04-IMIX-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
+| tc04-IMIX-1t1c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -215,7 +218,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
-| tc05-1518B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
+| tc05-1518B-1t1c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -226,7 +229,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
-| tc06-1518B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
+| tc06-1518B-1t1c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -237,7 +240,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
-| tc07-64B-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
+| tc07-64B-2t2c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -248,7 +251,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR
-| tc08-64B-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
+| tc08-64B-2t2c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -259,7 +262,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR
-| tc09-IMIX-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
+| tc09-IMIX-2t2c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -271,7 +274,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
-| tc10-IMIX-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
+| tc10-IMIX-2t2c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -283,7 +286,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
-| tc11-1518B-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
+| tc11-1518B-2t2c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -294,7 +297,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
-| tc12-1518B-2t2c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
+| tc12-1518B-2t2c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot
new file mode 100644
index 0000000000..bac6ab753b
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot
@@ -0,0 +1,323 @@
+# 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/ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc
+# 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-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc02-64B-1t1c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc03-IMIX-1t1c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 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 10kpps.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc04-IMIX-1t1c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 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 10kpps, LT=0.5%.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc05-1518B-1t1c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc06-1518B-1t1c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc07-64B-2t2c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc08-64B-2t2c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR
+
+| tc09-IMIX-2t2c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 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 10kpps.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc10-IMIX-2t2c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 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 10kpps, LT=0.5%.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
+
+| tc11-1518B-2t2c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc12-1518B-2t2c-ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot
new file mode 100644
index 0000000000..17e85f5abd
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot
@@ -0,0 +1,310 @@
+# 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/ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc
+# 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}
+| | 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-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc02-64B-1t1c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc03-IMIX-1t1c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 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 10kpps.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc04-IMIX-1t1c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 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 10kpps, LT=0.5%.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc05-1518B-1t1c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc06-1518B-1t1c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc07-64B-2t2c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc08-64B-2t2c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR
+
+| tc09-IMIX-2t2c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 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 10kpps.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc10-IMIX-2t2c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 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 10kpps, LT=0.5%.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
+
+| tc11-1518B-2t2c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc12-1518B-2t2c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot
new file mode 100644
index 0000000000..5695688008
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot
@@ -0,0 +1,324 @@
+# 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/ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc
+# 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}
+| | 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-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc02-64B-1t1c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc03-IMIX-1t1c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 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 10kpps.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc04-IMIX-1t1c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 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 10kpps, LT=0.5%.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc05-1518B-1t1c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc06-1518B-1t1c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc07-64B-2t2c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc08-64B-2t2c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR
+
+| tc09-IMIX-2t2c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 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 10kpps.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc10-IMIX-2t2c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 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 10kpps, LT=0.5%.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
+
+| tc11-1518B-2t2c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc12-1518B-2t2c-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Bridge Domain Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot
new file mode 100644
index 0000000000..c614b265b7
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot
@@ -0,0 +1,309 @@
+# 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/ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc
+# 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-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc02-64B-1t1c-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc03-IMIX-1t1c-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 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 10kpps.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc04-IMIX-1t1c-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 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 10kpps, LT=0.5%.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc05-1518B-1t1c-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc06-1518B-1t1c-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc07-64B-2t2c-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc08-64B-2t2c-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR
+
+| tc09-IMIX-2t2c-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 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 10kpps.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc10-IMIX-2t2c-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 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 10kpps, LT=0.5%.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
+
+| tc11-1518B-2t2c-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc12-1518B-2t2c-ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot
new file mode 100644
index 0000000000..4b1f32f83c
--- /dev/null
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot
@@ -0,0 +1,323 @@
+# 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/ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc
+# 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-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc02-64B-1t1c-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc03-IMIX-1t1c-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 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 10kpps.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc04-IMIX-1t1c-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 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 10kpps, LT=0.5%.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc05-1518B-1t1c-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
+
+| tc06-1518B-1t1c-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
+
+| tc07-64B-2t2c-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc08-64B-2t2c-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 100kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR
+
+| tc09-IMIX-2t2c-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 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 10kpps.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc10-IMIX-2t2c-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 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 10kpps, LT=0.5%.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
+
+| tc11-1518B-2t2c-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps.
+| | ...
+| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
+
+| tc12-1518B-2t2c-ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc-k8s-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 10kpps, LT=0.5%.
+| | ...
+| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Template] | L2 Cross Connect Binary Search
+| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot
index c5ed51334b..9ad3597918 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot
@@ -16,21 +16,16 @@
| ...
| 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
+| ... | 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 | Run Keywords
-| ... | Apply Kubernetes resource on all duts | ${nodes} | kafka.yaml
-| ... | AND | Apply Kubernetes resource on all duts | ${nodes} | etcd.yaml
+| Test Setup | Set up performance test with Ligato Kubernetes
| ...
| Suite Teardown | Tear down 3-node performance topology
| ...
-| Test Teardown | Run Keywords
-| ... | Get Kubernetes logs on all DUTs | ${nodes} | AND
-| ... | Describe Kubernetes resource on all DUTs | ${nodes} | AND
-| ... | Delete Kubernetes resource on all duts | ${nodes}
+| Test Teardown | Tear down performance test with Ligato Kubernetes
| ...
| Documentation | *RFC2544: Pkt throughput L2BD test cases*
| ...
@@ -61,14 +56,14 @@
| ${avg_imix_framesize}= | ${357.833}
# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
-# Kubernetes profile
-| ${kubernetes_profile} | eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc
+# SFC profile
+| ${sfc_profile} | configmaps/pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc
# Traffic profile:
| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
# CPU settings
| ${system_cpus}= | ${1}
| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${3}
+| ${vnf_cpus}= | ${2}
*** Keywords ***
| Create Kubernetes VSWITCH startup config on all DUTs
@@ -139,22 +134,33 @@
| | ${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} | name=vswitch-vpp-cfg
-| | ... | key=vpp.conf | src_file=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | name=vnf-vpp-cfg
-| | ... | key=vpp.conf | src_file=/tmp/vnf1.conf
+| | 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}
-| | ... | ${kubernetes_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | 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}
+| | ... | $$TG_IF1_MAC1$$=${tg_if1_mac}
+| | ... | $$TG_IF2_MAC1$$=${tg_if2_mac}
| | Apply Kubernetes resource on node | ${dut2}
-| | ... | ${kubernetes_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | ${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}
+| | ... | $$TG_IF1_MAC1$$=${tg_if1_mac}
+| | ... | $$TG_IF2_MAC1$$=${tg_if2_mac}
+| | 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}
@@ -166,7 +172,7 @@
| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc
+| tc01-64B-1t1c-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -177,7 +183,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR
-| tc02-64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc
+| tc02-64B-1t1c-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -188,7 +194,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR
-| tc03-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc
+| tc03-IMIX-1t1c-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -200,7 +206,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
-| tc04-IMIX-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc
+| tc04-IMIX-1t1c-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -212,7 +218,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
-| tc05-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc
+| tc05-1518B-1t1c-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -223,7 +229,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
-| tc06-1518B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc
+| tc06-1518B-1t1c-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -234,7 +240,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
-| tc07-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc
+| tc07-64B-2t2c-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -245,7 +251,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR
-| tc08-64B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc
+| tc08-64B-2t2c-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -256,7 +262,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR
-| tc09-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc
+| tc09-IMIX-2t2c-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -268,7 +274,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
-| tc10-IMIX-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc
+| tc10-IMIX-2t2c-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -280,7 +286,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
-| tc11-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc
+| tc11-1518B-2t2c-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -291,7 +297,7 @@
| | [Template] | L2 Bridge Domain Binary Search
| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
-| tc12-1518B-2t2c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc
+| tc12-1518B-2t2c-pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot
index 038cb165df..4627d8de3b 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot
@@ -16,21 +16,16 @@
| ...
| 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
+| ... | 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 | Run Keywords
-| ... | Apply Kubernetes resource on all duts | ${nodes} | kafka.yaml
-| ... | AND | Apply Kubernetes resource on all duts | ${nodes} | etcd.yaml
+| Test Setup | Set up performance test with Ligato Kubernetes
| ...
| Suite Teardown | Tear down 3-node performance topology
| ...
-| Test Teardown | Run Keywords
-| ... | Get Kubernetes logs on all DUTs | ${nodes} | AND
-| ... | Describe Kubernetes resource on all DUTs | ${nodes} | AND
-| ... | Delete Kubernetes resource on all duts | ${nodes}
+| Test Teardown | Tear down performance test with Ligato Kubernetes
| ...
| Documentation | *RFC2544: Pkt throughput L2XC test cases*
| ...
@@ -60,14 +55,14 @@
| ${avg_imix_framesize}= | ${357.833}
# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
-# Kubernetes profile
-| ${kubernetes_profile} | eth-1drcl2xcbase-eth-2memif-1drcl2xc
+# SFC profile
+| ${sfc_profile} | configmaps/pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc
# Traffic profile:
| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
# CPU settings
| ${system_cpus}= | ${1}
| ${vswitch_cpus}= | ${5}
-| ${vnf_cpus}= | ${3}
+| ${vnf_cpus}= | ${2}
*** Keywords ***
| Create Kubernetes VSWITCH startup config on all DUTs
@@ -141,20 +136,24 @@
| | 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} | name=vswitch-vpp-cfg
-| | ... | key=vpp.conf | src_file=/tmp/vswitch.conf
-| | Create Kubernetes CM from file on all DUTs | ${nodes} | name=vnf-vpp-cfg
-| | ... | key=vpp.conf | src_file=/tmp/vnf1.conf
+| | 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}
-| | ... | ${kubernetes_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | 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}
-| | ... | ${kubernetes_profile}.yaml | $$TEST_NAME$$=${TEST NAME}
+| | ... | ${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}
-| | Describe Kubernetes resource on all DUTs | ${nodes}
+| | 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}
@@ -166,7 +165,7 @@
| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
*** Test Cases ***
-| tc01-64B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc
+| tc01-64B-1t1c-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -177,7 +176,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR
-| tc02-64B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc
+| tc02-64B-1t1c-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -188,7 +187,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR
-| tc03-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc
+| tc03-IMIX-1t1c-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -200,7 +199,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
-| tc04-IMIX-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc
+| tc04-IMIX-1t1c-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -212,7 +211,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
-| tc05-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc
+| tc05-1518B-1t1c-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -223,7 +222,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR
-| tc06-1518B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc
+| tc06-1518B-1t1c-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -234,7 +233,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR
-| tc07-64B-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc
+| tc07-64B-2t2c-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -245,7 +244,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR
-| tc08-64B-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc
+| tc08-64B-2t2c-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -256,7 +255,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR
-| tc09-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc
+| tc09-IMIX-2t2c-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -268,7 +267,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
-| tc10-IMIX-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc
+| tc10-IMIX-2t2c-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -280,7 +279,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR
-| tc11-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc
+| tc11-1518B-2t2c-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
@@ -291,7 +290,7 @@
| | [Template] | L2 Cross Connect Binary Search
| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR
-| tc12-1518B-2t2c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc
+| tc12-1518B-2t2c-pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.