From 1577123a3c27541181097cb4186aa8855f20b1cc Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 21 Jun 2019 12:15:56 +0000 Subject: Align suite/test teardown/setup + Phase II - aligning FUNC/PERF setup. + 2n/3n compatibility of suite setup. + Same structure of testcase for DEV/PERF. + DEVICE tests are now running VPP startup config in same way as PERF. + DEVICE is using COREKEEPER! - DEVICE tests are running topology compute twice for backward compatibility. TODO to remove. - Still phase III needed to align TAGS, LIBRARIES and remove OLD setup phase. Change-Id: Ib6e1b0ebf4abebf3cbe73b4fda5cac953c2a7270 Signed-off-by: Peter Mikus --- ...cl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot | 10 +++++----- ...cl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot | 10 +++++----- ...cl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot | 10 +++++----- ...cl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot | 10 +++++----- ...cl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot | 10 +++++----- ...th-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot | 10 +++++----- ...th-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot | 10 +++++----- ...th-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot | 10 +++++----- ...th-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot | 10 +++++----- ...th-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot | 10 +++++----- 10 files changed, 50 insertions(+), 50 deletions(-) (limited to 'tests/kubernetes') diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot index 8fad8c64d7..5110419103 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot @@ -12,17 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | BASE | MEMIF | ... | K8S | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER | PARALLEL | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test with Ligato Kubernetes +| Test Setup | Setup test | ligato | Test Teardown | Tear down test | ligato | ... | Test Template | Local Template @@ -51,6 +49,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # SFC profile diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot index cfa9cbc395..abaf83ebd7 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot @@ -12,17 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF | ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test with Ligato Kubernetes +| Test Setup | Setup test | ligato | Test Teardown | Tear down test | ligato | ... | Test Template | Local Template @@ -51,6 +49,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # SFC profile diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot index 78ee42f67e..0fd00e52e3 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot @@ -12,17 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF | ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test with Ligato Kubernetes +| Test Setup | Setup test | ligato | Test Teardown | Tear down test | ligato | ... | Test Template | Local Template @@ -51,6 +49,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # SFC profile diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot index a3a9c08e1c..2e0e14e66b 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot @@ -12,17 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF | ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test with Ligato Kubernetes +| Test Setup | Setup test | ligato | Test Teardown | Tear down test | ligato | ... | Test Template | Local Template @@ -51,6 +49,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # SFC profile diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot index 99e5deee91..baf3cb029e 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot @@ -12,17 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | L2BDBASE | SCALE | MEMIF | ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test with Ligato Kubernetes +| Test Setup | Setup test | ligato | Test Teardown | Tear down test | ligato | ... | Test Template | Local Template @@ -51,6 +49,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # SFC profile diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot index ca72c311b8..679e9ac421 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot @@ -12,17 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2XCFWD | BASE | L2XCBASE | MEMIF | ... | K8S | 1VSWITCH | 1VNF | VPP_AGENT | SFC_CONTROLLER | PARALLEL | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test with Ligato Kubernetes +| Test Setup | Setup test | ligato | Test Teardown | Tear down test | ligato | ... | Test Template | Local Template @@ -50,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # SFC profile diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot index e018bf1146..9035986688 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot @@ -12,17 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF | ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test with Ligato Kubernetes +| Test Setup | Setup test | ligato | Test Teardown | Tear down test | ligato | ... | Test Template | Local Template @@ -50,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # SFC profile diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot index 4be47e61fd..fe1bed40a5 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot @@ -12,17 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF | ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | HORIZONTAL | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test with Ligato Kubernetes +| Test Setup | Setup test | ligato | Test Teardown | Tear down test | ligato | ... | Test Template | Local Template @@ -50,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # SFC profile diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot index 66c47034ae..abf4311b3f 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot @@ -12,17 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF | ... | K8S | 1VSWITCH | 2VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test with Ligato Kubernetes +| Test Setup | Setup test | ligato | Test Teardown | Tear down test | ligato | ... | Test Template | Local Template @@ -50,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # SFC profile diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot index 2cfc9bd1b4..36a3fce3ff 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot @@ -12,17 +12,15 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | ... | NIC_Intel-X710 | ETH | L2XCFWD | SCALE | L2XCBASE | MEMIF | ... | K8S | 1VSWITCH | 4VNF | VPP_AGENT | SFC_CONTROLLER | CHAIN | ... -| Suite Setup | Set up 3-node performance topology with DUT's NIC model -| ... | L2 | ${nic_name} +| Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance -| ... -| Test Setup | Set up performance test with Ligato Kubernetes +| Test Setup | Setup test | ligato | Test Teardown | Tear down test | ligato | ... | Test Template | Local Template @@ -50,6 +48,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${0} # SFC profile -- cgit 1.2.3-korg