CSIT-664: Refactor setups and teardowns

 - Add suite setup for performance IPSec tests
 - Add test teardown for performance SNAT tests
 - Add setups and teardowns for functional tests
 - Clean up the code

Change-Id: Ia456e9f3ff0f0f2bb9a03f692f27c7f9a2817621
Signed-off-by: Tibor Frank <tifrank@cisco.com>

1 files changed, 29 insertions, 3 deletions

diff --git a/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot b/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot
index f5f9673230..90ed077533 100644
--- a/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot
+++ b/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot
@@ -21,11 +21,15 @@
 | Resource | resources/libraries/robot/honeycomb/interfaces.robot
 | Resource | resources/libraries/robot/honeycomb/bridge_domain.robot
 | Resource | resources/libraries/robot/honeycomb/l2_fib.robot
+| ...
 | Suite Setup | Run Keywords
 | ... | Configure Persistence | ${node} | enable | AND
 | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| ...
 | Suite Teardown | Configure Persistence | ${node} | disable
+| ...
 | Force Tags | HC_PERSIST | HC_REST_ONLY
+| ...
 | Documentation | *Honeycomb configuration persistence test suite.*
 
 *** Test Cases ***
@@ -34,21 +38,27 @@
 | TC01: Honeycomb persists configuration through restart of both Honeycomb and VPP
 | | [Documentation] | Checks if Honeycomb maintains configuration after both\
 | | ... | Restart Honeycomb and VPP.
+| | ...
 | | [Tags] | HC_FUNC
+| | ...
 | | [Teardown]
 | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| | ...
 | | Given Multi-Feature Persistence test configuration | ${node} | ${interface}
 | | And Multi-Feature persistence Test Verification | ${node} | ${interface}
 | | And Log persisted configuration on node | ${node}
-| | When Restart Honeycomb and VPP | ${node}
+| | When Restart Honeycomb and VPP in pesistence test | ${node}
 | | Then Multi-Feature persistence Test Verification | ${node} | ${interface}
 
 | TC02: Honeycomb reverts to defaults if persistence files are invalid
 | | [Documentation] | Checks if Honeycomb reverts to default configuration when\
 | | ... | persistence files are damaged or invalid.
+| | ...
 | | [Tags] | HC_FUNC
+| | ...
 | | [Teardown]
 | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| | ...
 | | Given Multi-Feature Persistence test configuration | ${node} | ${interface}
 | | And Multi-Feature persistence Test Verification | ${node} | ${interface}
 | | When Persistence file is damaged during restart | ${node}
@@ -57,8 +67,10 @@
 | TC03: Honeycomb persists configuration through restart of Honeycomb
 | | [Documentation] | Checks if Honeycomb maintains configuration after it\
 | | ... | is restarted.
+| | ...
 | | [Teardown]
 | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| | ...
 | | Given Multi-Feature Persistence test configuration | ${node} | ${interface}
 | | And Multi-Feature persistence Test Verification | ${node} | ${interface}
 | | And Log persisted configuration on node | ${node}
@@ -68,8 +80,10 @@
 | TC04: Honeycomb persists configuration through restart of VPP
 | | [Documentation] | Checks if Honeycomb updates VPP settings after VPP is\
 | | ... | restarted.
+| | ...
 | | [Teardown]
 | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| | ...
 | | Given Multi-Feature Persistence test configuration | ${node} | ${interface}
 | | And Multi-Feature persistence Test Verification | ${node} | ${interface}
 | | And Log persisted configuration on node | ${node}
@@ -82,18 +96,22 @@
 | TC05: Persist configuration of IP addresses and neighbors - HC and VPP restart
 | | [Documentation] | Verify persistence of interface state, IPv4 address
 | | ... | and neighbor entries through restart of both Honeycomb and VPP.
+| | ...
 | | [Teardown]
 | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| | ...
 | | Given Interface Persistence Setup | ${node}
 | | And Interface Persistence Check | ${node}
-| | When Restart Honeycomb and VPP | ${node}
+| | When Restart Honeycomb and VPP in pesistence test | ${node}
 | | Then Interface Persistence Check | ${node}
 
 | TC06: Persist configuration of IP addresses and neighbors - HC restart
 | | [Documentation] | Verify persistence of interface state, IPv4 address
 | | ... | and neighbor entries through restart of Honeycomb.
+| | ...
 | | [Teardown]
 | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| | ...
 | | Given Interface Persistence Setup | ${node}
 | | And Interface Persistence Check | ${node}
 | | When Restart Honeycomb | ${node}
@@ -102,8 +120,10 @@
 | TC07: Persist configuration of IP addresses and neighbors - VPP restart
 | | [Documentation] | Verify persistence of interface state, IPv4 address
 | | ... | and neighbor entries through restart of VPP.
+| | ...
 | | [Teardown]
 | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| | ...
 | | Given Interface Persistence Setup | ${node}
 | | And Interface Persistence Check | ${node}
 | | When Restart VPP | ${node}
@@ -113,18 +133,22 @@
 | | [Documentation] | Verify persistence of bridge domain, L2-FIB entry
 | | ... | and Bridge domain Operational Interface Assignment through restart
 | | ... | of both Honeycomb and VPP.
+| | ...
 | | [Teardown]
 | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| | ...
 | | Given Bridge Domain Persistence Setup | ${node}
-| | When Restart Honeycomb and VPP | ${node}
+| | When Restart Honeycomb and VPP in pesistence test | ${node}
 | | Then Bridge Domain Persistence Check | ${node}
 
 | TC09: Honeycomb persists configuration of bridge domains - HC restart
 | | [Documentation] | Verify persistence of bridge domain, L2-FIB entry
 | | ... | and Bridge domain Operational Interface Assignment through restart
 | | ... | of Honeycomb.
+| | ...
 | | [Teardown]
 | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| | ...
 | | Given Bridge Domain Persistence Setup | ${node}
 | | When Restart Honeycomb | ${node}
 | | Then Bridge Domain Persistence Check | ${node}
@@ -133,8 +157,10 @@
 | | [Documentation] | Verify persistence of bridge domain, L2-FIB entry
 | | ... | and Bridge domain Operational Interface Assignment through restart
 | | ... | of VPP.
+| | ...
 | | [Teardown]
 | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| | ...
 | | Given Bridge Domain Persistence Setup | ${node}
 | | When Restart VPP | ${node}
 | | Then Bridge Domain Persistence Check | ${node}