From c8790d06d412b1daf303f6da9d8d11d97d053697 Mon Sep 17 00:00:00 2001 From: Miroslav Miklus Date: Mon, 18 Apr 2016 17:15:40 +0200 Subject: Extend host topology with NIC type filtering JIRA: CSIT-1 Changes to allow filtering based on NIC model. Switched xconnect perf test to use filtered topology. Change-Id: Id526f47dc28f92bf26d070e54819ad29bccc0440 Signed-off-by: Miroslav Miklus --- tests/suites/performance/short_xconnect.robot | 141 -------------------- .../short_xconnect_Intel-X520-DA2.robot | 143 +++++++++++++++++++++ 2 files changed, 143 insertions(+), 141 deletions(-) delete mode 100644 tests/suites/performance/short_xconnect.robot create mode 100644 tests/suites/performance/short_xconnect_Intel-X520-DA2.robot (limited to 'tests/suites/performance') diff --git a/tests/suites/performance/short_xconnect.robot b/tests/suites/performance/short_xconnect.robot deleted file mode 100644 index 25eef3f65c..0000000000 --- a/tests/suites/performance/short_xconnect.robot +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright (c) 2016 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.robot -| Library | resources.libraries.python.InterfaceUtil -| Library | resources.libraries.python.NodePath -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_SHORT -| Suite Setup | 3-node Performance Suite Setup | L2 -| Suite Teardown | 3-node Performance Suite Teardown -| Test Setup | Setup all DUTs before test -| Test Teardown | Run Keywords | Show statistics on all DUTs -| ... | AND | Reset startup configuration of VPP on all DUTs -| Documentation | Minimal throughput acceptance test cases - -*** Test Cases *** -| 1core VPP passes 64B frames through L2 cross connect at 2x 3.8Mpps in 3-node topology -| | [Documentation] -| | ... | VPP with 1 core should pass 64B frames through L2 cross connect -| | ... | at 2x3.8Mpps in 3-node topology -| | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD -| | ${framesize}= | Set Variable | 64 -| | ${duration}= | Set Variable | 10 -| | ${rate}= | Set Variable | 3.8mpps -| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs -| | AND L2 xconnect initialized in a 3-node circular topology -| | Then Traffic should pass with no loss | ${duration} | ${rate} -| | ... | ${framesize} | 3-node-xconnect - -| 1core VPP passes 1518B frames through L2 cross connect at 2x 10Gbps in 3-node topology -| | [Documentation] -| | ... | VPP with 1 core should pass 1518B frames through L2 cross connect -| | ... | at 2x10Gbps in 3-node topology -| | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD -| | ${framesize}= | Set Variable | 1518 -| | ${duration}= | Set Variable | 10 -| | ${rate}= | Set Variable | 10gbps -| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs -| | AND L2 xconnect initialized in a 3-node circular topology -| | Then Traffic should pass with no loss | ${duration} | ${rate} -| | ... | ${framesize} | 3-node-xconnect - -| 1core VPP passes 9000B frames through L2 cross connect at 2x 10Gbps in 3-node topology -| | [Documentation] -| | ... | VPP with 1 core should pass 9000B frames through L2 cross connect -| | ... | at 2x10Gbps in 3-node topology -| | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD -| | ${framesize}= | Set Variable | 9000 -| | ${duration}= | Set Variable | 10 -| | ${rate}= | Set Variable | 10gbps -| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs -| | AND L2 xconnect initialized in a 3-node circular topology -| | Then Traffic should pass with no loss | ${duration} | ${rate} -| | ... | ${framesize} | 3-node-xconnect - -| 2core VPP with rss 1 passes 64B frames through L2 cross connect at 2x 8.3Mpps in 3-node topology -| | [Documentation] -| | ... | VPP with 2 cores should pass 64B frames through L2 cross connect -| | ... | at 2x8.3Mpps in 3-node topology -| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD -| | ${framesize}= | Set Variable | 64 -| | ${duration}= | Set Variable | 10 -| | ${rate}= | Set Variable | 8.3mpps -| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs -| | AND L2 xconnect initialized in a 3-node circular topology -| | Then Traffic should pass with no loss | ${duration} | ${rate} -| | ... | ${framesize} | 3-node-xconnect - -| 2core VPP with rss 1 passes 1518B frames through L2 cross connect at 2x 10Gbps in 3-node topology -| | [Documentation] -| | ... | VPP with 2 cores should pass 1518B frames through L2 cross connect -| | ... | at 2x10Gbps in 3-node topology -| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD -| | ${framesize}= | Set Variable | 1518 -| | ${duration}= | Set Variable | 10 -| | ${rate}= | Set Variable | 10gbps -| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs -| | AND L2 xconnect initialized in a 3-node circular topology -| | Then Traffic should pass with no loss | ${duration} | ${rate} -| | ... | ${framesize} | 3-node-xconnect - -| 2core VPP with rss 1 passes 9000B frames through L2 cross connect at 2x 10Gbps in 3-node topology -| | [Documentation] -| | ... | VPP with 2 cores should pass 9000B frames through L2 cross connect -| | ... | at 2x10Gbps in 3-node topology -| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD -| | ${framesize}= | Set Variable | 9000 -| | ${duration}= | Set Variable | 10 -| | ${rate}= | Set Variable | 10gbps -| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs -| | AND L2 xconnect initialized in a 3-node circular topology -| | Then Traffic should pass with no loss | ${duration} | ${rate} -| | ... | ${framesize} | 3-node-xconnect - -| 4core VPP with rss 2 passes 64B frames through L2 cross connect at 2x 9.9Mpps in 3-node topology -| | [Documentation] -| | ... | VPP with 4 cores and rss 2 should pass 64B frames through L2 cross -| | ... | connect at 2x9.9Mpps in 3-node topology -| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD -| | ${framesize}= | Set Variable | 64 -| | ${duration}= | Set Variable | 10 -| | ${rate}= | Set Variable | 9.9mpps -| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs -| | AND L2 xconnect initialized in a 3-node circular topology -| | Then Traffic should pass with no loss | ${duration} | ${rate} -| | ... | ${framesize} | 3-node-xconnect - -| 4core VPP with rss 2 passes 1518B frames through L2 cross connect at 2x 10Gbps in 3-node topology -| | [Documentation] -| | ... | VPP with 4 cores and rss 2 should pass 1518B frames through L2 cross -| | ... | connect at 2x10Gbps in 3-node topology -| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD -| | ${framesize}= | Set Variable | 1518 -| | ${duration}= | Set Variable | 10 -| | ${rate}= | Set Variable | 10gbps -| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs -| | AND L2 xconnect initialized in a 3-node circular topology -| | Then Traffic should pass with no loss | ${duration} | ${rate} -| | ... | ${framesize} | 3-node-xconnect - -| 4core VPP with rss 2 passes 9000B frames through L2 cross connect at 2x 10Gbps in 3-node topology -| | [Documentation] -| | ... | VPP with 4 cores and rss 2 should pass 9000B frames through L2 cross -| | ... | connect at 2x10Gbps in 3-node topology -| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD -| | ${framesize}= | Set Variable | 9000 -| | ${duration}= | Set Variable | 10 -| | ${rate}= | Set Variable | 10gbps -| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs -| | AND L2 xconnect initialized in a 3-node circular topology -| | Then Traffic should pass with no loss | ${duration} | ${rate} -| | ... | ${framesize} | 3-node-xconnect diff --git a/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot b/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot new file mode 100644 index 0000000000..8a59d8122d --- /dev/null +++ b/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot @@ -0,0 +1,143 @@ +# Copyright (c) 2016 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.robot +| Library | resources.libraries.python.InterfaceUtil +| Library | resources.libraries.python.NodePath +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_SHORT +| ... | NIC_Intel-X520-DA2 +| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| ... | L2 | Intel-X520-DA2 +| Suite Teardown | 3-node Performance Suite Teardown +| Test Setup | Setup all DUTs before test +| Test Teardown | Run Keywords | Show statistics on all DUTs +| ... | AND | Reset startup configuration of VPP on all DUTs +| Documentation | Minimal throughput acceptance test cases + +*** Test Cases *** +| 1core VPP passes 64B frames through L2 cross connect at 2x 3.8Mpps in 3-node topology +| | [Documentation] +| | ... | VPP with 1 core should pass 64B frames through L2 cross connect +| | ... | at 2x3.8Mpps in 3-node topology +| | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD +| | ${framesize}= | Set Variable | 64 +| | ${duration}= | Set Variable | 10 +| | ${rate}= | Set Variable | 3.8mpps +| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs +| | AND L2 xconnect initialized in a 3-node circular topology +| | Then Traffic should pass with no loss | ${duration} | ${rate} +| | ... | ${framesize} | 3-node-xconnect + +| 1core VPP passes 1518B frames through L2 cross connect at 2x 10Gbps in 3-node topology +| | [Documentation] +| | ... | VPP with 1 core should pass 1518B frames through L2 cross connect +| | ... | at 2x10Gbps in 3-node topology +| | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD +| | ${framesize}= | Set Variable | 1518 +| | ${duration}= | Set Variable | 10 +| | ${rate}= | Set Variable | 10gbps +| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs +| | AND L2 xconnect initialized in a 3-node circular topology +| | Then Traffic should pass with no loss | ${duration} | ${rate} +| | ... | ${framesize} | 3-node-xconnect + +| 1core VPP passes 9000B frames through L2 cross connect at 2x 10Gbps in 3-node topology +| | [Documentation] +| | ... | VPP with 1 core should pass 9000B frames through L2 cross connect +| | ... | at 2x10Gbps in 3-node topology +| | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD +| | ${framesize}= | Set Variable | 9000 +| | ${duration}= | Set Variable | 10 +| | ${rate}= | Set Variable | 10gbps +| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs +| | AND L2 xconnect initialized in a 3-node circular topology +| | Then Traffic should pass with no loss | ${duration} | ${rate} +| | ... | ${framesize} | 3-node-xconnect + +| 2core VPP with rss 1 passes 64B frames through L2 cross connect at 2x 8.3Mpps in 3-node topology +| | [Documentation] +| | ... | VPP with 2 cores should pass 64B frames through L2 cross connect +| | ... | at 2x8.3Mpps in 3-node topology +| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD +| | ${framesize}= | Set Variable | 64 +| | ${duration}= | Set Variable | 10 +| | ${rate}= | Set Variable | 8.3mpps +| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs +| | AND L2 xconnect initialized in a 3-node circular topology +| | Then Traffic should pass with no loss | ${duration} | ${rate} +| | ... | ${framesize} | 3-node-xconnect + +| 2core VPP with rss 1 passes 1518B frames through L2 cross connect at 2x 10Gbps in 3-node topology +| | [Documentation] +| | ... | VPP with 2 cores should pass 1518B frames through L2 cross connect +| | ... | at 2x10Gbps in 3-node topology +| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD +| | ${framesize}= | Set Variable | 1518 +| | ${duration}= | Set Variable | 10 +| | ${rate}= | Set Variable | 10gbps +| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs +| | AND L2 xconnect initialized in a 3-node circular topology +| | Then Traffic should pass with no loss | ${duration} | ${rate} +| | ... | ${framesize} | 3-node-xconnect + +| 2core VPP with rss 1 passes 9000B frames through L2 cross connect at 2x 10Gbps in 3-node topology +| | [Documentation] +| | ... | VPP with 2 cores should pass 9000B frames through L2 cross connect +| | ... | at 2x10Gbps in 3-node topology +| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD +| | ${framesize}= | Set Variable | 9000 +| | ${duration}= | Set Variable | 10 +| | ${rate}= | Set Variable | 10gbps +| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs +| | AND L2 xconnect initialized in a 3-node circular topology +| | Then Traffic should pass with no loss | ${duration} | ${rate} +| | ... | ${framesize} | 3-node-xconnect + +| 4core VPP with rss 2 passes 64B frames through L2 cross connect at 2x 9.9Mpps in 3-node topology +| | [Documentation] +| | ... | VPP with 4 cores and rss 2 should pass 64B frames through L2 cross +| | ... | connect at 2x9.9Mpps in 3-node topology +| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD +| | ${framesize}= | Set Variable | 64 +| | ${duration}= | Set Variable | 10 +| | ${rate}= | Set Variable | 9.9mpps +| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs +| | AND L2 xconnect initialized in a 3-node circular topology +| | Then Traffic should pass with no loss | ${duration} | ${rate} +| | ... | ${framesize} | 3-node-xconnect + +| 4core VPP with rss 2 passes 1518B frames through L2 cross connect at 2x 10Gbps in 3-node topology +| | [Documentation] +| | ... | VPP with 4 cores and rss 2 should pass 1518B frames through L2 cross +| | ... | connect at 2x10Gbps in 3-node topology +| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD +| | ${framesize}= | Set Variable | 1518 +| | ${duration}= | Set Variable | 10 +| | ${rate}= | Set Variable | 10gbps +| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs +| | AND L2 xconnect initialized in a 3-node circular topology +| | Then Traffic should pass with no loss | ${duration} | ${rate} +| | ... | ${framesize} | 3-node-xconnect + +| 4core VPP with rss 2 passes 9000B frames through L2 cross connect at 2x 10Gbps in 3-node topology +| | [Documentation] +| | ... | VPP with 4 cores and rss 2 should pass 9000B frames through L2 cross +| | ... | connect at 2x10Gbps in 3-node topology +| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD +| | ${framesize}= | Set Variable | 9000 +| | ${duration}= | Set Variable | 10 +| | ${rate}= | Set Variable | 10gbps +| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs +| | AND L2 xconnect initialized in a 3-node circular topology +| | Then Traffic should pass with no loss | ${duration} | ${rate} +| | ... | ${framesize} | 3-node-xconnect -- cgit 1.2.3-korg