diff options
Diffstat (limited to 'tests/func/honeycomb')
| -rw-r--r-- | tests/func/honeycomb/010_interface_management.robot | 32 | ||||
| -rw-r--r-- | tests/func/honeycomb/020_bridge_domain.robot | 6 | ||||
| -rw-r--r-- | tests/func/honeycomb/021_l2_fib.robot | 10 | ||||
| -rw-r--r-- | tests/func/honeycomb/030_vxlan.robot | 3 | ||||
| -rw-r--r-- | tests/func/honeycomb/031_vxlan_gpe.robot | 60 | ||||
| -rw-r--r-- | tests/func/honeycomb/040_tap.robot | 3 | ||||
| -rw-r--r-- | tests/func/honeycomb/050_interface_vhost_user.robot | 3 | ||||
| -rw-r--r-- | tests/func/honeycomb/060_sub_interface.robot | 12 | ||||
| -rw-r--r-- | tests/func/honeycomb/070_netconf.robot | 3 | ||||
| -rw-r--r-- | tests/func/honeycomb/071_notification.robot | 3 | ||||
| -rw-r--r-- | tests/func/honeycomb/080_access_control_lists.robot | 8 | ||||
| -rw-r--r-- | tests/func/honeycomb/900_persistence.robot | 23 | ||||
| -rw-r--r-- | tests/func/honeycomb/__init__.robot | 11 |
13 files changed, 101 insertions, 76 deletions
diff --git a/tests/func/honeycomb/010_interface_management.robot b/tests/func/honeycomb/010_interface_management.robot index e9798167c7..2c639c5c6a 100644 --- a/tests/func/honeycomb/010_interface_management.robot +++ b/tests/func/honeycomb/010_interface_management.robot @@ -33,16 +33,20 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/honeycomb/interfaces.robot +| Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Force Tags | honeycomb_sanity +| Suite Teardown | Run Keyword If Any Tests Failed +| | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | Documentation | *Honeycomb interface management test suite.* | ... | ... | Test suite uses the first interface of the first DUT node. *** Test Cases *** +# TODO: Remove "continue on failure" once VPP bugs (VPP-132, VPP-333) are fixed. | Honeycomb configures and reads interface state | | [Documentation] | Check if Honeycomb API can modify the admin state of\ | | ... | VPP interfaces. -| | Given Interface state is | ${node} | ${interface} | down +| | Given Interface State Is | ${node} | ${interface} | down | | When Honeycomb sets interface state | ${node} | ${interface} | up | | Then Interface state from Honeycomb should be | | ... | ${node} | ${interface} | up @@ -59,22 +63,26 @@ | | ... | ${ipv4_address} | ${ipv4_mask} | ${ipv4_settings} | | And Honeycomb adds interface ipv4 neighbor | | ... | ${node} | ${interface} | @{ipv4_neighbor} -| | Then IPv4 config from Honeycomb should be +| | Run Keyword And Continue On Failure +| | ... | Then IPv4 config from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_prefix} | | ... | @{ipv4_neighbor} | ${ipv4_settings} -| | And IPv4 config from VAT should be +| | Run Keyword And Continue On Failure +| | ... | And IPv4 config from VAT should be | | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_prefix} | Honeycomb removes ipv4 address from interface | | [Documentation] | Check if Honeycomb API can remove configured ipv4\ | | ... | addresses from interface. -| | Given IPv4 config from Honeycomb should be +| | Run Keyword And Continue On Failure +| | ... | Given IPv4 config from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_prefix} | | ... | @{ipv4_neighbor} | ${ipv4_settings} -| | And IPv4 config from VAT should be +| | Run Keyword And Continue On Failure +| | ... | And IPv4 config from VAT should be | | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_prefix} | | When Honeycomb removes interface ipv4 addresses | ${node} | ${interface} -| | Then IPv4 address from Honeycomb should be empty | ${node} |${interface} +| | Then IPv4 address from Honeycomb should be empty | ${node} | ${interface} | | And ipv4 address from VAT should be empty | ${node} | ${interface} | Honeycomb modifies interface configuration - ipv4 (prefix) @@ -87,11 +95,13 @@ | | ... | ${ipv4_settings} | | And Honeycomb adds interface ipv4 neighbor | | ... | ${node} | ${interface} | @{ipv4_neighbor} -| | Then IPv4 config from Honeycomb should be +| | Run Keyword And Continue On Failure +| | ... | Then IPv4 config from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv4_address2} | ${ipv4_prefix} | | ... | @{ipv4_neighbor} | | ... | ${ipv4_settings} -| | And IPv4 config from VAT should be +| | Run Keyword And Continue On Failure +| | ... | And IPv4 config from VAT should be | | ... | ${node} | ${interface} | ${ipv4_address2} | ${ipv4_prefix} | Honeycomb modifies interface configuration - ipv6 @@ -99,10 +109,12 @@ | | When Honeycomb sets interface ipv6 configuration | | ... | ${node} | ${interface} | @{ipv6_address} | @{ipv6_neighbor} | | ... | ${ipv6_settings} -| | Then IPv6 config from Honeycomb should be +| | Run Keyword And Continue On Failure +| | ... | Then IPv6 config from Honeycomb should be | | ... | ${node} | ${interface} | @{ipv6_address} | @{ipv6_neighbor} | | ... | ${ipv6_settings} -| | And IPv6 config from VAT should be +| | Run Keyword And Continue On Failure +| | ... | And IPv6 config from VAT should be | | ... | ${node} | ${interface} | @{ipv6_address} | Honeycomb modifies interface configuration - ethernet,routing diff --git a/tests/func/honeycomb/020_bridge_domain.robot b/tests/func/honeycomb/020_bridge_domain.robot index d4293dcdf7..bd182e34a9 100644 --- a/tests/func/honeycomb/020_bridge_domain.robot +++ b/tests/func/honeycomb/020_bridge_domain.robot @@ -25,9 +25,13 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Resource | resources/libraries/robot/honeycomb/interfaces.robot | Resource | resources/libraries/robot/honeycomb/bridge_domain.robot -| Suite Teardown | Honeycomb removes all bridge domains | ${node} +| Suite Teardown | Run keywords +| ... | Run Keyword If Any Tests Failed +| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} +| ... | AND | Honeycomb removes all bridge domains | ${node} | Force Tags | honeycomb_sanity | Documentation | *Honeycomb bridge domain management test suite.* | ... diff --git a/tests/func/honeycomb/021_l2_fib.robot b/tests/func/honeycomb/021_l2_fib.robot index ec07e104ad..b7e0f8dc02 100644 --- a/tests/func/honeycomb/021_l2_fib.robot +++ b/tests/func/honeycomb/021_l2_fib.robot @@ -13,21 +13,27 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Resource | resources/libraries/robot/honeycomb/interfaces.robot | Resource | resources/libraries/robot/honeycomb/bridge_domain.robot | Resource | resources/libraries/robot/honeycomb/l2_fib.robot -| Variables | resources/test_data/honeycomb/l2_fib.py +| Variables | resources/test_data/honeycomb/l2_fib.py | ${node} | ${interface} +| ... | ${interface2} | Documentation | *Honeycomb L2 FIB management test suite.* | Suite Setup | Run keywords | ... | Set test interface down | ... | AND | ... | Honeycomb removes all bridge domains | ${node} -| Suite Teardown | Honeycomb removes all bridge domains | ${node} +| Suite Teardown | Run keywords +| ... | Run Keyword If Any Tests Failed +| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} +| ... | AND | Honeycomb removes all bridge domains | ${node} | Force tags | honeycomb_sanity *** Variables *** # Interface to run tests on. | ${interface}= | ${node['interfaces']['port1']['name']} +| ${interface2}= | ${node['interfaces']['port3']['name']} *** Test Cases *** | Honeycomb adds L2 FIB entry (forward) diff --git a/tests/func/honeycomb/030_vxlan.robot b/tests/func/honeycomb/030_vxlan.robot index 7e192cea47..7aa77f3ae8 100644 --- a/tests/func/honeycomb/030_vxlan.robot +++ b/tests/func/honeycomb/030_vxlan.robot @@ -27,11 +27,14 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Resource | resources/libraries/robot/honeycomb/interfaces.robot | Resource | resources/libraries/robot/honeycomb/vxlan.robot # import additional VxLAN settings from resource file | Variables | resources/test_data/honeycomb/vxlan.py | Force Tags | honeycomb_sanity +| Suite Teardown | Run Keyword If Any Tests Failed +| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | Documentation | *Honeycomb VxLAN management test suite.* | ... | ... | Test suite uses the first interface of the first DUT node. diff --git a/tests/func/honeycomb/031_vxlan_gpe.robot b/tests/func/honeycomb/031_vxlan_gpe.robot index 5c51319070..54347e5725 100644 --- a/tests/func/honeycomb/031_vxlan_gpe.robot +++ b/tests/func/honeycomb/031_vxlan_gpe.robot @@ -33,16 +33,20 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Resource | resources/libraries/robot/honeycomb/interfaces.robot | Resource | resources/libraries/robot/honeycomb/vxlan_gpe.robot # Import additional VxLAN GPE settings from resource file | Variables | resources/test_data/honeycomb/vxlan_gpe.py | Documentation | *Honeycomb VxLAN-GPE management test suite.* | Force Tags | honeycomb_sanity +| Suite Teardown | Run Keyword If Any Tests Failed +| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} *** Test Cases *** +# TODO: Remove "continue on failure" once VPP bugs (VPP-217, VPP-156) are fixed. | Honeycomb creates VxLAN GPE tunnel -| | [Documentation] | Check if Honeycomb API can configure VxLAN GPE tunnel. +| | [Documentation] | Check if Honeycomb API can configure a VxLAN GPE tunnel. | | ... | | Given interface configuration from Honeycomb should be empty | | ... | ${node} | ${vxlan_gpe_if1} @@ -51,34 +55,31 @@ | | When Honeycomb creates VxLAN GPE interface | | ... | ${node} | ${vxlan_gpe_if1} | | ... | ${vxlan_gpe_base_settings} | ${vxlan_gpe_settings} -| | Then run keyword and continue on failure -| | ... | VxLAN GPE configuration from Honeycomb should be +| | Then VxLAN GPE configuration from Honeycomb should be | | ... | ${node} | ${vxlan_gpe_if1} | | ... | ${vxlan_gpe_base_settings} | ${vxlan_gpe_settings} | | And run keyword and continue on failure | | ... | VxLAN GPE configuration from VAT should be | | ... | ${node} | ${vxlan_gpe_if1} | ${vxlan_gpe_settings} -| | And run keyword and continue on failure -| | ... | VxLAN GPE Interface indices from Honeycomb and VAT should correspond +| | And VxLAN GPE Interface indices from Honeycomb and VAT should correspond | | ... | ${node} | ${vxlan_gpe_if1} | Honeycomb removes VxLAN GPE tunnel | | [Documentation] | Check if Honeycomb API can remove VxLAN GPE tunnel. | | ... -# Disabled beacuse of bug in Honeycomb. -# TODO: Enable when fixed. -#| | Given VxLAN GPE configuration from Honeycomb should be -#| | ... | ${node} | ${vxlan_gpe_if1} -#| | ... | ${vxlan_gpe_base_settings} | ${vxlan_gpe_settings} -#| | And VxLAN GPE configuration from VAT should be -#| | ... | ${node} | ${vxlan_gpe_if1} | ${vxlan_gpe_settings} +| | Run Keyword And Continue On Failure +| | ... | Given VxLAN GPE configuration from Honeycomb should be +| | ... | ${node} | ${vxlan_gpe_if1} +| | ... | ${vxlan_gpe_base_settings} | ${vxlan_gpe_settings} +| | Run Keyword And Continue On Failure +| | ... | And VxLAN GPE configuration from VAT should be +| | ... | ${node} | ${vxlan_gpe_if1} | ${vxlan_gpe_settings} | | When Honeycomb removes VxLAN GPE interface | | ... | ${node} | ${vxlan_gpe_if1} -| | Then VxLAN GPE configuration from VAT should be empty -| | ... | ${node} -| | And VxLAN GPE configuration from Honeycomb should be +| | Then VxLAN GPE configuration from Honeycomb should be empty | | ... | ${node} | ${vxlan_gpe_if1} -| | ... | ${vxlan_gpe_disabled_base_settings} | ${vxlan_gpe_settings} +| | And VxLAN GPE configuration from VAT should be empty +| | ... | ${node} | Honeycomb sets wrong interface type while creating VxLAN GPE tunnel | | [Documentation] | Check if Honeycomb refuses to create a VxLAN GPE tunnel\ @@ -127,32 +128,27 @@ | | ... | ${node} | Honeycomb creates VxLAN GPE tunnel with ipv6 -| | [Documentation] | Check if Honeycomb API can configure VxLAN GPE tunnel\ +| | [Documentation] | Check if Honeycomb API can configure a VxLAN GPE tunnel\ | | ... | with IPv6 addresses. | | ... | | Given VxLAN GPE configuration from VAT should be empty | | ... | ${node} -# Disabled beacuse of bug in Honeycomb -# TODO: Enable when fixed. -#| | And VxLAN GPE configuration from Honeycomb should be -#| | ... | ${node} | ${vxlan_gpe_if5} -#| | ... | ${vxlan_gpe_disabled_base_settings} | ${vxlan_gpe_settings} +| | And VxLAN GPE configuration from Honeycomb should be empty +| | ... | ${node} | ${vxlan_gpe_if5} | | When Honeycomb creates VxLAN GPE interface | | ... | ${node} | ${vxlan_gpe_if5} | | ... | ${vxlan_gpe_base_ipv6_settings} | ${vxlan_gpe_ipv6_settings} -| | Then run keyword and continue on failure -| | ... | VxLAN GPE configuration from Honeycomb should be +| | Then VxLAN GPE configuration from Honeycomb should be | | ... | ${node} | ${vxlan_gpe_if5} | | ... | ${vxlan_gpe_base_ipv6_settings} | ${vxlan_gpe_ipv6_settings} -| | And run keyword and continue on failure +| | And Run Keyword And Continue On Failure | | ... | VxLAN GPE configuration from VAT should be | | ... | ${node} | ${vxlan_gpe_if5} | ${vxlan_gpe_ipv6_settings} -| | And run keyword and continue on failure -| | ... | VxLAN GPE Interface indices from Honeycomb and VAT should correspond +| | And VxLAN GPE Interface indices from Honeycomb and VAT should correspond | | ... | ${node} | ${vxlan_gpe_if5} -| Honeycomb creates the second VxLAN GPE tunnel with ipv6 -| | [Documentation] | Check if Honeycomb API can configure another one VxLAN\ +| Honeycomb creates a second VxLAN GPE tunnel with ipv6 +| | [Documentation] | Check if Honeycomb API can configure another VxLAN\ | | ... | GPE tunnel with IPv6 addresses. | | ... | | Given interface configuration from Honeycomb should be empty @@ -162,13 +158,11 @@ | | When Honeycomb creates VxLAN GPE interface | | ... | ${node} | ${vxlan_gpe_if6} | | ... | ${vxlan_gpe_base_ipv6_settings2} | ${vxlan_gpe_ipv6_settings2} -| | Then run keyword and continue on failure -| | ... | VxLAN GPE configuration from Honeycomb should be +| | Then VxLAN GPE configuration from Honeycomb should be | | ... | ${node} | ${vxlan_gpe_if6} | | ... | ${vxlan_gpe_base_ipv6_settings2} | ${vxlan_gpe_ipv6_settings2} | | And run keyword and continue on failure | | ... | VxLAN GPE configuration from VAT should be | | ... | ${node} | ${vxlan_gpe_if6} | ${vxlan_gpe_ipv6_settings2} -| | And run keyword and continue on failure -| | ... | VxLAN GPE Interface indices from Honeycomb and VAT should correspond +| | And VxLAN GPE Interface indices from Honeycomb and VAT should correspond | | ... | ${node} | ${vxlan_gpe_if6} diff --git a/tests/func/honeycomb/040_tap.robot b/tests/func/honeycomb/040_tap.robot index 329ca8a3c1..cf45107ade 100644 --- a/tests/func/honeycomb/040_tap.robot +++ b/tests/func/honeycomb/040_tap.robot @@ -23,9 +23,12 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Resource | resources/libraries/robot/honeycomb/interfaces.robot | Resource | resources/libraries/robot/honeycomb/tap.robot | Force Tags | honeycomb_sanity +| Suite Teardown | Run Keyword If Any Tests Failed +| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | Documentation | *Honeycomb TAP management test suite.* | ... | ... | Test suite uses the first interface of the first DUT node. diff --git a/tests/func/honeycomb/050_interface_vhost_user.robot b/tests/func/honeycomb/050_interface_vhost_user.robot index 2c2a5ae91a..afc70715ee 100644 --- a/tests/func/honeycomb/050_interface_vhost_user.robot +++ b/tests/func/honeycomb/050_interface_vhost_user.robot @@ -24,8 +24,11 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Resource | resources/libraries/robot/honeycomb/vhost_user.robot | Force Tags | honeycomb_sanity +| Suite Teardown | Run Keyword If Any Tests Failed +| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | Documentation | *Honeycomb vhost-user interface management test suite.* | ... | ... | This test suite tests if it is posible to create, modify and\ diff --git a/tests/func/honeycomb/060_sub_interface.robot b/tests/func/honeycomb/060_sub_interface.robot index e67638ab97..8f12dd65dc 100644 --- a/tests/func/honeycomb/060_sub_interface.robot +++ b/tests/func/honeycomb/060_sub_interface.robot @@ -13,11 +13,15 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Resource | resources/libraries/robot/honeycomb/sub_interface.robot | Resource | resources/libraries/robot/honeycomb/bridge_domain.robot | Resource | resources/libraries/robot/honeycomb/interfaces.robot | Variables | resources/test_data/honeycomb/sub_interfaces.py -| Suite Teardown | Honeycomb removes all bridge domains | ${node} +| Suite Teardown | Run keywords +| ... | Run Keyword If Any Tests Failed +| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} +| ... | AND | Honeycomb removes all bridge domains | ${node} | Force Tags | honeycomb_sanity | Documentation | *Honeycomb sub-interface management test suite.* | ... @@ -34,7 +38,7 @@ | Honycomb creates sub-interface | | [Documentation] | Check if Honeycomb creates a sub-interface. | | ... -| | Given interface state is | ${node} | ${super_if} | down +| | Given Interface State Is | ${node} | ${super_if} | down | | And sub-interface configuration from Honeycomb should be empty | | ... | ${node} | ${super_if} | ${sub_if_id} | | And interface configuration from VAT should be empty @@ -347,6 +351,7 @@ | | ... | ${node} | ${sub_if_name} | | ... | ${ipv4['address']} | ${ipv4['prefix-length']} +#TODO: Remove "continue on failure" once VPP bug VPP-132 is fixed. | Honeycomb removes sub-interface ipv4 address | | [Documentation] | Check if Honeycomb can remove configured ipv4 addresses\ | | ... | from the sub-interface. @@ -354,7 +359,8 @@ | | Given sub-interface ipv4 address from Honeycomb should be | | ... | ${node} | ${super_if} | ${sub_if_id} | | ... | ${ipv4['address']} | ${ipv4['prefix-length']} -| | And sub-interface ipv4 address from VAT should be +| | Run Keyword And Continue On Failure +| | ... | And sub-interface ipv4 address from VAT should be | | ... | ${node} | ${sub_if_name} | | ... | ${ipv4['address']} | ${ipv4['prefix-length']} | | When Honeycomb removes all sub-interface ipv4 addresses diff --git a/tests/func/honeycomb/070_netconf.robot b/tests/func/honeycomb/070_netconf.robot index 9925dee15f..3f2244633f 100644 --- a/tests/func/honeycomb/070_netconf.robot +++ b/tests/func/honeycomb/070_netconf.robot @@ -13,11 +13,14 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Resource | resources/libraries/robot/honeycomb/netconf.robot | Variables | resources/test_data/honeycomb/netconf/triggers.py | Documentation | *Netconf test suite. Contains test cases that need to bypass\ | ... | REST API.* | Force Tags | honeycomb_sanity +| Suite Teardown | Run Keyword If Any Tests Failed +| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} *** Test Cases *** | Honeycomb can create and delete interfaces diff --git a/tests/func/honeycomb/071_notification.robot b/tests/func/honeycomb/071_notification.robot index 117f024b21..41d04913a6 100644 --- a/tests/func/honeycomb/071_notification.robot +++ b/tests/func/honeycomb/071_notification.robot @@ -20,6 +20,7 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Resource | resources/libraries/robot/honeycomb/interfaces.robot | Resource | resources/libraries/robot/honeycomb/tap.robot | Resource | resources/libraries/robot/honeycomb/notifications.robot @@ -30,6 +31,8 @@ | ... | ${node} | ${tap_interface} | ${tap_settings} | Documentation | *Honeycomb notifications test suite.* | Force Tags | honeycomb_sanity +| Suite Teardown | Run Keyword If Any Tests Failed +| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} *** Test Cases *** | Honeycomb sends notification on interface state change diff --git a/tests/func/honeycomb/080_access_control_lists.robot b/tests/func/honeycomb/080_access_control_lists.robot index 146a02edd3..e7a864e473 100644 --- a/tests/func/honeycomb/080_access_control_lists.robot +++ b/tests/func/honeycomb/080_access_control_lists.robot @@ -11,15 +11,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -*** Variables*** +*** Variables *** # Interface to run tests on. | ${interface}= | ${node['interfaces']['port1']['name']} *** Settings *** | Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/honeycomb/honeycomb.robot | Resource | resources/libraries/robot/honeycomb/access_control_lists.robot | Variables | resources/test_data/honeycomb/acl.py -| Suite Teardown | Clear all ACL settings | ${node} +| Suite Teardown | Run keywords +| ... | Run Keyword If Any Tests Failed +| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} +| ... | AND | Clear all ACL settings | ${node} | Documentation | *Honeycomb access control lists test suite.* | Force Tags | Honeycomb_sanity diff --git a/tests/func/honeycomb/900_persistence.robot b/tests/func/honeycomb/900_persistence.robot index e3f68ccc33..ffbc94e635 100644 --- a/tests/func/honeycomb/900_persistence.robot +++ b/tests/func/honeycomb/900_persistence.robot @@ -18,9 +18,9 @@ *** Settings *** | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/honeycomb/persistence.robot -| Suite Setup | Restart Honeycomb and VPP and clear persisted configuration +| Suite Setup | Restart Honeycomb And VPP And Clear Persisted Configuration | ... | ${node} -| Force Tags | honeycomb_persistence +| Force Tags | honeycomb_sanity | Documentation | *Honeycomb configuration persistence test suite.* *** Test Cases *** @@ -53,24 +53,7 @@ | | [Documentation] | Checks if Honeycomb reverts to default configuration when\ | | ... | persistence files are damaged or invalid. | | [Teardown] | Run keyword if test failed -| | ... | Restart both systems and clear persisted configuration | ${node} +| | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Honeycomb and VPP should not have default configuration | ${node} | | When Persistence file is damaged during restart | ${node} | | Then Honeycomb and VPP should have default configuration | ${node} - -*** Keywords *** -| Restart Honeycomb and VPP and clear persisted configuration -| | [Documentation] | Restarts Honeycomb and VPP with default configuration. -| | ... -| | ... | *Arguments:* -| | ... | - node - information about a DUT node. Type: dictionary -| | ... -| | ... | *Example:* -| | ... -| | ... | Restart both systems and clear persisted configuration \ -| | ... | \| ${nodes['DUT1']} \| -| | [Arguments] | ${node} -| | Stop Honeycomb service on DUTs | ${node} -| | Clear persisted Honeycomb configuration | ${node} -| | Setup DUT | ${node} -| | Setup Honeycomb service on DUTs | ${node}
\ No newline at end of file diff --git a/tests/func/honeycomb/__init__.robot b/tests/func/honeycomb/__init__.robot index d38852a090..a38d53a464 100644 --- a/tests/func/honeycomb/__init__.robot +++ b/tests/func/honeycomb/__init__.robot @@ -16,11 +16,12 @@ | ${node}= | ${nodes['DUT1']} *** Settings *** -| Library | resources.libraries.python.honeycomb.HcPersistence +| Library | resources/libraries/python/honeycomb/HcPersistence.py | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/honeycomb/honeycomb.robot -| Suite Setup | Run keywords | Setup all DUTs before test | AND -| ... | Clear persisted Honeycomb configuration | ${node} | AND -| ... | Setup Honeycomb service on DUTs | ${node} | AND +| Suite Setup | Run Keywords | Setup All DUTs Before Test | AND +| ... | Clear Persisted Honeycomb Configuration | ${node} | AND +| ... | Configure Unsecured Access | ${node} | AND +| ... | Setup Honeycomb Service On DUTs | ${node} | AND | ... | Set Global Variable | ${node} -| Suite Teardown | Stop Honeycomb service on DUTs | ${node} +| Suite Teardown | Stop Honeycomb Service On DUTs | ${node} |