X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fperf%2F10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrdisc.robot;h=b085cfb6c2564114835f9b5fa832eafe099e4ce0;hp=4ef191ffe487eded45b8d19847fa0bf9267467e5;hb=fe29ca4b7e6c412c69f1c56404513a33236aa617;hpb=77ab7e4cc80e237331bfd7938974c74393294933

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}