HC Test: improve functional suite setup and teardown

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

diff --git a/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot
index 93c8420..acf203b 100644 (file)
--- a/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot
+++ b/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot
@@ -21,12 +21,18 @@
 | Resource | resources/libraries/robot/honeycomb/honeycomb.robot
 | Resource | resources/libraries/robot/honeycomb/interfaces.robot
 | Resource | resources/libraries/robot/honeycomb/routing.robot
+| ...
 | Test Setup | Clear Packet Trace on All DUTs | ${nodes}
-| Suite Teardown | Restart Honeycomb And VPP | ${node}
-| Test Teardown | Honeycomb routing test teardown
-| ... | ${node} | ${table}
+| ...
+| Suite Setup | Set Up Honeycomb Functional Test Suite | ${node}
+| ...
+| Suite Teardown | Tear Down Honeycomb Functional Test Suite | ${node}
+| ...
+| Test Teardown | Honeycomb routing test teardown | ${node} | ${table}
+| ...
 | Documentation | *Honeycomb routing test suite.*
-| Force Tags | Honeycomb_sanity | honeycomb_odl
+| ...
+| Force Tags | HC_FUNC
 
 *** Test Cases ***
 | TC01: Single hop IPv4 route
@@ -37,13 +43,14 @@
 | | ... | interfaces and configure route with TG-if2 as next-hop.
 | | ... | [Ver] Send ICMP packet from first TG interface to configured route
 | | ... | destination. Receive packet on the second TG interface.
+| | ...
 | | ${table}= | Set Variable | table1
 | | Given Setup interfaces and neighbors for IPv4 routing test
 | | When Honeycomb configures routing table
 | | ... | ${node} | table1 | ipv4 | ${table1} | ${1}
 | | Then Routing data from Honeycomb should contain
 | | ... | ${node} | table1 | ipv4 | ${table1_oper}
-| | And Verify Route IPv4 | ${nodes['TG']}
+| | And Verify route IPv4 | ${nodes['TG']}
 | | ... | ${src_ip} | ${dst_ip}
 | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac}
 | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac}
@@ -58,11 +65,12 @@
 | | ... | route destination. Receive all packets on the second TG interface and\
 | | ... | verify that each destination MAC was used by exactly 50 packets.
 | | ... | Receive packet on the second TG interface.
+| | ...
 | | ${table}= | Set Variable | table2
 | | Given Setup interfaces and neighbors for IPv4 routing test
-| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if2}
+| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2}
 | | ... | ${next_hop1} | ${next_hop_mac1}
-| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if2}
+| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2}
 | | ... | ${next_hop2} | ${next_hop_mac2}
 | | When Honeycomb configures routing table
 | | ... | ${node} | table2 | ipv4 | ${table2} | ${1}
@@ -83,6 +91,7 @@
 | | ... | [Ver] Send ICMP packet from first TG interface to configured route
 | | ... | destination. Make sure no packet is received on the second TG\
 | | ... | interface.
+| | ...
 | | ${table}= | Set Variable | table3
 | | Given Setup interfaces and neighbors for IPv4 routing test
 | | When Honeycomb configures routing table
@@ -90,7 +99,7 @@
 | | Then Routing data from Honeycomb should contain
 | | ... | ${node} | table3 | ipv4 | ${table3_oper}
 | | And Run keyword and Expect Error | ICMP echo Rx timeout
-| | ... | Verify Route IPv4 | ${nodes['TG']}
+| | ... | Verify route IPv4 | ${nodes['TG']}
 | | ... | ${src_ip} | ${dst_ip}
 | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac}
 | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac}
@@ -103,13 +112,14 @@
 | | ... | interfaces and configure route with TG-if2 as next-hop.
 | | ... | [Ver] Send ICMP packet from first TG interface to configured route
 | | ... | destination. Receive packet on the second TG interface.
+| | ...
 | | ${table}= | Set Variable | table4
 | | Given Setup interfaces and neighbors for IPv6 routing test
 | | When Honeycomb configures routing table
 | | ... | ${node} | table4 | ipv6 | ${table4} | ${1}
 | | Then Routing data from Honeycomb should contain
 | | ... | ${node} | table4 | ipv6 | ${table4_oper}
-| | And Verify Route IPv6 | ${nodes['TG']}
+| | And Verify route IPv6 | ${nodes['TG']}
 | | ... | ${src_ip} | ${next_hop}
 | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac}
 | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac}
@@ -124,11 +134,12 @@
 | | ... | route destination. Receive all packets on the second TG interface and\
 | | ... | verify that each destination MAC was used by exactly 50 packets.
 | | ... | Receive packet on the second TG interface.
