CSIT-530: Add common setup and teardown to perf tests

[csit.git] / tests / perf / 10ge2p1x520-eth-l2bdbasemaclrn-ndrdisc.robot

diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrdisc.robot
index 8fdaf17..dff612f 100644 (file)
--- 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