HC Test: improve functional suite setup and teardown

[csit.git] / tests / func / honeycomb / mgmt-cfg-spanrx-apihc-apivat-func.robot

diff --git a/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot
index 1cc385c..a24d355 100644 (file)
--- a/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot
+++ b/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot
@@ -24,9 +24,15 @@
 | ... | ${node['interfaces']['port3']['name']}
 | ... | local0
 | Variables | resources/test_data/honeycomb/sub_interfaces.py
+| ...
 | Force Tags | HC_FUNC
-| Suite Setup | Add Interface local0 To Topology | ${node}
-| Suite Teardown | Restart Honeycomb and VPP | ${node}
+| ...
+| Suite Setup | Run Keywords
+| ... | Set Up Honeycomb Functional Test Suite | ${node} | AND
+| ... | Add Interface local0 To Topology | ${node}
+| ...
+| Suite Teardown | Tear Down Honeycomb Functional Test Suite | ${node}
+| ...
 | Documentation | *Honeycomb port mirroring test suite.*
 
 *** Test Cases ***
@@ -34,7 +40,7 @@
 | | [Documentation] | Honeycomb configures SPAN on interface and verifies
 | | ... | against VPP SPAN dump in state receive.
 | | ...
-| | When Honeycomb Configures SPAN on interface
+| | When Honeycomb configures SPAN on interface
 | | ... | ${node} | ${interface1} | ${settings_receive}
 | | Then Interface SPAN Operational Data from Honeycomb should be
 | | ... | ${node} | ${interface1} | ${settings_receive}
@@ -43,7 +49,7 @@
 | | [Documentation] | Honeycomb configures SPAN on interface and verifies
 | | ... | against VPP SPAN dump in state transmit.
 | | ...
-| | When Honeycomb Configures SPAN on interface
+| | When Honeycomb configures SPAN on interface
 | | ... | ${node} | ${interface1} | ${settings_transmit}
 | | Then Interface SPAN Operational Data from Honeycomb should be
 | | ... | ${node} | ${interface1} | ${settings_transmit}
@@ -52,7 +58,7 @@
 | | [Documentation] | Honeycomb configures SPAN on interface and verifies
 | | ... | against VPP SPAN dump in state both.
 | | ...
-| | When Honeycomb Configures SPAN on interface
+| | When Honeycomb configures SPAN on interface
 | | ... | ${node} | ${interface1} | ${settings_both}
 | | Then Interface SPAN Operational Data from Honeycomb should be
 | | ... | ${node} | ${interface1} | ${settings_both}
@@ -61,7 +67,7 @@
 | | [Documentation] | Honeycomb configures SPAN on interface and verifies
 | | ... | against VPP SPAN dump in state both.
 | | ...
-| | When Honeycomb Configures SPAN on interface
+| | When Honeycomb configures SPAN on interface
 | | ... | ${node} | ${interface1} | ${settings_both} | ${settings_if2}
 | | Then Interface SPAN Operational Data from Honeycomb should be
 | | ... | ${node} | ${interface1} | ${settings_both} | ${settings_if2}
@@ -86,9 +92,10 @@
 | | ... | ${node} | ${interface1} | AND
 | | ... | Honeycomb removes interface SPAN configuration
 | | ... | ${node} | ${interface2}
-| | When Honeycomb Configures SPAN on interface
+| | ...
+| | When Honeycomb configures SPAN on interface
 | | ... | ${node} | ${interface1} | ${settings_if2}
-| | And Honeycomb Configures SPAN on interface
+| | And Honeycomb configures SPAN on interface
 | | ... | ${node} | ${interface2} | ${settings_if2}
 | | Then Interface SPAN Operational Data from Honeycomb should be
 | | ... | ${node} | ${interface1} | ${settings_if2}
@@ -96,6 +103,8 @@
 | | ... | ${node} | ${interface2} | ${settings_if2}
 
 | TC07: DUT mirrors IPv4 packets from one interface to another
+# Pending rework
+| | [Tags] | EXPECTED_FAILING
 | | [Documentation]
 | | ... | [Top] TG=DUT1
 | | ... | [Cfg] (using Honeycomb) On DUT1 configure IPv4 address and set SPAN\
