Patch to reset default VPP configuration in perf.

- JIRA: CSIT-57
- fix situation when vpp startup configuration is replaced by default
  with no interface configuration

Change-Id: Iea23dcc0707bc96627b99d4500268a8e01bfda39
Signed-off-by: pmikus <pmikus@cisco.com>

diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index de5067b..a2c8acd 100644 (file)
--- 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 477e046..e912f8d 100644 (file)
--- 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 ac36313..2faae14 100644 (file)
--- 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 bc191bd..e6b62ed 100644 (file)
--- 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 b4ac600..4612add 100644 (file)
--- 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 549bb0a..5e95817 100644 (file)
--- 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 7655458..99e5dbd 100644 (file)
--- 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 ***