CSIT-664: Refactor setups and teardowns

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

diff --git a/tests/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot
index f7e2622..03ccc32 100644 (file)
--- a/tests/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot
+++ b/tests/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot
@@ -21,31 +21,38 @@
 | Resource | resources/libraries/robot/honeycomb/vxlan_gpe.robot
 | Variables | resources/test_data/honeycomb/nsh.py
 | Variables | resources/test_data/honeycomb/vxlan_gpe.py
+| ...
 | Documentation | *Honeycomb NSH test suite.*
+| ...
 | Suite Teardown | Run Keyword If Any Tests Failed
-| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
-| Force Tags | honeycomb_sanity
+| ... | Restart Honeycomb and VPP | ${node}
+# disabled pending NSH version 17.04
+#| Force Tags | honeycomb_sanity | honeycomb_odl
 
 *** Test Cases ***
 | TC01: Honeycomb can configure NSH entry
 | | [Documentation] | Check if Honeycomb can configure an NSH entry.
-| | Given NSH configuration from Honeycomb should be empty | ${node}
+| | ...
+| | Given NSH Operational Data From Honeycomb Should Be empty | ${node}
 | | When Honeycomb adds NSH entry | ${node} | entry1 | ${nsh_entry1}
 | | Then NSH entry from Honeycomb should be
 | | ... | ${node} | entry1 | ${nsh_entry1_oper}
 
 | TC02: Honeycomb can remove NSH entry
 | | [Documentation] | Check if Honeycomb can remove an existing NSH entry.
+| | ...
 | | Given NSH entry from Honeycomb should be
 | | ... | ${node} | entry1 | ${nsh_entry1_oper}
 | | When Honeycomb removes NSH entry | ${node} | entry1
-| | Then NSH configuration from Honeycomb should be empty | ${node}
+| | Then NSH Operational Data From Honeycomb Should Be empty | ${node}
 
 | TC03: Honeycomb can configure new NSH entry
 | | [Documentation] | Check if Honeycomb can configure an NSH antry after one\
 | | ... | has been deleted.
+| | ...
 | | [Teardown] | Honeycomb removes NSH entry | ${node} | entry2
-| | Given NSH configuration from Honeycomb should be empty | ${node}
+| | ...
+| | Given NSH Operational Data From Honeycomb Should Be empty | ${node}
 | | When Honeycomb adds NSH entry | ${node} | entry2 | ${nsh_entry2}
 | | Then NSH entry from Honeycomb should be
 | | ... | ${node} | entry2 | ${nsh_entry2_oper}
@@ -53,8 +60,10 @@
 | TC04: Honeycomb can configure multiple NSH entries at the same time
 | | [Documentation] | Check if Honeycomb can configure an NSH entry when one\
 | | ... | already exists.
+| | ...
 | | [Teardown] | Honeycomb clears NSH configuration | ${node}
-| | Given NSH configuration from Honeycomb should be empty | ${node}
+| | ...
+| | Given NSH Operational Data From Honeycomb Should Be empty | ${node}
 | | When Honeycomb adds NSH entry | ${node} | entry1 | ${nsh_entry1}
 | | And Honeycomb adds NSH entry | ${node} | entry2 | ${nsh_entry2}
 | | Then NSH entry from Honeycomb should be
@@ -64,7 +73,8 @@
 
 | TC05: Honeycomb can configure NSH map
 | | [Documentation] | Check if Honeycomb can configure an NSH map.
-| | Given NSH configuration from Honeycomb should be empty | ${node}
+| | ...
+| | Given NSH Operational Data From Honeycomb Should Be empty | ${node}
 | | And Honeycomb creates VxLAN GPE interface
 | | ... | ${node} | ${vxlan_gpe_if1}
 | | ... | ${vxlan_gpe_base_settings1} | ${vxlan_gpe_settings1}
@@ -74,9 +84,10 @@
 
 | TC06: Honeycomb can remove NSH map
 | | [Documentation] | Check if Honeycomb can remove an existing NSH map.
+| | ...
 | | Given NSH entry from Honeycomb should be
 | | ... | ${node} | entry1 | ${nsh_entry1_oper}
-| | And VxLAN GPE configuration from Honeycomb should be
+| | And VxLAN GPE Operational Data From Honeycomb Should Be
 | | ... | ${node} | ${vxlan_gpe_if1}
 | | ... | ${vxlan_gpe_base_settings1} | ${vxlan_gpe_settings1}
 | | And NSH map from Honeycomb should be | ${node} | map1 | ${nsh_map1_oper}
@@ -88,11 +99,13 @@
 | TC07: Honeycomb can modify existing NSH map
 | | [Documentation] | Check if Honeycomb can configure an NSH map after one\
 | | ... | has been deleted.
+| | ...
 | | [Teardown] | Honeycomb removes NSH map | ${node} | map1_edit
+| | ...
 | | Given NSH map from Honeycomb should not exist | ${node} | map1_edit
 | | And NSH entry from Honeycomb should be
 | | ... | ${node} | entry1 | ${nsh_entry1_oper}
-| | And VxLAN GPE configuration from Honeycomb should be
+| | And VxLAN GPE Operational Data From Honeycomb Should Be
 | | ... | ${node} | ${vxlan_gpe_if1}
 | | ... | ${vxlan_gpe_base_settings1} | ${vxlan_gpe_settings1}
 | | When Honeycomb adds NSH map | ${node} | map1_edit | ${nsh_map1_edit}
@@ -104,16 +117,18 @@
 | TC08: Honeycomb can configure multiple NSH maps at the same time
 | | [Documentation] | Check if Honeycomb can configure and NSH map when one\
 | | ... | already exists.
+| | ...
 | | [Teardown] | Run Keywords
 | | ... | Honeycomb clears NSH configuration | ${node} | AND
 | | ... | Honeycomb removes VxLAN GPE interface
 | | ... | ${node} | ${vxlan_gpe_if1} | AND
 | | ... | Honeycomb removes VxLAN GPE interface
 | | ... | ${node} | ${vxlan_gpe_if2}
+| | ...
 | | Given NSH map from Honeycomb should not exist | ${node} | map2
 | | And NSH entry from Honeycomb should be
 | | ... | ${node} | entry1 | ${nsh_entry1_oper}
-| | And VxLAN GPE configuration from Honeycomb should be
+| | And VxLAN GPE Operational Data From Honeycomb Should Be
 | | ... | ${node} | ${vxlan_gpe_if1}
 | | ... | ${vxlan_gpe_base_settings1} | ${vxlan_gpe_settings1}
 | | And Honeycomb creates VxLAN GPE interface