-# Copyright (c) 2016 Cisco and/or its affiliates.
+# 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:
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.QemuUtils
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_LONG
-| ... | PERFTEST_VHOST | NIC_Intel-X520-DA2 | PERFTEST_BASE
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | VHOST | VM
+| ...
| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
| ... | L3 | Intel-X520-DA2
| Suite Teardown | 3-node Performance Suite Teardown
-| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10
-| ... | ${min_rate}pps | ${framesize} | 3-node-IPv4
-| ... | fail_on_loss=${False}
-| ... | AND | Show Vpp Vhost On All DUTs
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Guest VM with dpdk-testpmd Teardown | ${dut1}
-| ... | ${dut1_vm_refs}
-| ... | AND | Guest VM with dpdk-testpmd Teardown | ${dut2}
-| ... | ${dut2_vm_refs}
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
+| ... | ${min_rate}pps | ${framesize} | 3-node-IPv4
+| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
+| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
+| ...
| Documentation | *RFC2544: Pkt throughput IPv4 test cases with vhost*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
| ${fib_table_2}= | 101
*** Test Cases ***
-| TC01: 64B NDR binary search - DUT IPv4-VHOST - 1thread 1core 1rxq
+| tc01-64B-1t1c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing 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 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1T1C | STHREAD | NDRDISC
| | ${framesize}= | Set Variable | ${64}
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| TC02: 64B PDR binary search - DUT IPv4-VHOST - 1thread 1core 1rxq
+| tc02-64B-1t1c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing 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 10kpps, LT=0.5%.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | ${64}
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${binary_max} | 3-node-IPv4
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
-| TC03: 1518B NDR binary search - DUT IPv4-VHOST - 1thread 1core 1rxq
+| tc03-1518B-1t1c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing 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] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1T1C | STHREAD | NDRDISC
| | ${framesize}= | Set Variable | ${1518}
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| TC04: 1518B PDR binary search - DUT IPv4-VHOST - 1thread 1core 1rxq
+| tc04-1518B-1t1c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing 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] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | ${1518}
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${binary_max} | 3-node-IPv4
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
-| TC05: IMIX_v4_1 NDR binary search - DUT IPv4-VHOST - 1thread 1core 1rxq
+| tc05-IMIX-1t1c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
| | ... | 1 receive queue per NIC port. [Ver] Find NDR for IMIX_v4_1 frame \
| | ... | size using binary search start at 10GE linerate, step 5kpps.
| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1T1C | STHREAD | NDRDISC
| | ${framesize}= | Set Variable | IMIX_v4_1
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| TC06: IMIX_v4_1 PDR binary search - DUT IPv4-VHOST - 1thread 1core 1rxq
+| tc06-IMIX-1t1c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
| | ... | 1 receive queue per NIC port. [Ver] Find PDR for IMIX_v4_1 frame \
| | ... | size using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | IMIX_v4_1
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${binary_max} | 3-node-IPv4
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
-| TC07: 64B NDR binary search - DUT IPv4-VHOST - 2threads 2cores 1rxq
+| tc07-64B-2t2c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
| | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames \
| | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2T2C | MTHREAD | NDRDISC
| | ${framesize}= | Set Variable | ${64}
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| TC08: 64B PDR binary search - DUT IPv4-VHOST - 2threads 2cores 1rxq
+| tc08-64B-2t2c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
| | ... | 1 receive queue per NIC port. [Ver] Find PDR for 64 Byte frames \
| | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | ${64}
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${binary_max} | 3-node-IPv4
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
-| TC09: 1518B NDR binary search - DUT IPv4-VHOST - 2threads 2cores 1rxq
+| tc09-1518B-2t2c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
| | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames \
| | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | ${1518}
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| TC10: 1518B PDR binary search - DUT IPv4-VHOST - 2threads 2cores 1rxq
+| tc10-1518B-2t2c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
| | ... | 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] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | ${1518}
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${binary_max} | 3-node-IPv4
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
-| TC11: IMIX_v4_1 NDR binary search - DUT IPv4-VHOST - 2threads 2cores 1rxq
+| tc11-IMIX-2t2c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
| | ... | 1 receive queue per NIC port. [Ver] Find NDR for IMIX_v4_1 frame \
| | ... | size using binary search start at 10GE linerate, step 5kpps.
| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | IMIX_v4_1
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| TC12: IMIX_v4_1 PDR binary search - DUT IPv4-VHOST - 2threads 2cores 1rxq
+| tc12-IMIX-2t2c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
| | ... | 1 receive queue per NIC port. [Ver] Find PDR for IMIX_v4_1 frame \
| | ... | size using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | IMIX_v4_1
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${binary_max} | 3-node-IPv4
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
-| TC13: 64B NDR binary search - DUT IPv4-VHOST - 4threads 4cores 2rxq
+| tc13-64B-4t4c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
| | ... | 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte frames \
| | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4T4C | MTHREAD | NDRDISC
| | ${framesize}= | Set Variable | ${64}
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| TC14: 64B PDR binary search - DUT IPv4-VHOST - 4threads 4cores 2rxq
+| tc14-64B-4t4c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
| | ... | 2 receive queues per NIC port. [Ver] Find PDR for 64 Byte frames \
| | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | ${64}
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${binary_max} | 3-node-IPv4
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
-| TC15: 1518B NDR binary search - DUT IPv4-VHOST - 4threads 4cores 2rxq
+| tc15-1518B-4t4c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
| | ... | 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte frames \
| | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | ${1518}
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| TC16: 1518B PDR binary search - DUT IPv4-VHOST - 4threads 4cores 2rxq
+| tc16-1518B-4t4c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
| | ... | 2 receive queues per NIC port. [Ver] Find PDR for 1518 Byte frames \
| | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | ${1518}
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${binary_max} | 3-node-IPv4
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
-| TC17: IMIX_v4_1 NDR binary search - DUT IPv4-VHOST - 4threads 4cores 2rxq
+| tc17-IMIX-4t4c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
| | ... | 2 receive queues per NIC port. [Ver] Find NDR for IMIX_v4_1 frame \
| | ... | size using binary search start at 10GE linerate, step 5kpps.
| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | IMIX_v4_1
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| TC18: IMIX_v4_1 PDR binary search - DUT IPv4-VHOST - 4threads 4cores 2rxq
+| tc18-IMIX-4t4c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
| | [Documentation]
| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
| | ... | 2 receive queues per NIC port. [Ver] Find PDR for IMIX_v4_1 frame \
| | ... | size using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
| | ${framesize}= | Set Variable | IMIX_v4_1
| | ${min_rate}= | Set Variable | ${10000}
| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
| | ... | ${binary_max} | 3-node-IPv4
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
-
-
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}