aboutsummaryrefslogtreecommitdiffstats
path: root/tests/dpdk
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-06-21 12:15:56 +0000
committerPeter Mikus <pmikus@cisco.com>2019-06-25 06:02:52 +0000
commit1577123a3c27541181097cb4186aa8855f20b1cc (patch)
tree8db2e4a954e97f7734988fd3d10b69504f370998 /tests/dpdk
parentcac8f76ce1f9085e9eede19b250f4a4cb9b199e0 (diff)
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 <pmikus@cisco.com>
Diffstat (limited to 'tests/dpdk')
-rw-r--r--tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot6
-rw-r--r--tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot6
-rw-r--r--tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot6
-rw-r--r--tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot6
4 files changed, 12 insertions, 12 deletions
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
index 26b05c8378..99f83482d6 100644
--- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -12,15 +12,14 @@
# limitations under the License.
*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/shared/default.robot
| Resource | resources/libraries/robot/dpdk/default.robot
| Library | resources.libraries.python.DPDK.DPDKTools
| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDR | 1NUMA
| ... | NIC_Intel-X710 | DPDK | ETH | L2XCFWD | BASE
| ...
-| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
-| ... | L2 | ${nic_name}
+| Suite Setup | Setup suite single link | performance | dpdk
| Suite Teardown | Tear down suite | performance | dpdk
| ...
| Test Template | Local Template
@@ -44,6 +43,7 @@
| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
*** Variables ***
+| ${osi_layer}= | L2
| ${nic_name}= | Intel-X710
| ${overhead}= | ${0}
# Traffic profile:
diff --git a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
index d4c6c381a0..856db6f559 100644
--- a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -12,15 +12,14 @@
# limitations under the License.
*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/shared/default.robot
| Resource | resources/libraries/robot/dpdk/default.robot
| Library | resources.libraries.python.DPDK.DPDKTools
| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | 1NUMA
| ... | NIC_Intel-X710 | DPDK | IP4FWD | BASE | ETH
| ...
-| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
+| Suite Setup | Setup suite single link | performance | dpdk
| Suite Teardown | Tear down suite | performance | dpdk
| ...
| Test Template | Local Template
@@ -44,6 +43,7 @@
| ... | interfaces.
*** Variables ***
+| ${osi_layer}= | L3
| ${nic_name}= | Intel-X710
| ${overhead}= | ${0}
# Traffic profile:
diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
index 0f018b3f8f..f0f537d32f 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -12,15 +12,14 @@
# limitations under the License.
*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/shared/default.robot
| Resource | resources/libraries/robot/dpdk/default.robot
| Library | resources.libraries.python.DPDK.DPDKTools
| ...
| Force Tags | 2_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDR | 1NUMA
| ... | NIC_Intel-X710 | DPDK | ETH | L2XCFWD | BASE
| ...
-| Suite Setup | Set up DPDK 2-node performance topology with DUT's NIC model
-| ... | L2 | ${nic_name}
+| Suite Setup | Setup suite single link | performance | dpdk
| Suite Teardown | Tear down suite | performance | dpdk
| ...
| Test Template | Local Template
@@ -44,6 +43,7 @@
| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
*** Variables ***
+| ${osi_layer}= | L2
| ${nic_name}= | Intel-X710
| ${overhead}= | ${0}
# Traffic profile:
diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
index ae5932e73f..5aaf756974 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -12,15 +12,14 @@
# limitations under the License.
*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/shared/default.robot
| Resource | resources/libraries/robot/dpdk/default.robot
| Library | resources.libraries.python.DPDK.DPDKTools
| ...
| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | 1NUMA
| ... | NIC_Intel-X710 | DPDK | IP4FWD | BASE | ETH
| ...
-| Suite Setup | Set up DPDK 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
+| Suite Setup | Setup suite single link | performance | dpdk
| Suite Teardown | Tear down suite | performance | dpdk
| ...
| Test Template | Local Template
@@ -44,6 +43,7 @@
| ... | interfaces.
*** Variables ***
+| ${osi_layer}= | L3
| ${nic_name}= | Intel-X710
| ${overhead}= | ${0}
# Traffic profile: