aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/libraries/robot/performance.robot6
-rw-r--r--tests/suites/performance/long_bridge_domain.robot3
-rw-r--r--tests/suites/performance/long_ipv4.robot3
-rw-r--r--tests/suites/performance/long_xconnect.robot3
-rw-r--r--tests/suites/performance/short_bridge_domain.robot3
-rw-r--r--tests/suites/performance/short_ipv4.robot3
-rw-r--r--tests/suites/performance/short_xconnect_Intel-X520-DA2.robot3
7 files changed, 11 insertions, 13 deletions
diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index de5067b639..a2c8acde27 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -108,8 +108,10 @@
| | All Vpp Interfaces Ready Wait | ${nodes}
| 3-node Performance Suite Setup
-| | 3-node circular Topology Variables Setup
| | [Arguments] | ${topology_type}
+| | Reset startup configuration of VPP on all DUTs
+| | Update All Interface Data On All Nodes | ${nodes}
+| | 3-node circular Topology Variables Setup
| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
| | ... | ${dut1} | ${dut1_if1} | ${dut1_if2}
| | ... | ${dut2} | ${dut2_if1} | ${dut2_if2}
@@ -117,6 +119,8 @@
3-node Performance Suite Setup with DUT's NIC model
| | [Arguments] | ${topology_type} | ${nic_model}
+| | Reset startup configuration of VPP on all DUTs
+| | Update All Interface Data On All Nodes | ${nodes}
| | 3-node circular Topology Variables Setup with DUT interface model
| | ... | ${nic_model}
| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
diff --git a/tests/suites/performance/long_bridge_domain.robot b/tests/suites/performance/long_bridge_domain.robot
index 477e0467ed..e912f8d842 100644
--- a/tests/suites/performance/long_bridge_domain.robot
+++ b/tests/suites/performance/long_bridge_domain.robot
@@ -17,8 +17,7 @@
| Suite Setup | 3-node Performance Suite Setup | L2
| Suite Teardown | 3-node Performance Suite Teardown
| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords | Show statistics on all DUTs
-| ... | AND | Reset startup configuration of VPP on all DUTs
+| Test Teardown | Run Keyword | Show statistics on all DUTs
| Documentation | *Throughput search suite (based on RFC2544).*
| ...
| ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG, with one link
diff --git a/tests/suites/performance/long_ipv4.robot b/tests/suites/performance/long_ipv4.robot
index ac363136af..2faae14ce5 100644
--- a/tests/suites/performance/long_ipv4.robot
+++ b/tests/suites/performance/long_ipv4.robot
@@ -21,8 +21,7 @@
| Suite Setup | 3-node Performance Suite Setup | L3
| Suite Teardown | 3-node Performance Suite Teardown
| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords | Show statistics on all DUTs
-| ... | AND | Reset startup configuration of VPP on all DUTs
+| Test Teardown | Run Keyword | Show statistics on all DUTs
| Documentation | *Throughput search suite (based on RFC2544).*
| ...
| ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG, with one link
diff --git a/tests/suites/performance/long_xconnect.robot b/tests/suites/performance/long_xconnect.robot
index bc191bdb2e..e6b62edf4a 100644
--- a/tests/suites/performance/long_xconnect.robot
+++ b/tests/suites/performance/long_xconnect.robot
@@ -18,8 +18,7 @@
| Suite Setup | 3-node Performance Suite Setup | L2
| Suite Teardown | 3-node Performance Suite Teardown
| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords | Show statistics on all DUTs
-| ... | AND | Reset startup configuration of VPP on all DUTs
+| Test Teardown | Run Keyword | Show statistics on all DUTs
| Documentation | *Throughput search suite (based on RFC2544).*
| ...
| ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG, with one link
diff --git a/tests/suites/performance/short_bridge_domain.robot b/tests/suites/performance/short_bridge_domain.robot
index b4ac600dbb..4612add26a 100644
--- a/tests/suites/performance/short_bridge_domain.robot
+++ b/tests/suites/performance/short_bridge_domain.robot
@@ -17,8 +17,7 @@
| Suite Setup | 3-node Performance Suite Setup | L2
| Suite Teardown | 3-node Performance Suite Teardown
| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords | Show statistics on all DUTs
-| ... | AND | Reset startup configuration of VPP on all DUTs
+| Test Teardown | Run Keyword | Show statistics on all DUTs
| Documentation | Minimal throughput acceptance test cases
*** Test Cases ***
diff --git a/tests/suites/performance/short_ipv4.robot b/tests/suites/performance/short_ipv4.robot
index 549bb0adf4..5e9581705f 100644
--- a/tests/suites/performance/short_ipv4.robot
+++ b/tests/suites/performance/short_ipv4.robot
@@ -21,8 +21,7 @@
| Suite Setup | 3-node Performance Suite Setup | L3
| Suite Teardown | 3-node Performance Suite Teardown
| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords | Show statistics on all DUTs
-| ... | AND | Reset startup configuration of VPP on all DUTs
+| Test Teardown | Run Keyword | Show statistics on all DUTs
| Documentation | Minimal throughput acceptance test cases
*** Test Cases ***
diff --git a/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot b/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot
index 7655458923..99e5dbd470 100644
--- a/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot
+++ b/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot
@@ -20,8 +20,7 @@
| ... | L2 | Intel-X520-DA2
| Suite Teardown | 3-node Performance Suite Teardown
| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords | Show statistics on all DUTs
-| ... | AND | Reset startup configuration of VPP on all DUTs
+| Test Teardown | Run Keyword | Show statistics on all DUTs
| Documentation | Minimal throughput acceptance test cases
*** Test Cases ***