From fd1b55aaeecc2e68b0855a389bd7c14671648c7a Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 20 Oct 2017 13:50:08 +0200 Subject: [PATCH] Rename all container based test following name conventions Change-Id: I84f6da2bede47e7ae35e6b4911d425d2402dbd1b Signed-off-by: Peter Mikus --- bootstrap-verify-perf-ligato.sh | 46 +++++++++++----------- docs/tag_documentation.rst | 35 +++++++++++++++- ...l => eth-1drcl2bdbase-eth-2memif-1drcl2xc.yaml} | 0 ...l => eth-1drcl2bdbase-eth-4memif-2drcl2xc.yaml} | 0 ...l => eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml} | 0 ...l => eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml} | 0 tests/{ligato => kubernetes}/perf/__init__.robot | 0 ...dbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot} | 30 +++++++------- ...dbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot} | 30 +++++++------- ...cbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot} | 28 ++++++------- ...cbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot} | 28 ++++++------- ...l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot | 0 ...-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot} | 24 +++++------ ...0-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot | 0 14 files changed, 127 insertions(+), 94 deletions(-) rename resources/templates/kubernetes/{eth-l2bdbase-eth-2memif-1vnf.yaml => eth-1drcl2bdbase-eth-2memif-1drcl2xc.yaml} (100%) rename resources/templates/kubernetes/{eth-l2bdbase-eth-2memif-2vnf.yaml => eth-1drcl2bdbase-eth-4memif-2drcl2xc.yaml} (100%) rename resources/templates/kubernetes/{eth-l2xcbase-eth-2memif-1vnf.yaml => eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml} (100%) rename resources/templates/kubernetes/{eth-l2xcbase-eth-2memif-2vnf.yaml => eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml} (100%) rename tests/{ligato => kubernetes}/perf/__init__.robot (100%) rename tests/{ligato/perf/l2/10ge2p1x520-eth-l2bdbase-eth-2memif-1vnf-ndrpdrdisc.robot => kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot} (93%) rename tests/{ligato/perf/l2/10ge2p1x520-eth-l2bdbase-eth-2memif-2vnf-ndrpdrdisc.robot => kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot} (93%) rename tests/{ligato/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1vnf-ndrpdrdisc.robot => kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot} (93%) rename tests/{ligato/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-2vnf-ndrpdrdisc.robot => kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot} (93%) rename tests/vpp/perf/{l2 => container_memif}/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot (100%) rename tests/vpp/perf/{l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1docker-ndrpdrdisc.robot => container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot} (93%) rename tests/vpp/perf/{l2 => container_memif}/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot (100%) diff --git a/bootstrap-verify-perf-ligato.sh b/bootstrap-verify-perf-ligato.sh index f00183fe5a..10470dc9ea 100644 --- a/bootstrap-verify-perf-ligato.sh +++ b/bootstrap-verify-perf-ligato.sh @@ -195,7 +195,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cORndrdiscANDnic_intel-x520-da2AND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -204,7 +204,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -213,7 +213,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscAND1t1cORndrdiscAND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -222,7 +222,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrdiscAND1t1cORpdrdiscAND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -231,7 +231,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrchkAND1t1cORndrchkAND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -240,7 +240,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrchkAND1t1cORndrchkAND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -249,7 +249,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip4baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -258,7 +258,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip6baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -267,7 +267,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDl2xcbaseORndrdiscANDnic_intel-x520-da2AND1t1cANDl2bdbase \ tests/ RETURN_STATUS=$(echo $?) @@ -276,7 +276,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDlisp \ tests/ RETURN_STATUS=$(echo $?) @@ -285,7 +285,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvxlan \ tests/ RETURN_STATUS=$(echo $?) @@ -294,7 +294,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ tests/ RETURN_STATUS=$(echo $?) @@ -303,7 +303,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDip4baseORpdrchkANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -312,7 +312,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDip6baseORpdrchkANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -321,7 +321,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDl2xcbaseORpdrchkANDnic_intel-x520-da2AND1t1cANDl2bdbase \ tests/ RETURN_STATUS=$(echo $?) @@ -330,7 +330,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDlisp \ tests/ RETURN_STATUS=$(echo $?) @@ -339,7 +339,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDvxlan \ tests/ RETURN_STATUS=$(echo $?) @@ -348,7 +348,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ tests/ RETURN_STATUS=$(echo $?) @@ -357,7 +357,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrdiscANDnic_intel-x520-da2AND1t1cANDacl \ --include pdrdiscANDnic_intel-x520-da2AND2t2cANDacl \ tests/ @@ -367,7 +367,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --exclude SKIP_PATCH \ -i NDRPDRDISC \ tests/ @@ -377,7 +377,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ -i NDRCHK \ tests/ RETURN_STATUS=$(echo $?) @@ -387,7 +387,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -396,7 +396,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ tests/ RETURN_STATUS=$(echo $?) esac diff --git a/docs/tag_documentation.rst b/docs/tag_documentation.rst index 408477d3b5..d45a375b13 100644 --- a/docs/tag_documentation.rst +++ b/docs/tag_documentation.rst @@ -448,12 +448,45 @@ Client-workload tags .. topic:: LXC - All test cases which use Linux container. + All test cases which use Linux container and LXC utils. + +.. topic:: DOCKER + + All test cases which use Docker as container manager. .. topic:: APP All test cases with specific APP use. +Container orchestration tags +---------------------------- + +.. topic:: K8S + + All test cases which use Kubernetes for orchestration. + +.. topic:: SFC_CONTROLLER + + All test cases which use ligato/sfc_controller for driving configuration + of vpp inside container. + +.. topic:: VPP_AGENT + + All test cases which use Golang implementation of a control/management plane + for VPP + +.. topic:: 1VSWITCH + + VPP running in Docker container acting as VSWITCH. + +.. topic:: 1VNF + + 1 VPP running in Docker container acting as VNF work load. + +.. topic:: 2VNF + + 2 VPP running in 2 Docker containers acting as VNF work load. + Multi-threading tags -------------------- diff --git a/resources/templates/kubernetes/eth-l2bdbase-eth-2memif-1vnf.yaml b/resources/templates/kubernetes/eth-1drcl2bdbase-eth-2memif-1drcl2xc.yaml similarity index 100% rename from resources/templates/kubernetes/eth-l2bdbase-eth-2memif-1vnf.yaml rename to resources/templates/kubernetes/eth-1drcl2bdbase-eth-2memif-1drcl2xc.yaml diff --git a/resources/templates/kubernetes/eth-l2bdbase-eth-2memif-2vnf.yaml b/resources/templates/kubernetes/eth-1drcl2bdbase-eth-4memif-2drcl2xc.yaml similarity index 100% rename from resources/templates/kubernetes/eth-l2bdbase-eth-2memif-2vnf.yaml rename to resources/templates/kubernetes/eth-1drcl2bdbase-eth-4memif-2drcl2xc.yaml diff --git a/resources/templates/kubernetes/eth-l2xcbase-eth-2memif-1vnf.yaml b/resources/templates/kubernetes/eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml similarity index 100% rename from resources/templates/kubernetes/eth-l2xcbase-eth-2memif-1vnf.yaml rename to resources/templates/kubernetes/eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml diff --git a/resources/templates/kubernetes/eth-l2xcbase-eth-2memif-2vnf.yaml b/resources/templates/kubernetes/eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml similarity index 100% rename from resources/templates/kubernetes/eth-l2xcbase-eth-2memif-2vnf.yaml rename to resources/templates/kubernetes/eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml diff --git a/tests/ligato/perf/__init__.robot b/tests/kubernetes/perf/__init__.robot similarity index 100% rename from tests/ligato/perf/__init__.robot rename to tests/kubernetes/perf/__init__.robot diff --git a/tests/ligato/perf/l2/10ge2p1x520-eth-l2bdbase-eth-2memif-1vnf-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot similarity index 93% rename from tests/ligato/perf/l2/10ge2p1x520-eth-l2bdbase-eth-2memif-1vnf-ndrpdrdisc.robot rename to tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot index 9cb80f28f5..c1eb97ba3f 100644 --- a/tests/ligato/perf/l2/10ge2p1x520-eth-l2bdbase-eth-2memif-1vnf-ndrpdrdisc.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot @@ -15,8 +15,8 @@ | 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 | BASE | MEMIF -| ... | KUBERNETES | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER +| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | L2BDBASE | BASE | MEMIF +| ... | K8S | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 @@ -62,7 +62,7 @@ # X520-DA2 bandwidth limit | ${s_limit} | ${10000000000} # Kubernetes profile -| ${kubernetes_profile} | eth-l2bdbase-eth-2memif-1vnf +| ${kubernetes_profile} | eth-1drcl2bdbase-eth-2memif-1drcl2xc # Traffic profile: | ${traffic_profile} | trex-sl-3n-ethip4-ip4src254 # CPU settings @@ -166,7 +166,7 @@ | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type} *** Test Cases *** -| tc01-64B-1t1c-eth-l2bdbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc01-64B-1t1c-eth-1dcrl2bdbase-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 +177,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR -| tc02-64B-1t1c-eth-l2bdbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc02-64B-1t1c-eth-1dcrl2bdbase-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 +188,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR -| tc03-IMIX-1t1c-eth-l2bdbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc03-IMIX-1t1c-eth-1dcrl2bdbase-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 +200,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-l2bdbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc04-IMIX-1t1c-eth-1dcrl2bdbase-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 +212,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-l2bdbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc05-1518B-1t1c-eth-1dcrl2bdbase-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 +223,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR -| tc06-1518B-1t1c-eth-l2bdbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc06-1518B-1t1c-eth-1dcrl2bdbase-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 +234,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR -| tc07-64B-2t2c-eth-l2bdbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc07-64B-2t2c-eth-1dcrl2bdbase-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 +245,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR -| tc08-64B-2t2c-eth-l2bdbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc08-64B-2t2c-eth-1dcrl2bdbase-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 +256,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR -| tc09-IMIX-2t2c-eth-l2bdbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc09-IMIX-2t2c-eth-1dcrl2bdbase-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 +268,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-l2bdbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc10-IMIX-2t2c-eth-1dcrl2bdbase-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 +280,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-l2bdbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc11-1518B-2t2c-eth-1dcrl2bdbase-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 +291,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR -| tc12-1518B-2t2c-eth-l2bdbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc12-1518B-2t2c-eth-1dcrl2bdbase-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/ligato/perf/l2/10ge2p1x520-eth-l2bdbase-eth-2memif-2vnf-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot similarity index 93% rename from tests/ligato/perf/l2/10ge2p1x520-eth-l2bdbase-eth-2memif-2vnf-ndrpdrdisc.robot rename to tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot index 3224d47de4..c7f20ec1f9 100644 --- a/tests/ligato/perf/l2/10ge2p1x520-eth-l2bdbase-eth-2memif-2vnf-ndrpdrdisc.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2bdbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot @@ -15,8 +15,8 @@ | 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 | SCALE | MEMIF -| ... | KUBERNETES | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER +| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF +| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 @@ -62,7 +62,7 @@ # X520-DA2 bandwidth limit | ${s_limit} | ${10000000000} # Kubernetes profile -| ${kubernetes_profile} | eth-l2bdbase-eth-2memif-2vnf +| ${kubernetes_profile} | eth-1drcl2bdbase-eth-4memif-2drcl2xc # Traffic profile: | ${traffic_profile} | trex-sl-3n-ethip4-ip4src254 # CPU settings @@ -169,7 +169,7 @@ | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type} *** Test Cases *** -| tc01-64B-1t1c-eth-l2bdbase-eth-2memif-2vnf-kubernetes-ndrdisc +| tc01-64B-1t1c-eth-1drcl2bdbase-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 +180,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR -| tc02-64B-1t1c-eth-l2bdbase-eth-2memif-2vnf-kubernetes-pdrdisc +| tc02-64B-1t1c-eth-1drcl2bdbase-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 +191,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR -| tc03-IMIX-1t1c-eth-l2bdbase-eth-2memif-2vnf-kubernetes-ndrdisc +| tc03-IMIX-1t1c-eth-1drcl2bdbase-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 +203,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-l2bdbase-eth-2memif-2vnf-kubernetes-pdrdisc +| tc04-IMIX-1t1c-eth-1drcl2bdbase-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 +215,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-l2bdbase-eth-2memif-2vnf-kubernetes-ndrdisc +| tc05-1518B-1t1c-eth-1drcl2bdbase-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 +226,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR -| tc06-1518B-1t1c-eth-l2bdbase-eth-2memif-2vnf-kubernetes-pdrdisc +| tc06-1518B-1t1c-eth-1drcl2bdbase-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 +237,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR -| tc07-64B-2t2c-eth-l2bdbase-eth-2memif-2vnf-kubernetes-ndrdisc +| tc07-64B-2t2c-eth-1drcl2bdbase-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 +248,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR -| tc08-64B-2t2c-eth-l2bdbase-eth-2memif-2vnf-kubernetes-pdrdisc +| tc08-64B-2t2c-eth-1drcl2bdbase-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 +259,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR -| tc09-IMIX-2t2c-eth-l2bdbase-eth-2memif-2vnf-kubernetes-ndrdisc +| tc09-IMIX-2t2c-eth-1drcl2bdbase-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 +271,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-l2bdbase-eth-2memif-2vnf-kubernetes-pdrdisc +| tc10-IMIX-2t2c-eth-1drcl2bdbase-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 +283,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-l2bdbase-eth-2memif-2vnf-kubernetes-ndrdisc +| tc11-1518B-2t2c-eth-1drcl2bdbase-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 +294,7 @@ | | [Template] | L2 Bridge Domain Binary Search | | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR -| tc12-1518B-2t2c-eth-l2bdbase-eth-2memif-2vnf-kubernetes-pdrdisc +| tc12-1518B-2t2c-eth-1drcl2bdbase-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/ligato/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1vnf-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot similarity index 93% rename from tests/ligato/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1vnf-ndrpdrdisc.robot rename to tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot index a21a1bfb88..a0178dae7c 100644 --- a/tests/ligato/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1vnf-ndrpdrdisc.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | L2XCBASE | MEMIF -| ... | KUBERNETES | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER +| ... | K8S | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 @@ -61,7 +61,7 @@ # X520-DA2 bandwidth limit | ${s_limit} | ${10000000000} # Kubernetes profile -| ${kubernetes_profile} | eth-l2xcbase-eth-2memif-1vnf +| ${kubernetes_profile} | eth-1drcl2xcbase-eth-2memif-1drcl2xc # Traffic profile: | ${traffic_profile} | trex-sl-3n-ethip4-ip4src254 # CPU settings @@ -166,7 +166,7 @@ | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type} *** Test Cases *** -| tc01-64B-1t1c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc01-64B-1t1c-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 +177,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR -| tc02-64B-1t1c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc02-64B-1t1c-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 +188,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR -| tc03-IMIX-1t1c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc03-IMIX-1t1c-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 +200,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-l2xcbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc04-IMIX-1t1c-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 +212,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-l2xcbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc05-1518B-1t1c-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 +223,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR -| tc06-1518B-1t1c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc06-1518B-1t1c-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 +234,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR -| tc07-64B-2t2c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc07-64B-2t2c-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 +245,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR -| tc08-64B-2t2c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc08-64B-2t2c-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 +256,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR -| tc09-IMIX-2t2c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc09-IMIX-2t2c-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 +268,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-l2xcbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc10-IMIX-2t2c-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 +280,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-l2xcbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc11-1518B-2t2c-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 +291,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR -| tc12-1518B-2t2c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc12-1518B-2t2c-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. diff --git a/tests/ligato/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-2vnf-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot similarity index 93% rename from tests/ligato/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-2vnf-ndrpdrdisc.robot rename to tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot index 791e24d5e5..8cdea90640 100644 --- a/tests/ligato/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-2vnf-ndrpdrdisc.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot @@ -16,7 +16,7 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF -| ... | KUBERNETES | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER +| ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 @@ -61,7 +61,7 @@ # X520-DA2 bandwidth limit | ${s_limit} | ${10000000000} # Kubernetes profile -| ${kubernetes_profile} | eth-l2xcbase-eth-2memif-2vnf +| ${kubernetes_profile} | eth-1drcl2xcbase-eth-4memif-2drcl2xc # Traffic profile: | ${traffic_profile} | trex-sl-3n-ethip4-ip4src254 # CPU settings @@ -169,7 +169,7 @@ | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type} *** Test Cases *** -| tc01-64B-1t1c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc01-64B-1t1c-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 +180,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR -| tc02-64B-1t1c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc02-64B-1t1c-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 +191,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR -| tc03-IMIX-1t1c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc03-IMIX-1t1c-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 +203,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-l2xcbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc04-IMIX-1t1c-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 +215,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-l2xcbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc05-1518B-1t1c-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 +226,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR -| tc06-1518B-1t1c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc06-1518B-1t1c-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 +237,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR -| tc07-64B-2t2c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc07-64B-2t2c-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 +248,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR -| tc08-64B-2t2c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc08-64B-2t2c-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 +259,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR -| tc09-IMIX-2t2c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc09-IMIX-2t2c-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 +271,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-l2xcbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc10-IMIX-2t2c-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 +283,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-l2xcbase-eth-2memif-1vnf-kubernetes-ndrdisc +| tc11-1518B-2t2c-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 +294,7 @@ | | [Template] | L2 Cross Connect Binary Search | | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR -| tc12-1518B-2t2c-eth-l2xcbase-eth-2memif-1vnf-kubernetes-pdrdisc +| tc12-1518B-2t2c-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/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot similarity index 100% rename from tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot rename to tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1docker-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot similarity index 93% rename from tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1docker-ndrpdrdisc.robot rename to tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot index 9d0a79328b..4c07a3c183 100644 --- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1docker-ndrpdrdisc.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot @@ -95,7 +95,7 @@ | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type} *** Test Cases *** -| tc01-64B-1t1c-eth-l2xcbase-eth-2memif-1docker-ndrdisc +| tc01-64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc | | [Documentation] | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\ | | ... | 1 receive queue per NIC port. @@ -106,7 +106,7 @@ | | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR -| tc02-64B-1t1c-eth-l2xcbase-eth-2memif-1docker-pdrdisc +| tc02-64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc | | [Documentation] | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\ | | ... | 1 receive queue per NIC port. @@ -117,7 +117,7 @@ | | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR -| tc03-IMIX-1t1c-eth-l2xcbase-eth-2memif-1docker-ndrdisc +| tc03-IMIX-1t1c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc | | [Documentation] | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\ | | ... | 1 receive queue per NIC port. @@ -129,7 +129,7 @@ | | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR -| tc04-IMIX-1t1c-eth-l2xcbase-eth-2memif-1docker-pdrdisc +| tc04-IMIX-1t1c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc | | [Documentation] | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\ | | ... | 1 receive queue per NIC port. @@ -141,7 +141,7 @@ | | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR -| tc05-1518B-1t1c-eth-l2xcbase-eth-2memif-1docker-ndrdisc +| tc05-1518B-1t1c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc | | [Documentation] | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\ | | ... | 1 receive queue per NIC port. @@ -152,7 +152,7 @@ | | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR -| tc06-1518B-1t1c-eth-l2xcbase-eth-2memif-1docker-pdrdisc +| tc06-1518B-1t1c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc | | [Documentation] | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\ | | ... | 1 receive queue per NIC port. @@ -163,7 +163,7 @@ | | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR -| tc07-64B-2t2c-eth-l2xcbase-eth-2memif-1docker-ndrdisc +| tc07-64B-2t2c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc | | [Documentation] | | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\ | | ... | 1 receive queue per NIC port. @@ -174,7 +174,7 @@ | | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR -| tc08-64B-2t2c-eth-l2xcbase-eth-2memif-1docker-pdrdisc +| tc08-64B-2t2c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc | | [Documentation] | | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\ | | ... | 1 receive queue per NIC port. @@ -185,7 +185,7 @@ | | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR -| tc09-IMIX-2t2c-eth-l2xcbase-eth-2memif-1docker-ndrdisc +| tc09-IMIX-2t2c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc | | [Documentation] | | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\ | | ... | 1 receive queue per NIC port. @@ -197,7 +197,7 @@ | | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR -| tc10-IMIX-2t2c-eth-l2xcbase-eth-2memif-1docker-pdrdisc +| tc10-IMIX-2t2c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc | | [Documentation] | | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\ | | ... | 1 receive queue per NIC port. @@ -209,7 +209,7 @@ | | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR -| tc11-1518B-2t2c-eth-l2xcbase-eth-2memif-1docker-ndrdisc +| tc11-1518B-2t2c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc | | [Documentation] | | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\ | | ... | 1 receive queue per NIC port. @@ -220,7 +220,7 @@ | | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR -| tc12-1518B-2t2c-eth-l2xcbase-eth-2memif-1docker-pdrdisc +| tc12-1518B-2t2c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc | | [Documentation] | | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\ | | ... | 1 receive queue per NIC port. diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot similarity index 100% rename from tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot rename to tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot -- 2.16.6