@@ -106,24 +115,27 @@
 | | ...
 | | [Teardown] | Run Keywords
 | | ... | Show Packet Trace on All DUTs | ${nodes} | AND
-| | ... | Honeycomb clears all interface ipv4 neighbors
+| | ... | Honeycomb clears all interface IPv4 neighbors
 | | ... | ${dut_node} | ${dut_to_tg_if1} | AND
-| | ... | Honeycomb removes interface ipv4 addresses
+| | ... | Honeycomb removes interface IPv4 addresses
 | | ... | ${dut_node} | ${dut_to_tg_if1} | AND
 | | ... | Honeycomb removes interface SPAN configuration
 | | ... | ${node} | ${dut_to_tg_if2}
-| | Given Path for 2-node testing is set
+| | ...
+| | Given Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up
-| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up
-| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node}
+| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1}
+| | ... | up
+| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2}
+| | ... | up
+| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node}
 | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix}
-| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1}
+| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1}
 | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if1_mac}
 | | ${settings_5}= | create dictionary | state=both
 | | ... | iface-ref=${dut_to_tg_if1}
-| | And InterfaceCLI.All Vpp Interfaces Ready Wait | ${nodes}
-| | When Honeycomb Configures SPAN on interface
+| | And All Vpp Interfaces Ready Wait | ${nodes}
+| | When Honeycomb configures SPAN on interface
 | | ... | ${node} | ${dut_to_tg_if2} | ${settings_5}
 | | Then Send Packet And Check Received Copies | ${tg_node}
 | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac}
@@ -196,6 +208,7 @@
 | | ... | ${node} | ${interface1} | ${1} | AND
 | | ... | Honeycomb removes sub-interface SPAN configuration
 | | ... | ${node} | ${interface2} | ${1}
+| | ...
 | | Given Honeycomb creates sub-interface | ${node} | ${interface2}
 | | ... | ${sub_if_2_match} | ${sub_if_2_tags} | ${sub_if_2_settings}
 | | When Honeycomb Configures SPAN on sub-interface
@@ -207,7 +220,9 @@
 | | Then Sub-Interface SPAN Operational Data from Honeycomb should be
 | | ... | ${node} | ${interface2} | ${1} | ${settings_if2}
 
-| TC14: DUT mirrors IPv4 packets from one interface to another
+| TC14: DUT mirrors IPv4 packets from an interface to a sub-interface
+# Pending rework
+| | [Tags] | EXPECTED_FAILING
 | | [Documentation]
 | | ... | [Top] TG=DUT1
 | | ... | [Cfg] (using Honeycomb) On DUT1 configure IPv4 address and set SPAN\
@@ -218,22 +233,25 @@
 | | ... | on the sub-interface.
 | | ...
 | | [Teardown] | Show Packet Trace on All DUTs | ${nodes}
-| | Given Path for 2-node testing is set
+| | ...
+| | Given Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Sub-interface state from Honeycomb should be
 | | ... | ${dut_node} | ${interface1} | ${1} | down | up
-| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up
-| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up
+| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1}
+| | ... | up
+| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2}
+| | ... | up
 | | And Honeycomb sets the sub-interface up
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${1}
-| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node}
+| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node}
 | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix}
-| | And And Honeycomb adds interface ipv4 neighbor
+| | And And Honeycomb adds interface IPv4 neighbor
 | | ... | ${dut_node} | ${dut_to_tg_if2}
 | | ... | ${tg_to_dut_if2_ip} | ${tg_to_dut_if2_mac}
 | | ${settings_5}= | create dictionary | state=both
 | | ... | iface-ref=${dut_to_tg_if2}
-| | And InterfaceCLI.All Vpp Interfaces Ready Wait | ${nodes}
+| | And All Vpp Interfaces Ready Wait | ${nodes}
 | | When Honeycomb Configures SPAN on sub-interface
 | | ... | ${node} | ${dut_to_tg_if1} | ${1} | ${settings_5}
 | | Then Send Packet And Check Received Copies | ${tg_node}