+| | ...
 | | ${table}= | Set Variable | table5
 | | Given Setup interfaces and neighbors for IPv6 routing test
-| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2}
+| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2}
 | | ... | ${next_hop1} | ${next_hop_mac1}
-| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2}
+| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2}
 | | ... | ${next_hop2} | ${next_hop_mac2}
 | | When Honeycomb configures routing table
 | | ... | ${node} | table5 | ipv6 | ${table5} | ${1}
@@ -149,6 +160,7 @@
 | | ... | [Ver] Send ICMP packet from first TG interface to configured route
 | | ... | destination. Make sure no packet is received on the second TG\
 | | ... | interface.
+| | ...
 | | ${table}= | Set Variable | table6
 | | Given Setup interfaces and neighbors for IPv6 routing test
 | | When Honeycomb configures routing table
@@ -156,60 +168,64 @@
 | | Then Routing data from Honeycomb should contain
 | | ... | ${node} | table6 | ipv6 | ${table6_oper}
 | | And Run keyword and Expect Error | ICMP echo Rx timeout
-| | ... | Verify Route IPv6 | ${nodes['TG']}
+| | ... | Verify route IPv6 | ${nodes['TG']}
 | | ... | ${src_ip} | ${dst_ip}
 | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac}
 | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac}
 
 *** Keywords ***
 | Setup interfaces and neighbors for IPv4 routing test
-| | Path for 2-node testing is set
+| | Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | Import Variables | resources/test_data/honeycomb/routing.py
 | | ... | ${nodes['DUT1']} | ipv4 | ${dut_to_tg_if2}
 | | Setup vrf IDs | ${dut_node} | ${dut_to_tg_if1} | ${1}
 | | Setup vrf IDs | ${dut_node} | ${dut_to_tg_if2} | ${1}
-| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up
-| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up
-| | Honeycomb sets interface ipv4 address with prefix | ${dut_node}
+| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up
+| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up
+| | Honeycomb sets interface IPv4 address with prefix | ${dut_node}
 | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_len}
-| | Honeycomb sets interface ipv4 address with prefix | ${dut_node}
+| | Honeycomb sets interface IPv4 address with prefix | ${dut_node}
 | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_len}
-| | Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1}
+| | Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1}
 | | ... | ${src_ip} | ${tg_to_dut_if1_mac}
-| | Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if2}
+| | Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2}
 | | ... | ${next_hop} | ${tg_to_dut_if2_mac}
 
 | Setup interfaces and neighbors for IPv6 routing test
-| | Path for 2-node testing is set
+| | Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | Import Variables | resources/test_data/honeycomb/routing.py
 | | ... | ${nodes['DUT1']} | ipv6 | ${dut_to_tg_if2}
-| | Honeycomb sets interface vrf ID
+| | Honeycomb sets interface VRF ID
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${1} | ipv6
-| | Honeycomb sets interface vrf ID
+| | Honeycomb sets interface VRF ID
 | | ... | ${dut_node} | ${dut_to_tg_if2} | ${1} | ipv6
-| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up
-| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up
-| | Honeycomb sets interface ipv6 address | ${dut_node}
+| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up
+| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up
+| | Honeycomb sets interface IPv6 address | ${dut_node}
 | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_len}
-| | Honeycomb sets interface ipv6 address | ${dut_node}
+| | Honeycomb sets interface IPv6 address | ${dut_node}
 | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_len}
-| | Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1}
+| | Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1}
 | | ... | ${src_ip} | ${tg_to_dut_if1_mac}
-| | Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2}
+| | Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2}
 | | ... | ${next_hop} | ${tg_to_dut_if2_mac}
 | | Vpp all ra suppress link layer | ${nodes}
 
 | Honeycomb routing test teardown
+| | ...
 | | [arguments] | ${node} | ${routing_table}
+| | ...
 | | Show Packet Trace on All DUTs | ${nodes}
 | | Log routing configuration from VAT | ${node}
 | | Honeycomb removes routing configuration | ${node} | ${routing_table}
 
 | Setup vrf IDs
+| | ...
 | | [Arguments] | ${node} | ${interface} | ${vrf}
-| | Honeycomb sets interface vrf ID
+| | ...
+| | Honeycomb sets interface VRF ID
 | | ... | ${node} | ${interface} | ${vrf} | ipv4
-| | Honeycomb sets interface vrf ID
+| | Honeycomb sets interface VRF ID
 | | ... | ${node} | ${interface} | ${vrf} | ipv6
\ No newline at end of file