aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2017-02-22 09:06:27 +0100
committerTibor Frank <tifrank@cisco.com>2017-03-08 15:43:11 +0100
commitfe29ca4b7e6c412c69f1c56404513a33236aa617 (patch)
treecedea250eb5dbc2ce52db6bb87eeddfe31792862 /tests
parent77ab7e4cc80e237331bfd7938974c74393294933 (diff)
CSIT-530: Add common setup and teardown to perf tests
Change-Id: I2e76de710b4b758eac1d24d447a9c5938f937385 Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrdisc.robot23
-rw-r--r--tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot124
-rw-r--r--tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrdisc.robot57
-rw-r--r--tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot50
-rw-r--r--tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrdisc.robot50
-rw-r--r--tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot124
-rw-r--r--tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrdisc.robot57
-rw-r--r--tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot65
-rw-r--r--tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot124
-rw-r--r--tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrdisc.robot21
-rw-r--r--tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrdisc.robot63
-rw-r--r--tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot124
-rw-r--r--tests/perf/10ge2p1x520-eth-l2xcbase-ndrdisc.robot61
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot238
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrdisc.robot63
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrdisc.robot61
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot130
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrdisc.robot63
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot148
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrdisc.robot63
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot130
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4base-ndrdisc.robot67
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot150
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrdisc.robot56
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot150
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrdisc.robot56
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot168
-rw-r--r--tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrdisc.robot56
-rw-r--r--tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot234
-rw-r--r--tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrdisc.robot59
-rw-r--r--tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot234
-rw-r--r--tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrdisc.robot59
-rw-r--r--tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot52
-rw-r--r--tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrdisc.robot41
-rw-r--r--tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot119
-rw-r--r--tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrdisc.robot55
-rw-r--r--tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot232
-rw-r--r--tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrdisc.robot57
-rw-r--r--tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot143
-rw-r--r--tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrdisc.robot57
-rw-r--r--tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot124
-rw-r--r--tests/perf/10ge2p1x520-ethip6-ip6base-ndrdisc.robot57
-rw-r--r--tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot148
-rw-r--r--tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrdisc.robot54
-rw-r--r--tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot148
-rw-r--r--tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrdisc.robot54
-rw-r--r--tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot148
-rw-r--r--tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrdisc.robot54
-rw-r--r--tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot234
-rw-r--r--tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrdisc.robot59
-rw-r--r--tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot230
-rw-r--r--tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot55
-rw-r--r--tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot52
-rw-r--r--tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrdisc.robot21
-rw-r--r--tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrdisc.robot23
-rw-r--r--tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot52
-rw-r--r--tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrdisc.robot26
-rw-r--r--tests/perf/40ge2p1xl710-eth-l2xcbase-ndrdisc.robot23
-rw-r--r--tests/perf/40ge2p1xl710-ethip4-ip4base-ndrdisc.robot29
-rw-r--r--tests/perf/40ge2p1xl710-ethip6-ip6base-ndrdisc.robot23
-rw-r--r--tests/perf/__init__.robot21
61 files changed, 2691 insertions, 2828 deletions
diff --git a/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrdisc.robot b/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrdisc.robot
index cdc07dd71e..8d05d16c7d 100644
--- a/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrdisc.robot
+++ b/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,19 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Cisco-VIC-1227 | ETH | L2BDMACLRN | BASE
+| ...
| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
| ... | L2 | Cisco-VIC-1227
| 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-bridge
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-bridge
+| ...
| Documentation | *RFC2544: Pkt throughput L2BD test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -92,8 +91,8 @@
| | Set Test Documentation | [Ver] Find PDR for ${framesize} Byte\ | append=True
| | Set Test Documentation | frames using binary search start at\ | append=True
| | Set Test Documentation | 10GE linerate, step ${threshold}pps, | append=True
-| | Set Test Documentation | LT=${glob_loss_acceptance} | append=True
-| | Set Test Documentation | ${glob_loss_acceptance_type}. | append=True
+| | Set Test Documentation | LT=${perf_pdr_loss_acceptance} | append=True
+| | Set Test Documentation | ${perf_pdr_loss_acceptance_type}. | append=True
| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo
| | Add PCI devices to DUTs from 3-node single link topology
| | Run Keyword If | ${framesize} < ${1522} | Add No Multi Seg to all DUTs
@@ -102,7 +101,7 @@
| | Find PDR using binary search and pps
| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
*** Test Cases ***
| tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrdisc
diff --git a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot
index 9430aea565..7254466a10 100644
--- a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,14 +14,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Resource | resources/libraries/robot/tagging.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1AD
+| ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1AD
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput L2XC with 802.1ad verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -58,13 +61,12 @@
| | ... | frames using single trial throughput test at 2x 2.9mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 2.9mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -74,8 +76,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc02-1514B-1t1c-dot1ad-l2xcbase-ndrchk
| | [Documentation]
@@ -84,13 +86,12 @@
| | ... | frames using single trial throughput test at 2x 810635pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1514
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 810635pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -100,8 +101,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc03-9000B-1t1c-dot1ad-l2xcbase-ndrchk
| | [Documentation]
@@ -110,12 +111,11 @@
| | ... | frames using single trial throughput test at 2x 138458pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138458pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -125,8 +125,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc04-64B-2t2c-dot1ad-l2xcbase-ndrchk
| | [Documentation]
@@ -135,13 +135,12 @@
| | ... | frames using single trial throughput test at 2x 7.0mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.0mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -151,8 +150,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc05-1514B-2t2c-dot1ad-l2xcbase-ndrchk
| | [Documentation]
@@ -161,13 +160,12 @@
| | ... | frames using single trial throughput test at 2x 810635pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1514
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 810635pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -177,8 +175,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc06-9000B-2t2c-dot1ad-l2xcbase-ndrchk
| | [Documentation]
@@ -187,12 +185,11 @@
| | ... | frames using single trial throughput test at 2x 138458pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138458pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -202,8 +199,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc07-64B-4t4c-dot1ad-l2xcbase-ndrchk
| | [Documentation]
@@ -212,13 +209,12 @@
| | ... | frames using single trial throughput test at 2x 8.0mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 8.0mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -228,8 +224,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc08-1514B-4t4c-dot1ad-l2xcbase-ndrchk
| | [Documentation]
@@ -238,13 +234,12 @@
| | ... | frames using single trial throughput test at 2x 810635pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1514
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 810635pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -254,8 +249,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc09-9000B-4t4c-dot1ad-l2xcbase-ndrchk
| | [Documentation]
@@ -264,12 +259,11 @@
| | ... | frames using single trial throughput test at 2x 138458pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138458pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -279,5 +273,5 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
diff --git a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrdisc.robot b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrdisc.robot
index e4f2fb1e3c..33f299a917 100644
--- a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,19 +14,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Resource | resources/libraries/robot/tagging.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1AD
+| ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1AD
+| ...
| 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
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10
-| ... | ${min_rate}pps | ${framesize} | 3-node-xconnect
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-xconnect
+| ...
| Documentation | *RFC2544: Pkt throughput L2XC with 802.1ad test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -56,7 +55,7 @@
| ${inner_vlan_id}= | 200
| ${type_subif}= | two_tags
| ${tag_rewrite}= | pop-2
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -121,8 +120,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1514B-1t1c-dot1ad-l2xcbase-ndrdisc
| | [Documentation]
@@ -185,8 +184,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-dot1ad-l2xcbase-ndrdisc
| | [Documentation]
@@ -247,8 +246,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-dot1ad-l2xcbase-ndrdisc
| | [Documentation]
@@ -311,8 +310,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1514B-2t2c-dot1ad-l2xcbase-ndrdisc
| | [Documentation]
@@ -375,8 +374,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-dot1ad-l2xcbase-ndrdisc
| | [Documentation]
@@ -437,8 +436,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-dot1ad-l2xcbase-ndrdisc
| | [Documentation]
@@ -501,8 +500,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1514B-4t4c-dot1ad-l2xcbase-ndrdisc
| | [Documentation]
@@ -565,8 +564,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-dot1ad-l2xcbase-ndrdisc
| | [Documentation]
@@ -627,5 +626,5 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot b/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
index 028c9e00f9..1e78f1dc53 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
@@ -14,23 +14,20 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.QemuUtils
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | DOT1Q | L2BDMACLRN | BASE | VHOST | VM
+| ... | NIC_Intel-X520-DA2 | DOT1Q | L2BDMACLRN | BASE | VHOST | VM
+| ...
| 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
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
-| ... | 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-bridge
+| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
+| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
+| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with vhost*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -141,7 +138,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -211,7 +209,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-IMIX-1t1c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -285,7 +284,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -355,7 +355,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -425,7 +426,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-IMIX-2t2c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -499,7 +501,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -569,7 +572,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -639,7 +643,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-IMIX-4t4c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -713,4 +718,5 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrdisc.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrdisc.robot
index 46bbc3be41..575bda7b59 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrdisc.robot
@@ -14,23 +14,20 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.NodePath
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | DOT1Q | L2XCFWD | BASE | VHOST | VM
+| ... | NIC_Intel-X520-DA2 | DOT1Q | L2XCFWD | BASE | VHOST | VM
+| ...
| 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
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
-| ... | 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-xconnect
+| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
+| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
+| ...
| Documentation | *RFC2544: Pkt throughput L2XC test cases with vhost*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -135,7 +132,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -203,7 +201,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-IMIX-1t1c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -275,7 +274,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -343,7 +343,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -411,7 +412,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-IMIX-2t2c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -483,7 +485,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -551,7 +554,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -619,7 +623,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-IMIX-4t4c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -691,4 +696,5 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
index 9d7f9e3fb1..d033886961 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,14 +14,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Resource | resources/libraries/robot/tagging.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1Q
+| ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1Q
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput L2XC with 802.1q verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -54,13 +57,12 @@
| | ... | frames using single trial throughput test at 2x 2.9mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 2.9mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | And L2 tag rewrite method setup on interfaces
@@ -69,8 +71,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc02-1518B-1t1c-dot1q-l2xcbase-ndrchk
| | [Documentation]
@@ -79,13 +81,12 @@
| | ... | frames using single trial throughput test at 2x 720000pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 720000pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | And L2 tag rewrite method setup on interfaces
@@ -94,8 +95,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc03-9000B-1t1c-dot1q-l2xcbase-ndrchk
| | [Documentation]
@@ -104,12 +105,11 @@
| | ... | frames using single trial throughput test at 2x 120000pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | And L2 tag rewrite method setup on interfaces
@@ -118,8 +118,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc04-64B-2t2c-dot1q-l2xcbase-ndrchk
| | [Documentation]
@@ -128,13 +128,12 @@
| | ... | frames using single trial throughput test at 2x 7.0mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.0mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | And L2 tag rewrite method setup on interfaces
@@ -143,8 +142,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc05-1518B-2t2c-dot1q-l2xcbase-ndrchk
| | [Documentation]
@@ -153,13 +152,12 @@
| | ... | frames using single trial throughput test at 2x 720000pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 720000pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | And L2 tag rewrite method setup on interfaces
@@ -168,8 +166,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc06-9000B-2t2c-dot1q-l2xcbase-ndrchk
| | [Documentation]
@@ -178,12 +176,11 @@
| | ... | frames using single trial throughput test at 2x 120000pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | And L2 tag rewrite method setup on interfaces
@@ -192,8 +189,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc07-64B-4t4c-dot1q-l2xcbase-ndrchk
| | [Documentation]
@@ -202,13 +199,12 @@
| | ... | frames using single trial throughput test at 2x 11.0mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 11.0mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | And L2 tag rewrite method setup on interfaces
@@ -217,8 +213,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc08-1518B-4t4c-dot1q-l2xcbase-ndrchk
| | [Documentation]
@@ -227,13 +223,12 @@
| | ... | frames using single trial throughput test at 2x 720000pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 720000pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | And L2 tag rewrite method setup on interfaces
@@ -242,8 +237,8 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc09-9000B-4t4c-dot1q-l2xcbase-ndrchk
| | [Documentation]
@@ -252,12 +247,11 @@
| | ... | frames using single trial throughput test at 2x 120000pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
| | And L2 tag rewrite method setup on interfaces
@@ -266,5 +260,5 @@
| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
| | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrdisc.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrdisc.robot
index 950e351aa0..74d8bd886b 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,19 +14,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Resource | resources/libraries/robot/tagging.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1Q
+| ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1Q
| 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
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10
-| ... | ${min_rate}pps | ${framesize} | 3-node-xconnect
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-xconnect
+| ...
| Documentation | *RFC2544: Pkt throughput L2XC with 802.1q test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -52,7 +51,7 @@
*** Variables ***
| ${subid}= | 10
| ${tag_rewrite}= | pop-1
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -115,8 +114,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-dot1q-l2xcbase-ndrdisc
| | [Documentation]
@@ -177,8 +176,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-dot1q-l2xcbase-ndrdisc
| | [Documentation]
@@ -237,8 +236,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-dot1q-l2xcbase-ndrdisc
| | [Documentation]
@@ -299,8 +298,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-dot1q-l2xcbase-ndrdisc
| | [Documentation]
@@ -361,8 +360,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-dot1q-l2xcbase-ndrdisc
| | [Documentation]
@@ -421,8 +420,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-dot1q-l2xcbase-ndrdisc
| | [Documentation]
@@ -483,8 +482,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-dot1q-l2xcbase-ndrdisc
| | [Documentation]
@@ -545,8 +544,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-dot1q-l2xcbase-ndrdisc
| | [Documentation]
@@ -605,5 +604,5 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
index 3a69864ce0..bfeca461f5 100644
--- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,23 +14,20 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.QemuUtils
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | VHOST | VM
+| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | VHOST | VM
+| ...
| 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
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
-| ... | 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-bridge
+| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
+| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
+| ...
| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -59,9 +56,9 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
-#Socket names
+# Socket names
| ${bd_id1}= | 1
| ${bd_id2}= | 2
| ${sock1}= | /tmp/sock-1-${bd_id1}
@@ -131,8 +128,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -197,8 +194,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -264,8 +261,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -330,8 +327,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -396,8 +393,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -464,8 +461,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -530,8 +527,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -596,8 +593,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -664,5 +661,5 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
index e8aa347cd7..d21cf2b431 100644
--- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,14 +14,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.NodePath
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE
+| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput L2BD verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -50,15 +53,14 @@
| | ... | frames using single trial throughput test at 2x 3.2mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.2mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-bridge
| tc02-1518B-1t1c-eth-l2bdbasemaclrn-ndrchk
| | [Documentation]
@@ -67,15 +69,14 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-bridge
| tc03-9000B-1t1c-eth-l2bdbasemaclrn-ndrchk
| | [Documentation]
@@ -84,14 +85,13 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-bridge
| tc04-64B-2t2c-eth-l2bdbasemaclrn-ndrchk
| | [Documentation]
@@ -100,15 +100,14 @@
| | ... | frames using single trial throughput test at 2x 6.9mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 6.9mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-bridge
| tc05-1518B-2t2c-eth-l2bdbasemaclrn-ndrchk
| | [Documentation]
@@ -117,15 +116,14 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-bridge
| tc06-9000B-2t2c-eth-l2bdbasemaclrn-ndrchk
| | [Documentation]
@@ -134,14 +132,13 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-bridge
| tc07-64B-4t4c-eth-l2bdbasemaclrn-ndrchk
| | [Documentation]
@@ -150,15 +147,14 @@
| | ... | frames using single trial throughput test at 2x 7.4mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.4mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-bridge
| tc08-1518B-4t4c-eth-l2bdbasemaclrn-ndrchk
| | [Documentation]
@@ -167,15 +163,14 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-bridge
| tc09-9000B-4t4c-eth-l2bdbasemaclrn-ndrchk
| | [Documentation]
@@ -184,11 +179,10 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-bridge
diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrdisc.robot
index 8fdaf17995..dff612f0a9 100644
--- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,19 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE
+| ...
| 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
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-bridge
+| ...
| Documentation | *RFC2544: Pkt throughput L2BD test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -49,7 +48,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Keywords ***
@@ -88,7 +87,7 @@
| | Find PDR using binary search and pps
| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
*** Test Cases ***
| tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrdisc
diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrdisc.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrdisc.robot
index 6491e67771..17a339328a 100644
--- a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,23 +14,20 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.NodePath
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | VHOST | VM
+| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | VHOST | VM
+| ...
| 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
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
-| ... | 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-xconnect
+| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
+| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
+| ...
| Documentation | *RFC2544: Pkt throughput L2XC test cases with vhost*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -62,7 +59,7 @@
| ${bd_id2}= | 2
| ${sock1}= | /tmp/sock-1-${bd_id1}
| ${sock2}= | /tmp/sock-1-${bd_id2}
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -129,8 +126,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -195,8 +192,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-IMIX-1t1c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -263,8 +260,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -329,8 +326,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -395,8 +392,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-IMIX-2t2c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -463,8 +460,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -529,8 +526,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -595,8 +592,8 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-IMIX-4t4c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -663,6 +660,6 @@
| | ... | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot
index 4c8c4fd835..49872c845f 100644
--- a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -15,14 +15,17 @@
| 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 | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE
+| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput L2XC verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -50,15 +53,14 @@
| | ... | frames using single trial throughput test at 2x 3.6mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.6mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc02-1518B-1t1c-eth-l2xcbase-ndrchk
| | [Documentation]
@@ -67,15 +69,14 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc03-9000B-1t1c-eth-l2xcbase-ndrchk
| | [Documentation]
@@ -84,14 +85,13 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc04-64B-2t2c-eth-l2xcbase-ndrchk
| | [Documentation]
@@ -100,15 +100,14 @@
| | ... | frames using single trial throughput test at 2x 8.3mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 8.3mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc05-1518B-2t2c-eth-l2xcbase-ndrchk
| | [Documentation]
@@ -117,15 +116,14 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc06-9000B-2t2c-eth-l2xcbase-ndrchk
| | [Documentation]
@@ -134,14 +132,13 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc07-64B-4t4c-eth-l2xcbase-ndrchk
| | [Documentation]
@@ -150,15 +147,14 @@
| | ... | frames using single trial throughput test at 2x 9.3mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 9.3mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc08-1518B-4t4c-eth-l2xcbase-ndrchk
| | [Documentation]
@@ -167,15 +163,14 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc09-9000B-4t4c-eth-l2xcbase-ndrchk
| | [Documentation]
@@ -184,11 +179,10 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrdisc.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrdisc.robot
index 68ff3bd863..475c32db4a 100644
--- a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -15,19 +15,18 @@
| 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 | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE
+| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE
+| ...
| 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
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10
-| ... | ${min_rate}pps | ${framesize} | 3-node-xconnect
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-xconnect
+| ...
| Documentation | *RFC2544: Pkt throughput L2XC test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -50,7 +49,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -97,8 +96,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-eth-l2xcbase-ndrdisc
| | [Documentation]
@@ -143,8 +142,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-eth-l2xcbase-ndrdisc
| | [Documentation]
@@ -187,8 +186,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-eth-l2xcbase-ndrdisc
| | [Documentation]
@@ -233,8 +232,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-eth-l2xcbase-ndrdisc
| | [Documentation]
@@ -279,8 +278,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-eth-l2xcbase-ndrdisc
| | [Documentation]
@@ -323,8 +322,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-eth-l2xcbase-ndrdisc
| | [Documentation]
@@ -369,8 +368,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-eth-l2xcbase-ndrdisc
| | [Documentation]
@@ -415,8 +414,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-eth-l2xcbase-ndrdisc
| | [Documentation]
@@ -459,8 +458,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc19-IMIX-1t1c-eth-l2xcbase-ndrdisc
| | [Documentation]
@@ -507,5 +506,5 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
index 3d1d83eeab..a40348a090 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,16 +14,21 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.Cop
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
+| ... | WITH NAME | dut1_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
+| ... | WITH NAME | dut2_v4
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | COPWHLIST
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | COPWHLIST
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv4 whitelist verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -54,21 +59,20 @@
| | ... | at 2x 3.5mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.5mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc02-1518B-1t1c-ethip4-ip4base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -78,21 +82,20 @@
| | ... | at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc03-9000B-1t1c-ethip4-ip4base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -102,20 +105,19 @@
| | ... | at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc04-64B-2t2c-ethip4-ip4base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -125,21 +127,20 @@
| | ... | at 2x 6.6mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 6.6mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc05-1518B-2t2c-ethip4-ip4base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -149,21 +150,20 @@
| | ... | at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc06-9000B-2t2c-ethip4-ip4base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -173,20 +173,19 @@
| | ... | at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc07-64B-4t4c-ethip4-ip4base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -196,21 +195,20 @@
| | ... | at 2x 10.0mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 10.0mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc08-1518B-4t4c-ethip4-ip4base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -220,21 +218,20 @@
| | ... | at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc09-9000B-4t4c-ethip4-ip4base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -244,17 +241,16 @@
| | ... | at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrdisc.robot
index 06c1f50ae3..b6afedc547 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,21 +14,22 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.Cop
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
+| ... | WITH NAME | dut1_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
+| ... | WITH NAME | dut2_v4
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | COPWHLIST
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | COPWHLIST
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv4
+| ...
| Documentation | *RFC2544: Pkt throughput IPv4 whitelist test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -53,7 +54,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -114,8 +115,8 @@
| | ... | ${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-1t1c-ethip4-ip4base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -174,8 +175,8 @@
| | ... | ${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-9000B-1t1c-ethip4-ip4base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -232,8 +233,8 @@
| | ... | ${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-2t2c-ethip4-ip4base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -292,8 +293,8 @@
| | ... | ${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-2t2c-ethip4-ip4base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -352,8 +353,8 @@
| | ... | ${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-9000B-2t2c-ethip4-ip4base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -410,8 +411,8 @@
| | ... | ${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-4t4c-ethip4-ip4base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -470,8 +471,8 @@
| | ... | ${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-4t4c-ethip4-ip4base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -530,8 +531,8 @@
| | ... | ${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-9000B-4t4c-ethip4-ip4base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -588,5 +589,5 @@
| | ... | ${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}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrdisc.robot
index 4ef191ffe4..b085cfb6c2 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,23 +14,20 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.QemuUtils
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | VHOST | VM
+| ... | 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
@@ -134,8 +131,8 @@
| | ... | ${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-1t1c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -204,8 +201,8 @@
| | ... | ${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-1t1c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -275,8 +272,8 @@
| | ... | ${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-2t2c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -345,8 +342,8 @@
| | ... | ${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-2t2c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -415,8 +412,8 @@
| | ... | ${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-2t2c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -487,8 +484,8 @@
| | ... | ${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-4t4c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -557,8 +554,8 @@
| | ... | ${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-4t4c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -627,8 +624,8 @@
| | ... | ${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-4t4c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -699,5 +696,5 @@
| | ... | ${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}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
index 3aaa770ad3..df0083e3ad 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,16 +14,21 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.Classify.Classify
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
+| ... | WITH NAME | dut1_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
+| ... | WITH NAME | dut2_v4
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | IACLDST
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | IACLDST
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv4 whitelist verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -54,13 +59,12 @@
| | ... | at 2x 3.1mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.1mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
| | ... | ${dut1} | ip4 | dst
| | And Vpp Configures Classify Session L3
@@ -75,8 +79,8 @@
| | ... | ip4 | dst | 10.10.10.2
| | And Vpp Enable Input Acl Interface
| | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc02-1518B-1t1c-ethip4-ip4base-iacldstbase-ndrchk
| | [Documentation]
@@ -86,13 +90,12 @@
| | ... | at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
| | ... | ${dut1} | ip4 | dst
| | And Vpp Configures Classify Session L3
@@ -107,8 +110,8 @@
| | ... | ip4 | dst | 10.10.10.2
| | And Vpp Enable Input Acl Interface
| | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc03-9000B-1t1c-ethip4-ip4base-iacldstbase-ndrchk
| | [Documentation]
@@ -118,12 +121,11 @@
| | ... | at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
| | ... | ${dut1} | ip4 | dst
| | And Vpp Configures Classify Session L3
@@ -138,8 +140,8 @@
| | ... | ip4 | dst | 10.10.10.2
| | And Vpp Enable Input Acl Interface
| | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc04-64B-2t2c-ethip4-ip4base-iacldstbase-ndrchk
| | [Documentation]
@@ -149,13 +151,12 @@
| | ... | at 2x 5.8mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 5.8mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
| | ... | ${dut1} | ip4 | dst
| | And Vpp Configures Classify Session L3
@@ -170,8 +171,8 @@
| | ... | ip4 | dst | 10.10.10.2
| | And Vpp Enable Input Acl Interface
| | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc05-1518B-2t2c-ethip4-ip4base-iacldstbase-ndrchk
| | [Documentation]
@@ -181,13 +182,12 @@
| | ... | at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
| | ... | ${dut1} | ip4 | dst
| | And Vpp Configures Classify Session L3
@@ -202,8 +202,8 @@
| | ... | ip4 | dst | 10.10.10.2
| | And Vpp Enable Input Acl Interface
| | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc06-9000B-2t2c-ethip4-ip4base-iacldstbase-ndrchk
| | [Documentation]
@@ -213,12 +213,11 @@
| | ... | at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
| | ... | ${dut1} | ip4 | dst
| | And Vpp Configures Classify Session L3
@@ -233,8 +232,8 @@
| | ... | ip4 | dst | 10.10.10.2
| | And Vpp Enable Input Acl Interface
| | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc07-64B-4t4c-ethip4-ip4base-iacldstbase-ndrchk
| | [Documentation]
@@ -244,13 +243,12 @@
| | ... | at 2x 7.8mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.8mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
| | ... | ${dut1} | ip4 | dst
| | And Vpp Configures Classify Session L3
@@ -265,8 +263,8 @@
| | ... | ip4 | dst | 10.10.10.2
| | And Vpp Enable Input Acl Interface
| | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc08-1518B-4t4c-ethip4-ip4base-iacldstbase-ndrchk
| | [Documentation]
@@ -276,13 +274,12 @@
| | ... | at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
| | ... | ${dut1} | ip4 | dst
| | And Vpp Configures Classify Session L3
@@ -297,8 +294,8 @@
| | ... | ip4 | dst | 10.10.10.2
| | And Vpp Enable Input Acl Interface
| | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc09-9000B-4t4c-ethip4-ip4base-iacldstbase-ndrchk
| | [Documentation]
@@ -308,12 +305,11 @@
| | ... | at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
| | ... | ${dut1} | ip4 | dst
| | And Vpp Configures Classify Session L3
@@ -328,5 +324,5 @@
| | ... | ip4 | dst | 10.10.10.2
| | And Vpp Enable Input Acl Interface
| | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrdisc.robot
index 27a4d3adab..ee33e0761a 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,21 +14,22 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.Classify.Classify
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
+| ... | WITH NAME | dut1_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
+| ... | WITH NAME | dut2_v4
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | IACLDST
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | IACLDST
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv4
+| ...
| Documentation | *RFC2544: Pkt throughput IPv4 iAcl whitelist test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -53,7 +54,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -130,8 +131,8 @@
| | ... | ${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-1t1c-ethip4-ip4base-iacldstbase-ndrdisc
| | [Documentation]
@@ -206,8 +207,8 @@
| | ... | ${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-9000B-1t1c-ethip4-ip4base-iacldstbase-ndrdisc
| | [Documentation]
@@ -280,8 +281,8 @@
| | ... | ${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-2t2c-ethip4-ip4base-iacldstbase-ndrdisc
| | [Documentation]
@@ -356,8 +357,8 @@
| | ... | ${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-2t2c-ethip4-ip4base-iacldstbase-ndrdisc
| | [Documentation]
@@ -432,8 +433,8 @@
| | ... | ${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-9000B-2t2c-ethip4-ip4base-iacldstbase-ndrdisc
| | [Documentation]
@@ -506,8 +507,8 @@
| | ... | ${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-4t4c-ethip4-ip4base-iacldstbase-ndrdisc
| | [Documentation]
@@ -582,8 +583,8 @@
| | ... | ${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-4t4c-ethip4-ip4base-iacldstbase-ndrdisc
| | [Documentation]
@@ -658,8 +659,8 @@
| | ... | ${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-9000B-4t4c-ethip4-ip4base-iacldstbase-ndrdisc
| | [Documentation]
@@ -732,5 +733,5 @@
| | ... | ${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}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
index 45d7263aab..2ef238c818 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,16 +14,21 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.Policer
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
+| ... | WITH NAME | dut1_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
+| ... | WITH NAME | dut2_v4
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | DOT1Q
+| ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | DOT1Q
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv4 policer verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -57,18 +62,17 @@
| | ... | Byte frames using single trial throughput test at 2x 3.1mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.1mpps
| | Set Test Variable | ${cb} | ${framesize}
| | Set Test Variable | ${eb} | ${framesize}
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc02-1518B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrchk
| | [Documentation]
@@ -77,18 +81,17 @@
| | ... | Byte frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Set Test Variable | ${cb} | ${framesize}
| | Set Test Variable | ${eb} | ${framesize}
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv4 forwarding initialized in a 3-node circular topology
-| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc03-9000B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrchk
| | [Documentation]
@@ -97,17 +100,16 @@
| | ... | Byte frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Set Test Variable | ${cb} | ${framesize}
| | Set Test Variable | ${eb} | ${framesize}
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc04-64B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrchk
| | [Documentation]
@@ -116,18 +118,17 @@
| | ... | 64 Byte frames using single trial throughput test at 2x 5.6mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 5.6mpps
| | Set Test Variable | ${cb} | ${framesize}
| | Set Test Variable | ${eb} | ${framesize}
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc05-1518B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrchk
| | [Documentation]
@@ -136,18 +137,17 @@
| | ... | 1518 Byte frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Set Test Variable | ${cb} | ${framesize}
| | Set Test Variable | ${eb} | ${framesize}
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc06-9000B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrchk
| | [Documentation]
@@ -156,17 +156,16 @@
| | ... | 9000 Byte frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Set Test Variable | ${cb} | ${framesize}
| | Set Test Variable | ${eb} | ${framesize}
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc07-64B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrchk
| | [Documentation]
@@ -175,18 +174,17 @@
| | ... | Byte frames using single trial throughput test at 2x 8.9mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 8.9mpps
| | Set Test Variable | ${cb} | ${framesize}
| | Set Test Variable | ${eb} | ${framesize}
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc08-1518B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrchk
| | [Documentation]
@@ -195,18 +193,17 @@
| | ... | 1518 Byte frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Set Test Variable | ${cb} | ${framesize}
| | Set Test Variable | ${eb} | ${framesize}
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc09-9000B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrchk
| | [Documentation]
@@ -215,14 +212,13 @@
| | ... | 9000 Byte frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Set Test Variable | ${cb} | ${framesize}
| | Set Test Variable | ${eb} | ${framesize}
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrdisc.robot
index 5ec500eb62..02cc4d71db 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,21 +14,22 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.Policer
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
+| ... | WITH NAME | dut1_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
+| ... | WITH NAME | dut2_v4
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | DOT1Q
+| ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | DOT1Q
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv4
+| ...
| Documentation | *RFC2544: Pkt throughput IPv4 policer test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -53,7 +54,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC2698.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
| ${cir}= | ${100}
| ${eir}= | ${150}
@@ -110,8 +111,8 @@
| | ... | ${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-1t1c-ethip4-ip4base-ipolicemarkbase-ndrdisc
| | [Documentation]
@@ -163,8 +164,8 @@
| | ... | ${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-9000B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrdisc
| | [Documentation]
@@ -214,8 +215,8 @@
| | ... | ${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-2t2c-ethip4-ip4base-ipolicemarkbase-ndrdisc
| | [Documentation]
@@ -268,8 +269,8 @@
| | ... | ${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-2t2c-ethip4-ip4base-ipolicemarkbase-ndrdisc
| | [Documentation]
@@ -321,8 +322,8 @@
| | ... | ${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-9000B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrdisc
| | [Documentation]
@@ -372,8 +373,8 @@
| | ... | ${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-4t4c-ethip4-ip4base-ipolicemarkbase-ndrdisc
| | [Documentation]
@@ -425,8 +426,8 @@
| | ... | ${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-4t4c-ethip4-ip4base-ipolicemarkbase-ndrdisc
| | [Documentation]
@@ -478,8 +479,8 @@
| | ... | ${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-9000B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrdisc
| | [Documentation]
@@ -529,5 +530,5 @@
| | ... | ${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}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot
index 1f9f09a40e..f7322da9b8 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -16,16 +16,21 @@
| Library | resources.libraries.python.topology.Topology
| Library | resources.libraries.python.NodePath
| Library | resources.libraries.python.InterfaceUtil
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
+| ... | WITH NAME | dut1_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
+| ... | WITH NAME | dut2_v4
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv4 routing verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -54,15 +59,14 @@
| | ... | frames using single trial throughput test at 2x 3.5mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.5mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc02-1518B-1t1c-ethip4-ip4base-ndrchk
| | [Documentation]
@@ -71,15 +75,14 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc03-9000B-1t1c-ethip4-ip4base-ndrchk
| | [Documentation]
@@ -88,14 +91,13 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc04-64B-2t2c-ethip4-ip4base-ndrchk
| | [Documentation]
@@ -104,15 +106,14 @@
| | ... | frames using single trial throughput test at 2x 7.5mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.5mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc05-1518B-2t2c-ethip4-ip4base-ndrchk
| | [Documentation]
@@ -121,15 +122,14 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc06-9000B-2t2c-ethip4-ip4base-ndrchk
| | [Documentation]
@@ -138,14 +138,13 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc07-64B-4t4c-ethip4-ip4base-ndrchk
| | [Documentation]
@@ -154,15 +153,14 @@
| | ... | frames using single trial throughput test at 2x 10.0mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 10.0mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc08-1518B-4t4c-ethip4-ip4base-ndrchk
| | [Documentation]
@@ -171,15 +169,14 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc08-9000B-4t4c-ethip4-ip4base-ndrchk
| | [Documentation]
@@ -188,11 +185,10 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrdisc.robot
index d9eb9305f3..2b009b2777 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -16,21 +16,22 @@
| Library | resources.libraries.python.topology.Topology
| Library | resources.libraries.python.NodePath
| Library | resources.libraries.python.InterfaceUtil
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
+| ... | WITH NAME | dut1_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
+| ... | WITH NAME | dut2_v4
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv4
+| ...
| Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -54,7 +55,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -101,8 +102,8 @@
| | ... | ${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-1t1c-ethip4-ip4base-ndrdisc
| | [Documentation]
@@ -147,8 +148,8 @@
| | ... | ${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-9000B-1t1c-ethip4-ip4base-ndrdisc
| | [Documentation]
@@ -191,8 +192,8 @@
| | ... | ${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-2t2c-ethip4-ip4base-ndrdisc
| | [Documentation]
@@ -237,8 +238,8 @@
| | ... | ${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-2t2c-ethip4-ip4base-ndrdisc
| | [Documentation]
@@ -283,8 +284,8 @@
| | ... | ${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-9000B-2t2c-ethip4-ip4base-ndrdisc
| | [Documentation]
@@ -327,8 +328,8 @@
| | ... | ${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-4t4c-ethip4-ip4base-ndrdisc
| | [Documentation]
@@ -373,8 +374,8 @@
| | ... | ${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-4t4c-ethip4-ip4base-ndrdisc
| | [Documentation]
@@ -419,8 +420,8 @@
| | ... | ${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-9000B-4t4c-ethip4-ip4base-ndrdisc
| | [Documentation]
@@ -463,8 +464,8 @@
| | ... | ${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}
| tc19-IMIX-1t1c-ethip4-ip4base-ndrdisc
| | [Documentation]
@@ -511,5 +512,5 @@
| | ... | ${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}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot
index 48cd0d3247..89f7b4454d 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,13 +13,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_200K
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_200K
+| ...
| 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 Keyword | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv4 routing verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -51,17 +55,15 @@
| | ... | frames using single trial throughput test at 2x 3.5mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.5mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc02-1518B-1t1c-ethip4-ip4scale200k-ndrchk
| | [Documentation]
@@ -70,17 +72,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc03-9000B-1t1c-ethip4-ip4scale200k-ndrchk
| | [Documentation]
@@ -89,16 +89,14 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc04-64B-2t2c-ethip4-ip4scale200k-ndrchk
| | [Documentation]
@@ -107,17 +105,15 @@
| | ... | frames using single trial throughput test at 2x 7.5mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.5mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc05-1518B-2t2c-ethip4-ip4scale200k-ndrchk
| | [Documentation]
@@ -126,17 +122,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc06-9000B-2t2c-ethip4-ip4scale200k-ndrchk
| | [Documentation]
@@ -145,16 +139,14 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc07-64B-4t4c-ethip4-ip4scale200k-ndrchk
| | [Documentation]
@@ -163,17 +155,15 @@
| | ... | frames using single trial throughput test at 2x 10.0mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 10.0mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc08-1518B-4t4c-ethip4-ip4scale200k-ndrchk
| | [Documentation]
@@ -182,17 +172,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc09-9000B-4t4c-ethip4-ip4scale200k-ndrchk
| | [Documentation]
@@ -201,13 +189,11 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrdisc.robot
index c27c7e504e..99905e27fb 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,18 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_200K
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_200K
+| ...
| 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-dst-${rts_per_flow}
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv4-dst-${rts_per_flow}
+| ...
| Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -49,7 +49,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
| ${rts_per_flow}= | 100000
@@ -101,8 +101,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-ethip4-ip4scale200k-ndrdisc
| | [Documentation]
@@ -151,8 +151,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip4-ip4scale200k-ndrdisc
| | [Documentation]
@@ -199,8 +199,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-ethip4-ip4scale200k-ndrdisc
| | [Documentation]
@@ -249,8 +249,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-ethip4-ip4scale200k-ndrdisc
| | [Documentation]
@@ -299,8 +299,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip4-ip4scale200k-ndrdisc
| | [Documentation]
@@ -347,8 +347,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-ethip4-ip4scale200k-ndrdisc
| | [Documentation]
@@ -397,8 +397,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-ethip4-ip4scale200k-ndrdisc
| | [Documentation]
@@ -447,8 +447,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip4-ip4scale200k-ndrdisc
| | [Documentation]
@@ -495,5 +495,5 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot
index 7ed352e890..1a3404685c 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,13 +13,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_20K
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_20K
+| ...
| 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 Keyword | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv4 routing verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -51,17 +55,15 @@
| | ... | frames using single trial throughput test at 2x 3.5mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.5mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc02-1518B-1t1c-ethip4-ip4scale20k-ndrchk
| | [Documentation]
@@ -70,17 +72,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc03-9000B-1t1c-ethip4-ip4scale20k-ndrchk
| | [Documentation]
@@ -89,16 +89,14 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc04-64B-2t2c-ethip4-ip4scale20k-ndrchk
| | [Documentation]
@@ -107,17 +105,15 @@
| | ... | frames using single trial throughput test at 2x 7.5mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.5mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc05-1518B-2t2c-ethip4-ip4scale20k-ndrchk
| | [Documentation]
@@ -126,17 +122,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc06-9000B-2t2c-ethip4-ip4scale20k-ndrchk
| | [Documentation]
@@ -145,16 +139,14 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc07-64B-4t4c-ethip4-ip4scale20k-ndrchk
| | [Documentation]
@@ -163,17 +155,15 @@
| | ... | frames using single trial throughput test at 2x 10.0mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 10.0mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc08-1518B-4t4c-ethip4-ip4scale20k-ndrchk
| | [Documentation]
@@ -182,17 +172,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc09-9000B-4t4c-ethip4-ip4scale20k-ndrchk
| | [Documentation]
@@ -201,13 +189,11 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrdisc.robot
index c6ab2a7eee..1101b1383e 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,18 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_20K
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_20K
+| ...
| 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-dst-${rts_per_flow}
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv4-dst-${rts_per_flow}
+| ...
| Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -49,7 +49,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
| ${rts_per_flow}= | ${10000}
@@ -101,8 +101,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-ethip4-ip4scale20k-ndrdisc
| | [Documentation]
@@ -151,8 +151,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip4-ip4scale20k-ndrdisc
| | [Documentation]
@@ -199,8 +199,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-ethip4-ip4scale20k-ndrdisc
| | [Documentation]
@@ -249,8 +249,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-ethip4-ip4scale20k-ndrdisc
| | [Documentation]
@@ -299,8 +299,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip4-ip4scale20k-ndrdisc
| | [Documentation]
@@ -347,8 +347,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-ethip4-ip4scale20k-ndrdisc
| | [Documentation]
@@ -397,8 +397,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-ethip4-ip4scale20k-ndrdisc
| | [Documentation]
@@ -447,8 +447,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip4-ip4scale20k-ndrdisc
| | [Documentation]
@@ -495,5 +495,5 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot
index ab05841ef7..35ac274f92 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,13 +13,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_2M
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_2M
+| ...
| 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 Keyword | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv4 routing verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -51,18 +55,16 @@
| | ... | frames using single trial throughput test at 2x 3.5mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.5mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Add Heapsize Config to all DUTs | 3G
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc02-1518B-1t1c-ethip4-ip4scale2m-ndrchk
| | [Documentation]
@@ -71,18 +73,16 @@
| | ... | receive queue per NIC port at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Add Heapsize Config to all DUTs | 3G
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc03-9000B-1t1c-ethip4-ip4scale2m-ndrchk
| | [Documentation]
@@ -91,17 +91,15 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add Heapsize Config to all DUTs | 3G
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc04-64B-2t2c-ethip4-ip4scale2m-ndrchk
| | [Documentation]
@@ -110,18 +108,16 @@
| | ... | frames using single trial throughput test at 2x 7.5mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.5mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Add Heapsize Config to all DUTs | 3G
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc05-1518B-2t2c-ethip4-ip4scale2m-ndrchk
| | [Documentation]
@@ -130,18 +126,16 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Add Heapsize Config to all DUTs | 3G
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc06-9000B-2t2c-ethip4-ip4scale2m-ndrchk
| | [Documentation]
@@ -150,17 +144,15 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add Heapsize Config to all DUTs | 3G
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc07-64B-4t4c-ethip4-ip4scale2m-ndrchk
| | [Documentation]
@@ -169,18 +161,16 @@
| | ... | frames using single trial throughput test at 2x 10.0mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 10.0mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Add Heapsize Config to all DUTs | 3G
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc08-1518B-4t4c-ethip4-ip4scale2m-ndrchk
| | [Documentation]
@@ -189,18 +179,16 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Add Heapsize Config to all DUTs | 3G
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
| tc09-9000B-4t4c-ethip4-ip4scale2m-ndrchk
| | [Documentation]
@@ -209,14 +197,12 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add Heapsize Config to all DUTs | 3G
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv4-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrdisc.robot
index dcb440d7b8..da654591e4 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,18 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_2M
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_2M
+| ...
| 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-dst-${rts_per_flow}
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv4-dst-${rts_per_flow}
+| ...
| Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -49,7 +49,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
| ${rts_per_flow}= | ${1000000}
@@ -103,8 +103,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-ethip4-ip4scale2m-ndrdisc
| | [Documentation]
@@ -155,8 +155,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip4-ip4scale2m-ndrdisc
| | [Documentation]
@@ -205,8 +205,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-ethip4-ip4scale2m-ndrdisc
| | [Documentation]
@@ -257,8 +257,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-ethip4-ip4scale2m-ndrdisc
| | [Documentation]
@@ -309,8 +309,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip4-ip4scale2m-ndrdisc
| | [Documentation]
@@ -359,8 +359,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-ethip4-ip4scale2m-ndrdisc
| | [Documentation]
@@ -411,8 +411,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-ethip4-ip4scale2m-ndrdisc
| | [Documentation]
@@ -463,8 +463,8 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip4-ip4scale2m-ndrdisc
| | [Documentation]
@@ -513,5 +513,5 @@
| | ... | 3-node-IPv4-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot
index 652dbd97ee..85140059c0 100644
--- a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -15,18 +15,21 @@
| Resource | resources/libraries/robot/performance.robot
| Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
-| ... | WITH NAME | dut1_v4
+| ... | WITH NAME | dut1_v4
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
-| ... | WITH NAME | dut2_v4
-# import additional Lisp settings from resource file
+| ... | WITH NAME | dut2_v4
| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
| ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP4UNRLAY | IP4OVRLAY
+| ...
| 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 Keyword | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput Lisp tunnel verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -57,22 +60,21 @@
| | ... | test at 2x 1.9mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 1.9mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc02-1480B-1t1c-ethip4lispip4-ip4base-ndrchk
| | [Documentation]
@@ -82,22 +84,21 @@
| | ... | throughput test at 2x 740000pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1480
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 740000pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc03-9000B-1t1c-ethip4lispip4-ip4base-ndrchk
| | [Documentation]
@@ -107,21 +108,20 @@
| | ... | throughput test at 2x 120000pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc04-64B-2t2c-ethip4lispip4-ip4base-ndrchk
| | [Documentation]
@@ -131,22 +131,21 @@
| | ... | throughput test at 2x 3.6mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.6mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc05-1480B-2t2c-ethip4lispip4-ip4base-ndrchk
| | [Documentation]
@@ -156,22 +155,21 @@
| | ... | throughput test at 2x 740000pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1480
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 740000pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc06-9000B-2t2c-ethip4lispip4-ip4base-ndrchk
| | [Documentation]
@@ -181,21 +179,20 @@
| | ... | throughput test at 2x 120000pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc07-64B-4t4c-ethip4lispip4-ip4base-ndrchk
| | [Documentation]
@@ -205,22 +202,21 @@
| | ... | throughput test at 2x 3.5mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.5mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc08-1480B-4t4c-ethip4lispip4-ip4base-ndrchk
| | [Documentation]
@@ -230,22 +226,21 @@
| | ... | throughput test at 2x 740000pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1480
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 740000pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc09-9000B-4t4c-ethip4lispip4-ip4base-ndrchk
| | [Documentation]
@@ -255,19 +250,18 @@
| | ... | throughput test at 2x 120000pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
diff --git a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrdisc.robot
index 34caa6299c..8c676db2f3 100644
--- a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -15,23 +15,22 @@
| Resource | resources/libraries/robot/performance.robot
| Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
-| ... | WITH NAME | dut1_v4
+| ... | WITH NAME | dut1_v4
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
-| ... | WITH NAME | dut2_v4
-# import additional Lisp settings from resource file
+| ... | WITH NAME | dut2_v4
| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP4UNRLAY | IP4OVRLAY
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv4
+| ...
| Documentation | *RFC6830: Pkt throughput Lisp test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -49,7 +48,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC6830.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -114,8 +113,8 @@
| | ... | ${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-1480B-1t1c-ethip4lispip4-ip4base-ndrdisc
| | [Documentation]
@@ -178,8 +177,8 @@
| | ... | ${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-9000B-1t1c-ethip4lispip4-ip4base-ndrdisc
| | [Documentation]
@@ -240,8 +239,8 @@
| | ... | ${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-2t2c-ethip4lispip4-ip4base-ndrdisc
| | [Documentation]
@@ -304,8 +303,8 @@
| | ... | ${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-1480B-2t2c-ethip4lispip4-ip4base-ndrdisc
| | [Documentation]
@@ -368,8 +367,8 @@
| | ... | ${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-9000B-2t2c-ethip4lispip4-ip4base-ndrdisc
| | [Documentation]
@@ -430,8 +429,8 @@
| | ... | ${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-4t4c-ethip4lispip4-ip4base-ndrdisc
| | [Documentation]
@@ -494,8 +493,8 @@
| | ... | ${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-1480B-4t4c-ethip4lispip4-ip4base-ndrdisc
| | [Documentation]
@@ -558,8 +557,8 @@
| | ... | ${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-9000B-4t4c-ethip4lispip4-ip4base-ndrdisc
| | [Documentation]
@@ -620,5 +619,5 @@
| | ... | ${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}
diff --git a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot
index 27492f31b1..2983a538fe 100644
--- a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -15,18 +15,21 @@
| Resource | resources/libraries/robot/performance.robot
| Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
-| ... | WITH NAME | dut1_v4
+| ... | WITH NAME | dut1_v4
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
-| ... | WITH NAME | dut2_v4
-# import additional Lisp settings from resource file
+| ... | WITH NAME | dut2_v4
| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
| ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP6UNRLAY | IP4OVRLAY
+| ...
| 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 Keyword | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput Lisp tunnel verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -57,22 +60,21 @@
| | ... | throughput test at 2x 1.53mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 1.53mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc02-1460B-1t1c-ethip4lispip6-ip4base-ndrchk
| | [Documentation]
@@ -82,22 +84,21 @@
| | ... | throughput test at 2x 720000pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1460
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 720000pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc03-9000B-1t1c-ethip4lispip6-ip4base-ndrchk
| | [Documentation]
@@ -107,21 +108,20 @@
| | ... | throughput test at 2x 120000pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc04-64B-2t2c-ethip4lispip6-ip4base-ndrchk
| | [Documentation]
@@ -131,22 +131,21 @@
| | ... | throughput test at 2x 3.25mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.25mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc05-1460B-2t2c-ethip4lispip6-ip4base-ndrchk
| | [Documentation]
@@ -156,22 +155,21 @@
| | ... | throughput test at 2x 720000pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1460
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 720000pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc06-9000B-2t2c-ethip4lispip6-ip4base-ndrchk
| | [Documentation]
@@ -181,21 +179,20 @@
| | ... | throughput test at 2x 120000pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc07-64B-4t4c-ethip4lispip6-ip4base-ndrchk
| | [Documentation]
@@ -205,22 +202,21 @@
| | ... | throughput test at 2x 3.12mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.12mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc08-1460B-4t4c-ethip4lispip6-ip4base-ndrchk
| | [Documentation]
@@ -230,22 +226,21 @@
| | ... | throughput test at 2x 720000pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1460
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 720000pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
| tc09-9000B-4t4c-ethip4lispip6-ip4base-ndrchk
| | [Documentation]
@@ -255,18 +250,17 @@
| | ... | throughput test at 2x 120000pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv4
diff --git a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrdisc.robot
index 40077c1d78..d49ae42b60 100644
--- a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -15,23 +15,22 @@
| Resource | resources/libraries/robot/performance.robot
| Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
-| ... | WITH NAME | dut1_v4
+| ... | WITH NAME | dut1_v4
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
-| ... | WITH NAME | dut2_v4
-# import additional Lisp settings from resource file
+| ... | WITH NAME | dut2_v4
| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP6UNRLAY | IP4OVRLAY
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv4
+| ...
| Documentation | *RFC6830: Pkt throughput Lisp test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -50,7 +49,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC6830.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -115,8 +114,8 @@
| | ... | ${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-1460B-1t1c-ethip4lispip6-ip4base-ndrdisc
| | [Documentation]
@@ -179,8 +178,8 @@
| | ... | ${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-9000B-1t1c-ethip4lispip6-ip4base-ndrdisc
| | [Documentation]
@@ -241,8 +240,8 @@
| | ... | ${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-2t2c-ethip4lispip6-ip4base-ndrdisc
| | [Documentation]
@@ -305,8 +304,8 @@
| | ... | ${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-1460B-2t2c-ethip4lispip6-ip4base-ndrdisc
| | [Documentation]
@@ -369,8 +368,8 @@
| | ... | ${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-9000B-2t2c-ethip4lispip6-ip4base-ndrdisc
| | [Documentation]
@@ -431,8 +430,8 @@
| | ... | ${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-4t4c-ethip4lispip6-ip4base-ndrdisc
| | [Documentation]
@@ -495,8 +494,8 @@
| | ... | ${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-1460B-4t4c-ethip4lispip6-ip4base-ndrdisc
| | [Documentation]
@@ -559,8 +558,8 @@
| | ... | ${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-9000B-4t4c-ethip4lispip6-ip4base-ndrdisc
| | [Documentation]
@@ -621,5 +620,5 @@
| | ... | ${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}
diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
index bcb211fcbd..34f9a5f8ee 100644
--- a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
@@ -14,24 +14,21 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.QemuUtils
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
| ... | VHOST | VM
+| ...
| 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
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
-| ... | 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-bridge
+| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
+| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
+| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with VXLANoIPv4
| ... | and vhost*
| ...
@@ -62,10 +59,10 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
| ${vxlan_overhead} | ${50}
-#Socket names
+# Socket names
| ${bd_id1}= | 1
| ${bd_id2}= | 2
| ${sock1}= | /tmp/sock-1-${bd_id1}
@@ -138,7 +135,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -204,7 +202,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-IMIX-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -274,7 +273,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -342,7 +342,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -408,7 +409,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-IMIX-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -478,7 +480,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -546,7 +549,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -612,7 +616,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-IMIX-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -682,4 +687,5 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrdisc.robot
index 9b3eb2418c..d83fbc4142 100644
--- a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrdisc.robot
@@ -13,18 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
+| ...
| 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
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10 | ${min_rate}pps | ${framesize}
-| ... | 3-node-bridge | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-bridge
+| ...
| Documentation | *RFC2544: Packet throughput L2BD with VXLANoIPv4 test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -100,7 +100,8 @@
| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
| | [Documentation]
@@ -146,7 +147,8 @@
| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
| | [Documentation]
@@ -192,7 +194,8 @@
| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
| | [Documentation]
@@ -240,7 +243,8 @@
| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
| | [Documentation]
@@ -286,7 +290,8 @@
| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
| | [Documentation]
@@ -332,7 +337,8 @@
| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
| | [Documentation]
@@ -380,7 +386,8 @@
| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
| | [Documentation]
@@ -426,7 +433,8 @@
| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
| | [Documentation]
@@ -472,4 +480,5 @@
| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot
index 3f079b28c8..dc7c4618ed 100644
--- a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,15 +13,19 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
| ... | NIC_Intel-X520-DA2 | L2XCFWD | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
-| Documentation | *Reference NDR throughput L2XC with VXLANoIPv4 verify test cases*
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
+| Documentation | *Reference NDR throughput L2XC with VXLANoIPv4 verify test\
+| ... | cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
| ... | with single links between nodes.
@@ -50,15 +54,14 @@
| | ... | frames using single trial throughput test at 2x 2.4mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 2.4mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc02-1518B-1t1c-ethip4vxlan-l2xcbase-ndrchk
| | [Documentation]
@@ -67,14 +70,13 @@
| | ... | frames using single trial throughput test at 2x 787153pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 787153pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc03-9000B-1t1c-ethip4vxlan-l2xcbase-ndrchk
| | [Documentation]
@@ -83,14 +85,13 @@
| | ... | frames using single trial throughput test at 2x 137816pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 137816pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc04-64B-2t2c-ethip4vxlan-l2xcbase-ndrchk
| | [Documentation]
@@ -99,15 +100,14 @@
| | ... | frames using single trial throughput test at 2x 5.2mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 5.2mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc05-1518B-2t2c-ethip4vxlan-l2xcbase-ndrchk
| | [Documentation]
@@ -116,14 +116,13 @@
| | ... | frames using single trial throughput test at 2x 787153pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 787153pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc06-9000B-2t2c-ethip4vxlan-l2xcbase-ndrchk
| | [Documentation]
@@ -132,14 +131,13 @@
| | ... | frames using single trial throughput test at 2x 137816pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 137816pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc07-64B-4t4c-ethip4vxlan-l2xcbase-ndrchk
| | [Documentation]
@@ -148,15 +146,14 @@
| | ... | frames using single trial throughput test at 2x 8.4mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 8.4mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc08-1518B-4t4c-ethip4vxlan-l2xcbase-ndrchk
| | [Documentation]
@@ -165,14 +162,13 @@
| | ... | frames using single trial throughput test at 2x 787153pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 787153pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
| tc09-9000B-4t4c-ethip4vxlan-l2xcbase-ndrchk
| | [Documentation]
@@ -181,11 +177,10 @@
| | ... | frames using single trial throughput test at 2x 137816pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 137816pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-xconnect
diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrdisc.robot
index f9b5a54594..4e31313cd4 100644
--- a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,19 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | L2XCFWD | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
+| ...
| 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
-| ... | Run Keyword If Test Failed
-| ... | Traffic should pass with no loss | 10
-| ... | ${min_rate}pps | ${framesize} | 3-node-xconnect
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-bridge
+| ...
| Documentation | *RFC2544: Pkt throughput L2XC with VXLANoIPv4 test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -50,7 +49,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -97,8 +96,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-ethip4vxlan-l2xcbase-ndrdisc
| | [Documentation]
@@ -141,8 +140,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip4vxlan-l2xcbase-ndrdisc
| | [Documentation]
@@ -185,8 +184,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-ethip4vxlan-l2xcbase-ndrdisc
| | [Documentation]
@@ -231,8 +230,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-ethip4vxlan-l2xcbase-ndrdisc
| | [Documentation]
@@ -275,8 +274,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip4vxlan-l2xcbase-ndrdisc
| | [Documentation]
@@ -319,8 +318,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-ethip4vxlan-l2xcbase-ndrdisc
| | [Documentation]
@@ -365,8 +364,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-ethip4vxlan-l2xcbase-ndrdisc
| | [Documentation]
@@ -409,8 +408,8 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip4vxlan-l2xcbase-ndrdisc
| | [Documentation]
@@ -453,5 +452,5 @@
| | ... | ${binary_max} | 3-node-xconnect
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
index 605989f321..0410d8085b 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,14 +14,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.Cop
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | COPWHLIST
+| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | COPWHLIST
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv6 whitelist verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -52,21 +55,20 @@
| | ... | at 2x 2.8mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 2.8mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv6 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc02-1518B-1t1c-ethip6-ip6base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -76,21 +78,20 @@
| | ... | at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv6 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc03-9000B-1t1c-ethip6-ip6base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -100,20 +101,19 @@
| | ... | at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv6 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc04-78B-2t2c-ethip6-ip6base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -123,21 +123,20 @@
| | ... | at 2x 4.9mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 4.9mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv6 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc05-1518B-2t2c-ethip6-ip6base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -147,21 +146,20 @@
| | ... | at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv6 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc06-9000B-2t2c-ethip6-ip6base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -171,20 +169,19 @@
| | ... | at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv6 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc07-78B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -194,21 +191,20 @@
| | ... | at 2x 10.1mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 10.1mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv6 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc08-1518B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -218,21 +214,20 @@
| | ... | at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv6 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc09-9000B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
| | [Documentation]
@@ -242,17 +237,16 @@
| | ... | at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | When IPv6 forwarding initialized in a 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrdisc.robot
index 7f9fcaf0dc..c87fb7cbcd 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,19 +14,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.Cop
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | COPWHLIST
+| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | COPWHLIST
+| ...
| 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-IPv6
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv6
+| ...
| Documentation | *RFC2544: Pkt throughput IPv6 whitelist test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -51,7 +50,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -112,8 +111,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-ethip6-ip6base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -172,8 +171,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip6-ip6base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -230,8 +229,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-78B-2t2c-ethip6-ip6base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -290,8 +289,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-ethip6-ip6base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -350,8 +349,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip6-ip6base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -408,8 +407,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-78B-4t4c-ethip6-ip6base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -468,8 +467,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-ethip6-ip6base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -528,8 +527,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip6-ip6base-copwhtlistbase-ndrdisc
| | [Documentation]
@@ -586,5 +585,5 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
index f87d21a0e0..ee01b4a0ae 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,15 +14,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.Classify.Classify
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | IACLDST
+| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | IACLDST
+| ...
| 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
-| ... | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv6 whitelist verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -52,16 +54,15 @@
| | ... | at 2x 2.9mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 2.9mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc02-1518B-1t1c-ethip6-ip6base-iacldstbase-ndrchk
| | [Documentation]
@@ -71,16 +72,15 @@
| | ... | at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc03-9000B-1t1c-ethip6-ip6base-iacldstbase-ndrchk
| | [Documentation]
@@ -90,15 +90,14 @@
| | ... | at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc04-78B-2t2c-ethip6-ip6base-iacldstbase-ndrchk
| | [Documentation]
@@ -108,16 +107,15 @@
| | ... | at 2x 5.4mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 5.4mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc05-1518B-2t2c-ethip6-ip6base-iacldstbase-ndrchk
| | [Documentation]
@@ -127,16 +125,15 @@
| | ... | at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc06-9000B-2t2c-ethip6-ip6base-iacldstbase-ndrchk
| | [Documentation]
@@ -146,15 +143,14 @@
| | ... | at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc07-78B-4t4c-ethip6-ip6base-iacldstbase-ndrchk
| | [Documentation]
@@ -164,16 +160,15 @@
| | ... | at 2x 9.5mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 9.5mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc08-1518B-4t4c-ethip6-ip6base-iacldstbase-ndrchk
| | [Documentation]
@@ -183,16 +178,15 @@
| | ... | at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc09-9000B-4t4c-ethip6-ip6base-iacldstbase-ndrchk
| | [Documentation]
@@ -202,12 +196,11 @@
| | ... | at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrdisc.robot
index aad70ee880..5e515da144 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,19 +14,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.Classify.Classify
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | IACLDST
+| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | IACLDST
+| ...
| 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-IPv6
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv6
+| ...
| Documentation | *RFC2544: Pkt throughput IPv6 iAcl whitelist test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -50,7 +49,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -101,8 +100,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-ethip6-ip6base-iacldstbase-ndrdisc
| | [Documentation]
@@ -151,8 +150,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip6-ip6base-iacldstbase-ndrdisc
| | [Documentation]
@@ -199,8 +198,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-78B-2t2c-ethip6-ip6base-iacldstbase-ndrdisc
| | [Documentation]
@@ -249,8 +248,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-ethip6-ip6base-iacldstbase-ndrdisc
| | [Documentation]
@@ -299,8 +298,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip6-ip6base-iacldstbase-ndrdisc
| | [Documentation]
@@ -347,8 +346,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-78B-4t4c-ethip6-ip6base-iacldstbase-ndrdisc
| | [Documentation]
@@ -397,8 +396,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-ethip6-ip6base-iacldstbase-ndrdisc
| | [Documentation]
@@ -447,8 +446,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip6-ip6base-iacldstbase-ndrdisc
| | [Documentation]
@@ -495,5 +494,5 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot
index 743e417ed4..2792e2c9f0 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,14 +13,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE
+| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE
+| ...
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv6 routing verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -49,15 +52,14 @@
| | ... | frames using single trial throughput test at 2x 2.9mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 2.9mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc02-1518B-1t1c-ethip6-ip6base-ndrchk
| | [Documentation]
@@ -66,15 +68,14 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc03-9000B-1t1c-ethip6-ip6base-ndrchk
| | [Documentation]
@@ -83,14 +84,13 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc04-78B-2t2c-ethip6-ip6base-ndrchk
| | [Documentation]
@@ -99,15 +99,14 @@
| | ... | frames using single trial throughput test at 2x 5.9mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 5.9mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc05-1518B-2t2c-ethip6-ip6base-ndrchk
| | [Documentation]
@@ -116,15 +115,14 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc06-9000B-2t2c-ethip6-ip6base-ndrchk
| | [Documentation]
@@ -133,14 +131,13 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc07-78B-4t4c-ethip6-ip6base-ndrchk
| | [Documentation]
@@ -149,15 +146,14 @@
| | ... | frames using single trial throughput test at 2x 7.3mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.3mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc08-1518B-4t4c-ethip6-ip6base-ndrchk
| | [Documentation]
@@ -166,15 +162,14 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc09-9000B-4t4c-ethip6-ip6base-ndrchk
| | [Documentation]
@@ -183,11 +178,10 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrdisc.robot
index 8d27d60064..38cd52b5a5 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,19 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE
+| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE
+| ...
| 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-IPv6
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv6
+| ...
| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -48,7 +47,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -95,8 +94,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-ethip6-ip6base-ndrdisc
| | [Documentation]
@@ -141,8 +140,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip6-ip6base-ndrdisc
| | [Documentation]
@@ -185,8 +184,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-78B-2t2c-ethip6-ip6base-ndrdisc
| | [Documentation]
@@ -231,8 +230,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-ethip6-ip6base-ndrdisc
| | [Documentation]
@@ -277,8 +276,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip6-ip6base-ndrdisc
| | [Documentation]
@@ -321,8 +320,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-78B-4t4c-ethip6-ip6base-ndrdisc
| | [Documentation]
@@ -367,8 +366,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-ethip6-ip6base-ndrdisc
| | [Documentation]
@@ -413,8 +412,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip6-ip6base-ndrdisc
| | [Documentation]
@@ -457,5 +456,5 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot
index 4c2139cc90..430bcb6123 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,13 +13,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_200K
+| ...
| 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 Keyword | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv6 routing verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -51,17 +55,15 @@
| | ... | frames using single trial throughput test at 2x 2.3mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 2.3mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc02-1518B-1t1c-ethip6-ip6scale200k-ndrchk
| | [Documentation]
@@ -70,17 +72,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc03-9000B-1t1c-ethip6-ip6scale200k-ndrchk
| | [Documentation]
@@ -89,16 +89,14 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc04-78B-2t2c-ethip6-ip6scale200k-ndrchk
| | [Documentation]
@@ -107,17 +105,15 @@
| | ... | frames using single trial throughput test at 2x 4.8mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 4.8mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc05-1518B-2t2c-ethip6-ip6scale200k-ndrchk
| | [Documentation]
@@ -126,17 +122,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc06-9000B-2t2c-ethip6-ip6scale200k-ndrchk
| | [Documentation]
@@ -145,16 +139,14 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc07-78B-4t4c-ethip6-ip6scale200k-ndrchk
| | [Documentation]
@@ -163,17 +155,15 @@
| | ... | frames using single trial throughput test at 2x 7.7mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.7mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc08-1518B-4t4c-ethip6-ip6scale200k-ndrchk
| | [Documentation]
@@ -182,17 +172,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc09-9000B-4t4c-ethip6-ip6scale200k-ndrchk
| | [Documentation]
@@ -201,13 +189,11 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrdisc.robot
index 7ca4c3091c..44e9efd676 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,18 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_200K
+| ...
| 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-IPv6-dst-${rts_per_flow}
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv6-dst-${rts_per_flow}
+| ...
| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -49,7 +49,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
| ${rts_per_flow}= | ${100000}
@@ -101,8 +101,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-ethip6-ip6scale200k-ndrdisc
| | [Documentation]
@@ -151,8 +151,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip6-ip6scale200k-ndrdisc
| | [Documentation]
@@ -199,8 +199,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-78B-2t2c-ethip6-ip6scale200k-ndrdisc
| | [Documentation]
@@ -249,8 +249,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-ethip6-ip6scale200k-ndrdisc
| | [Documentation]
@@ -299,8 +299,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip6-ip6scale200k-ndrdisc
| | [Documentation]
@@ -347,8 +347,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-78B-4t4c-ethip6-ip6scale200k-ndrdisc
| | [Documentation]
@@ -397,8 +397,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-ethip6-ip6scale200k-ndrdisc
| | [Documentation]
@@ -447,8 +447,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip6-ip6scale200k-ndrdisc
| | [Documentation]
@@ -495,5 +495,5 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot
index 3f49250cb3..61883be805 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,13 +13,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_20K
+| ...
| 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 Keyword | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv6 routing verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -51,17 +55,15 @@
| | ... | frames using single trial throughput test at 2x 2.9mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 2.9mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc02-1518B-1t1c-ethip6-ip6scale20k-ndrchk
| | [Documentation]
@@ -70,17 +72,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc03-9000B-1t1c-ethip6-ip6scale20k-ndrchk
| | [Documentation]
@@ -89,16 +89,14 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc04-78B-2t2c-ethip6-ip6scale20k-ndrchk
| | [Documentation]
@@ -107,17 +105,15 @@
| | ... | frames using single trial throughput test at 2x 5.9mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 5.9mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc05-1518B-2t2c-ethip6-ip6scale20k-ndrchk
| | [Documentation]
@@ -126,17 +122,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc06-9000B-2t2c-ethip6-ip6scale20k-ndrchk
| | [Documentation]
@@ -145,16 +139,14 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc07-78B-4t4c-ethip6-ip6scale20k-ndrchk
| | [Documentation]
@@ -163,17 +155,15 @@
| | ... | frames using single trial throughput test at 2x 10.0mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 10.0mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc08-1518B-4t4c-ethip6-ip6scale20k-ndrchk
| | [Documentation]
@@ -182,17 +172,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc09-9000B-4t4c-ethip6-ip6scale20k-ndrchk
| | [Documentation]
@@ -201,13 +189,11 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrdisc.robot
index b96643309e..35dc6aecba 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,18 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_20K
+| ...
| 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-IPv6-dst-${rts_per_flow}
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv6-dst-${rts_per_flow}
+| ...
| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -49,7 +49,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
| ${rts_per_flow}= | ${10000}
@@ -101,8 +101,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-ethip6-ip6scale20k-ndrdisc
| | [Documentation]
@@ -151,8 +151,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip6-ip6scale20k-ndrdisc
| | [Documentation]
@@ -199,8 +199,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-78B-2t2c-ethip6-ip6scale20k-ndrdisc
| | [Documentation]
@@ -249,8 +249,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-ethip6-ip6scale20k-ndrdisc
| | [Documentation]
@@ -299,8 +299,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip6-ip6scale20k-ndrdisc
| | [Documentation]
@@ -347,8 +347,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-78B-4t4c-ethip6-ip6scale20k-ndrdisc
| | [Documentation]
@@ -397,8 +397,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-ethip6-ip6scale20k-ndrdisc
| | [Documentation]
@@ -447,8 +447,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip6-ip6scale20k-ndrdisc
| | [Documentation]
@@ -495,5 +495,5 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot
index 8b163fb18a..d00eed7cbf 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,13 +13,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_2M
+| ...
| 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 Keyword | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput IPv6 routing verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -51,17 +55,15 @@
| | ... | frames using single trial throughput test at 2x 1.8mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 1.8mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc02-1518B-1t1c-ethip6-ip6scale2m-ndrchk
| | [Documentation]
@@ -70,17 +72,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc03-9000B-1t1c-ethip6-ip6scale2m-ndrchk
| | [Documentation]
@@ -89,16 +89,14 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc04-78B-2t2c-ethip6-ip6scale2m-ndrchk
| | [Documentation]
@@ -107,17 +105,15 @@
| | ... | frames using single trial throughput test at 2x 4.0mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 4.0mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc05-1518B-2t2c-ethip6-ip6scale2m-ndrchk
| | [Documentation]
@@ -126,17 +122,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc06-9000B-2t2c-ethip6-ip6scale2m-ndrchk
| | [Documentation]
@@ -145,16 +139,14 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc07-78B-4t4c-ethip6-ip6scale2m-ndrchk
| | [Documentation]
@@ -163,17 +155,15 @@
| | ... | frames using single trial throughput test at 2x 6.8mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 6.8mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc08-1518B-4t4c-ethip6-ip6scale2m-ndrchk
| | [Documentation]
@@ -182,17 +172,15 @@
| | ... | frames using single trial throughput test at 2x 812743pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
| tc09-9000B-4t4c-ethip6-ip6scale2m-ndrchk
| | [Documentation]
@@ -201,13 +189,11 @@
| | ... | frames using single trial throughput test at 2x 138580pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
-| | And Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize}
-| | ... | 3-node-IPv6-dst-${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrdisc.robot
index d7f230d960..d91af1d2aa 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,18 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_2M
+| ...
| 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-IPv6-dst-${rts_per_flow}
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv6-dst-${rts_per_flow}
+| ...
| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -49,7 +49,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
| ${rts_per_flow}= | ${1000000}
@@ -101,8 +101,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-ethip6-ip6scale2m-ndrdisc
| | [Documentation]
@@ -151,8 +151,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip6-ip6scale2m-ndrdisc
| | [Documentation]
@@ -199,8 +199,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-78B-2t2c-ethip6-ip6scale2m-ndrdisc
| | [Documentation]
@@ -249,8 +249,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-ethip6-ip6scale2m-ndrdisc
| | [Documentation]
@@ -299,8 +299,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip6-ip6scale2m-ndrdisc
| | [Documentation]
@@ -347,8 +347,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-78B-4t4c-ethip6-ip6scale2m-ndrdisc
| | [Documentation]
@@ -397,8 +397,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-ethip6-ip6scale2m-ndrdisc
| | [Documentation]
@@ -447,8 +447,8 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip6-ip6scale2m-ndrdisc
| | [Documentation]
@@ -495,5 +495,5 @@
| | ... | 3-node-IPv6-dst-${rts_per_flow}
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot
index 59b11545d4..04baa6ed10 100644
--- a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -15,18 +15,21 @@
| Resource | resources/libraries/robot/performance.robot
| Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
-| ... | WITH NAME | dut1_v4
+| ... | WITH NAME | dut1_v4
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
-| ... | WITH NAME | dut2_v4
-# import additional Lisp settings from resource file
+| ... | WITH NAME | dut2_v4
| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
| ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP4UNRLAY | IP6OVRLAY
+| ...
| 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 Keyword | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput Lisp tunnel verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -57,22 +60,21 @@
| | ... | throughput test at 2x 1.75mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 1.75mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc02-1460B-1t1c-ethip6lispip4-ip6base-ndrchk
| | [Documentation]
@@ -82,22 +84,21 @@
| | ... | throughput test at 2x 720000pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1460
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 720000pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc03-9000B-1t1c-ethip6lispip4-ip6base-ndrchk
| | [Documentation]
@@ -107,21 +108,20 @@
| | ... | throughput test at 2x 120000pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc04-78B-2t2c-ethip6lispip4-ip6base-ndrchk
| | [Documentation]
@@ -131,22 +131,21 @@
| | ... | throughput test at 2x 3.42mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.42mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc05-1460B-2t2c-ethip6lispip4-ip6base-ndrchk
| | [Documentation]
@@ -156,22 +155,21 @@
| | ... | throughput test at 2x 720000pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1460
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 720000pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc06-9000B-2t2c-ethip6lispip4-ip6base-ndrchk
| | [Documentation]
@@ -181,21 +179,20 @@
| | ... | throughput test at 2x 120000pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc07-78B-4t4c-ethip6lispip4-ip6base-ndrchk
| | [Documentation]
@@ -205,22 +202,21 @@
| | ... | throughput test at 2x 3.42mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.42mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc08-1460B-4t4c-ethip6lispip4-ip6base-ndrchk
| | [Documentation]
@@ -230,22 +226,21 @@
| | ... | throughput test at 2x 720000pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1460
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 720000pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc09-9000B-4t4c-ethip6lispip4-ip6base-ndrchk
| | [Documentation]
@@ -255,18 +250,17 @@
| | ... | throughput test at 2x 120000pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
diff --git a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrdisc.robot
index f6d693cd04..dbd7f7b29f 100644
--- a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -15,23 +15,22 @@
| Resource | resources/libraries/robot/performance.robot
| Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
-| ... | WITH NAME | dut1_v4
+| ... | WITH NAME | dut1_v4
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
-| ... | WITH NAME | dut2_v4
-# import additional Lisp settings from resource file
+| ... | WITH NAME | dut2_v4
| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP4UNRLAY | IP6OVRLAY
+| ...
| 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-IPv6
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv6
+| ...
| Documentation | *RFC6830: Pkt throughput Lisp test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -50,7 +49,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC6830.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -115,8 +114,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1460B-1t1c-ethip6lispip4-ip6base-ndrdisc
| | [Documentation]
@@ -179,8 +178,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip6lispip4-ip6base-ndrdisc
| | [Documentation]
@@ -241,8 +240,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-78B-2t2c-ethip6lispip4-ip6base-ndrdisc
| | [Documentation]
@@ -305,8 +304,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1460B-2t2c-ethip6lispip4-ip6base-ndrdisc
| | [Documentation]
@@ -369,8 +368,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip6lispip4-ip6base-ndrdisc
| | [Documentation]
@@ -431,8 +430,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-78B-4t4c-ethip6lispip4-ip6base-ndrdisc
| | [Documentation]
@@ -495,8 +494,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1460B-4t4c-ethip6lispip4-ip6base-ndrdisc
| | [Documentation]
@@ -559,8 +558,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip6lispip4-ip6base-ndrdisc
| | [Documentation]
@@ -621,5 +620,5 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
index 85f46d1b58..08e1198e2a 100644
--- a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,15 +14,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
-# import additional Lisp settings from resource file
| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
| ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP6UNRLAY | IP6OVRLAY
+| ...
| 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 Keyword | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
| Documentation | *Reference NDR throughput Lisp tunnel verify test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -53,22 +56,21 @@
| | ... | throughput test at 2x 1.56mpps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 1.56mpps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc02-1460B-1t1c-ethip6lispip6-ip6base-ndrchk
| | [Documentation]
@@ -78,22 +80,21 @@
| | ... | throughput test at 2x 740000pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 1460
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 740000pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc03-9000B-1t1c-ethip6lispip6-ip6base-ndrchk
| | [Documentation]
@@ -103,21 +104,20 @@
| | ... | throughput test at 2x 120000pps.
| | [Tags] | 1T1C | STHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc04-78B-2t2c-ethip6lispip6-ip6base-ndrchk
| | [Documentation]
@@ -127,22 +127,21 @@
| | ... | throughput test at 2x 3.2mpps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.2mpps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc05-1460B-2t2c-ethip6lispip6-ip6base-ndrchk
| | [Documentation]
@@ -152,22 +151,21 @@
| | ... | throughput test at 2x 740000pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 1460
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 740000pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc06-9000B-2t2c-ethip6lispip6-ip6base-ndrchk
| | [Documentation]
@@ -177,21 +175,20 @@
| | ... | throughput test at 2x 120000pps.
| | [Tags] | 2T2C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc07-78B-4t4c-ethip6lispip6-ip6base-ndrchk
| | [Documentation]
@@ -201,22 +198,21 @@
| | ... | throughput test at 2x 3.2mpps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.2mpps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc08-1460B-4t4c-ethip6lispip6-ip6base-ndrchk
| | [Documentation]
@@ -226,22 +222,21 @@
| | ... | throughput test at 2x 740000pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 1460
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 740000pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Add No Multi Seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
| tc09-9000B-4t4c-ethip6lispip6-ip6base-ndrchk
| | [Documentation]
@@ -251,19 +246,18 @@
| | ... | throughput test at 2x 120000pps.
| | [Tags] | 4T4C | MTHREAD
| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And Add PCI devices to DUTs from 3-node single link topology
-| | And Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
| | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Set up Lisp topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
diff --git a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot
index 88ccc5508b..2cc52af330 100644
--- a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,20 +14,19 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
-# import additional Lisp settings from resource file
| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP6UNRLAY | IP6OVRLAY
+| ...
| 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-IPv6
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv6
+| ...
| Documentation | *RFC6830: Pkt throughput Lisp test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -46,7 +45,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC6830.
*** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
| ${s_limit} | ${10000000000}
*** Test Cases ***
@@ -111,8 +110,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1460B-1t1c-ethip6lispip6-ip6base-ndrdisc
| | [Documentation]
@@ -175,8 +174,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-9000B-1t1c-ethip6lispip6-ip6base-ndrdisc
| | [Documentation]
@@ -237,8 +236,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-78B-2t2c-ethip6lispip6-ip6base-ndrdisc
| | [Documentation]
@@ -301,8 +300,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1460B-2t2c-ethip6lispip6-ip6base-ndrdisc
| | [Documentation]
@@ -365,8 +364,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-9000B-2t2c-ethip6lispip6-ip6base-ndrdisc
| | [Documentation]
@@ -427,8 +426,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-78B-4t4c-ethip6lispip6-ip6base-ndrdisc
| | [Documentation]
@@ -491,8 +490,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1460B-4t4c-ethip6lispip6-ip6base-ndrdisc
| | [Documentation]
@@ -555,8 +554,8 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-9000B-4t4c-ethip6lispip6-ip6base-ndrdisc
| | [Documentation]
@@ -617,5 +616,5 @@
| | ... | ${binary_max} | 3-node-IPv6
| | ... | ${min_rate} | ${max_rate}
| | ... | ${threshold}
-| | ... | ${glob_loss_acceptance}
-| | ... | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
index a29c1a06a8..27eec1bc7e 100644
--- a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
+++ b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,23 +14,20 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.QemuUtils
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
+| ...
| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
| ... | L2 | Intel-X710
| 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-bridge
-| ... | 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-bridge
+| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
+| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
+| ...
| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -132,7 +129,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -198,7 +196,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -265,7 +264,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -331,7 +331,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -397,7 +398,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -465,7 +467,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -531,7 +534,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -597,7 +601,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -665,4 +670,5 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrdisc.robot b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrdisc.robot
index 2695d7a344..9ff8368eb4 100644
--- a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrdisc.robot
+++ b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,19 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE
+| ...
| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
| ... | L2 | Intel-X710
| 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-bridge
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-bridge
+| ...
| Documentation | *RFC2544: Pkt throughput L2BD test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -49,7 +48,7 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#X710 bandwidth limit
+# X710 bandwidth limit
| ${s_limit} | ${10000000000}
*** Keywords ***
@@ -88,7 +87,7 @@
| | Find PDR using binary search and pps
| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
*** Test Cases ***
| tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrdisc
diff --git a/tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrdisc.robot b/tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrdisc.robot
index 9629650436..879bfa427b 100644
--- a/tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrdisc.robot
+++ b/tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrdisc.robot
@@ -14,19 +14,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.NodePath
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Cisco-VIC-1385 | ETH | L2BDMACLRN | BASE
+| ... | NIC_Cisco-VIC-1385 | ETH | L2BDMACLRN | BASE
+| ...
| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
| ... | L2 | Cisco-VIC-1385
| 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-bridge
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-bridge
+| ...
| Documentation | *RFC2544: Pkt throughput L2BD test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -102,7 +101,8 @@
| | And L2 bridge domain initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-eth-l2bdbasemaclrn-ndrdisc
| | [Documentation]
@@ -198,7 +198,8 @@
| | And L2 bridge domain initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-eth-l2bdbasemaclrn-ndrdisc
| | [Documentation]
diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
index 9a17a8d153..3fc4444cb5 100644
--- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,23 +14,20 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.QemuUtils
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-XL710 | ETH | L2BDMACLRN | BASE | VHOST | VM
+| ... | NIC_Intel-XL710 | ETH | L2BDMACLRN | BASE | VHOST | VM
+| ...
| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
| ... | L2 | Intel-XL710
| 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-bridge
-| ... | 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-bridge
+| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
+| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
+| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with vhost*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -134,7 +131,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc03-1518B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -200,7 +198,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc05-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -267,7 +266,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc07-64B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -333,7 +333,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc09-1518B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -399,7 +400,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc11-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -467,7 +469,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc13-64B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -533,7 +536,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc15-1518B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -599,7 +603,8 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
| tc17-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
| | [Documentation]
@@ -667,4 +672,5 @@
| | And Setup scheduler policy for VPP on all DUTs
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrdisc.robot
index 112aa856af..ac8d19c19d 100644
--- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -14,19 +14,17 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
| Library | resources.libraries.python.NodePath
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-XL710 | ETH | L2BDMACLRN | BASE
+| ... | NIC_Intel-XL710 | ETH | L2BDMACLRN | BASE
| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
| ... | L2 | Intel-XL710
| 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-bridge
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-bridge
+| ...
| Documentation | *RFC2544: Pkt throughput L2BD test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -50,9 +48,9 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+# XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
| ${s_24.5G} | ${24500000000}
-#XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
+# XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
| ${s_18.75Mpps} | ${18750000}
*** Keywords ***
@@ -109,7 +107,7 @@
| | Find PDR using binary search and pps
| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
| L2 Bridge Domain PDR Binary Search
| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${s_limit}
@@ -128,7 +126,7 @@
| | Find PDR using binary search and pps
| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
*** Test Cases ***
| tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrdisc
diff --git a/tests/perf/40ge2p1xl710-eth-l2xcbase-ndrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2xcbase-ndrdisc.robot
index 263ff88768..c80d6f901a 100644
--- a/tests/perf/40ge2p1xl710-eth-l2xcbase-ndrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2xcbase-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -15,19 +15,18 @@
| 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 | NDRPDRDISC
-| ... | NIC_Intel-XL710 | ETH | L2XCFWD | BASE
+| ... | NIC_Intel-XL710 | ETH | L2XCFWD | BASE
+| ...
| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
| ... | L2 | Intel-XL710
| 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-xconnect
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-xconnect
+| ...
| Documentation | *RFC2544: Pkt throughput L2XC test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -50,9 +49,9 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+# XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
| ${s_24.5G} | ${24500000000}
-#XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
+# XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
| ${s_18.75Mpps} | ${18750000}
*** Test Cases ***
diff --git a/tests/perf/40ge2p1xl710-ethip4-ip4base-ndrdisc.robot b/tests/perf/40ge2p1xl710-ethip4-ip4base-ndrdisc.robot
index 92f5acb538..cc04ea0d5c 100644
--- a/tests/perf/40ge2p1xl710-ethip4-ip4base-ndrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4-ip4base-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -16,21 +16,22 @@
| Library | resources.libraries.python.topology.Topology
| Library | resources.libraries.python.NodePath
| Library | resources.libraries.python.InterfaceUtil
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
+| ... | WITH NAME | dut1_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
+| ... | WITH NAME | dut2_v4
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-XL710 | ETH | IP4FWD | BASE
+| ... | NIC_Intel-XL710 | ETH | IP4FWD | BASE
+| ...
| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
| ... | L3 | Intel-XL710
| 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 | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv4
+| ...
| Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -54,9 +55,9 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+# XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
| ${s_24.5G} | ${24500000000}
-#XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
+# XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
| ${s_18.75Mpps} | ${18750000}
*** Test Cases ***
diff --git a/tests/perf/40ge2p1xl710-ethip6-ip6base-ndrdisc.robot b/tests/perf/40ge2p1xl710-ethip6-ip6base-ndrdisc.robot
index 1daa6e1dfb..b8d33045b9 100644
--- a/tests/perf/40ge2p1xl710-ethip6-ip6base-ndrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip6-ip6base-ndrdisc.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -13,19 +13,18 @@
*** Settings ***
| Resource | resources/libraries/robot/performance.robot
+| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-XL710 | ETH | IP6FWD | BASE
+| ... | NIC_Intel-XL710 | ETH | IP6FWD | BASE
+| ...
| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
| ... | L3 | Intel-XL710
| 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-IPv6
-| ... | fail_on_loss=${False}
-| ... | AND | Remove startup configuration of VPP from all DUTs
-| ... | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv6
+| ...
| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -48,9 +47,9 @@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-#XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+# XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
| ${s_24.5G} | ${24500000000}
-#XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
+# XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
| ${s_18.75Mpps} | ${18750000}
*** Test Cases ***
diff --git a/tests/perf/__init__.robot b/tests/perf/__init__.robot
index 7efa763f57..845716780f 100644
--- a/tests/perf/__init__.robot
+++ b/tests/perf/__init__.robot
@@ -1,4 +1,4 @@
-# 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:
@@ -16,8 +16,25 @@
| Resource | resources/libraries/robot/interfaces.robot
| Library | resources.libraries.python.SetupFramework
| Library | resources.libraries.python.CpuUtils
-| Suite Setup | Run Keywords | Setup Framework | ${nodes}
+| Suite Setup | Run Keywords | Setup performance global Variables
+| ... | AND | Setup Framework | ${nodes}
| ... | AND | Setup All DUTs | ${nodes}
| ... | AND | Get CPU Layout from all nodes | ${nodes}
| ... | AND | Update All Interface Data On All Nodes
| ... | ${nodes} | skip_tg=${True} | numa_node=${True}
+
+*** Keywords ***
+| Setup performance global Variables
+| | [Documentation]
+| | ... | Setup suite Variables. Variables are used across performance testing.
+| | ...
+| | ... | _NOTE:_ This KW sets following suite variables:
+| | ... | - perf_trial_duration - Duration of traffic run [s].
+| | ... | - perf_pdr_loss_acceptance - Loss acceptance treshold
+| | ... | - perf_pdr_loss_acceptance_type - Loss acceptance treshold type
+| | ... | - perf_vm_image - Guest VM disk image
+| | ...
+| | Set Global Variable | ${perf_trial_duration} | 10
+| | Set Global Variable | ${perf_pdr_loss_acceptance} | 0.5
+| | Set Global Variable | ${perf_pdr_loss_acceptance_type} | percentage
+| | Set Global Variable | ${perf_vm_image} | /var/lib/vm/csit-nested-1.6.img