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, 24 insertions, 7 deletions

diff --git a/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot
index abcd86e95d..c5533c27d0 100644
--- a/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot
+++ b/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot
@@ -22,16 +22,21 @@
 | Resource | resources/libraries/robot/honeycomb/slaac.robot
 | Resource | resources/libraries/robot/testing_path.robot
 | Resource | resources/libraries/robot/traffic.robot
+| ...
 | Suite Teardown
 | ... | Run Keyword If Any Tests Failed
 | ... | Restart Honeycomb and VPP | ${node}
+| ...
 | Force Tags | HC_FUNC
+| ...
 | Documentation | *Honeycomb SLAAC management test suite.*
+| ...
 | Variables | resources/test_data/honeycomb/slaac_variables.py
 
 *** Test Cases ***
 | TC01: Honeycomb can configure SLAAC
 | | [Documentation] | Checks if Honeycomb can congigure SLAAC.
+| | ...
 | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node}
 | | ... | ${interface}
 | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up
@@ -43,6 +48,7 @@
 
 | TC02: Honeycomb can disable SLAAC
 | | [Documentation] | Checks if Honeycomb can disable SLAAC.
+| | ...
 | | Given SLAAC Operational Data From Honeycomb Should Be | ${node}
 | | ... | ${interface} | ${slaac_data}
 | | When Honeycomb removes SLAAC configuration | ${node} | ${interface}
@@ -51,7 +57,9 @@
 
 | TC03: Honeycomb can configure SLAAC with suppress link layer disabled
 | | [Documentation] | Checks if Honeycomb can congigure SLAAC.
+| | ...
 | | [Teardown] | SLAAC test teardown | ${node} | ${interface}
+| | ...
 | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node}
 | | ... | ${interface}
 | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up
@@ -64,41 +72,47 @@
 | TC04: Honeycomb can configure SLAAC with sending RA packets disabled
 | | [Documentation] | Checks if Honeycomb can configure SLAAC\
 | | ... | with given settings.
+| | ...
 | | [Teardown] | SLAAC test teardown | ${node} | ${interface}
+| | ...
 | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node}
 | | ... | ${interface}
 | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up
 | | And Honeycomb sets interface IPv6 address | ${node} | ${interface}
 | | ... | ${address} | ${prefix}
 | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data_01}
-| | Then SLAAC Operational Data From Honeycomb Should Be | ${node} | ${interface}
-| | ... | ${slaac_data_01}
+| | Then SLAAC Operational Data From Honeycomb Should Be | ${node}
+| | ... | ${interface} | ${slaac_data_01}
 
 | TC05: Honeycomb can configure SLAAC with min interval values
 | | [Documentation] | Checks if Honeycomb can configure SLAAC\
 | | ... | with given settings.
+| | ...
 | | [Teardown] | SLAAC test teardown | ${node} | ${interface}
+| | ...
 | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node}
 | | ... | ${interface}
 | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up
 | | And Honeycomb sets interface IPv6 address | ${node} | ${interface}
 | | ... | ${address} | ${prefix}
 | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data_02}
-| | Then SLAAC Operational Data From Honeycomb Should Be | ${node} | ${interface}
-| | ... | ${slaac_data_02}
+| | Then SLAAC Operational Data From Honeycomb Should Be | ${node}
+| | ... | ${interface} | ${slaac_data_02}
 
 | TC06: Honeycomb can configure SLAAC with max interval values
 | | [Documentation] | Checks if Honeycomb can configure SLAAC\
 | | ... | with given settings.
+| | ...
 | | [Teardown] | SLAAC test teardown | ${node} | ${interface}
+| | ...
 | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node}
 | | ... | ${interface}
 | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up
 | | And Honeycomb sets interface IPv6 address | ${node} | ${interface}
 | | ... | ${address} | ${prefix}
 | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data_03}
-| | Then SLAAC Operational Data From Honeycomb Should Be | ${node} | ${interface}
-| | ... | ${slaac_data_03}
+| | Then SLAAC Operational Data From Honeycomb Should Be | ${node}
+| | ... | ${interface} | ${slaac_data_03}
 
 | TC07: DUT retransmits RA on IPv6 enabled interface after a set interval
 | | [Documentation]
@@ -106,12 +120,15 @@
 | | ... | [Cfg] On DUT1 configure IPv6 interface on the link to TG.
 | | ... | [Ver] Make TG wait for two IPv6 Router Advertisement packets\
 | | ... | to be sent by DUT1 and verify the received RA packets are correct.
+| | ...
 | | [Teardown] | SLAAC test teardown | ${dut_node} | ${dut_to_tg_if1}
+| | ...
 | | Given Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Honeycomb sets interface IPv6 address
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${address} | ${prefix}
-| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up
+| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1}
+| | ... | up
 | | When Honeycomb configures SLAAC | ${dut_node} | ${dut_to_tg_if1}
 | | ... | ${slaac_data}
 | | :FOR | ${n} | IN RANGE | ${2}