X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Fpersistence.robot;h=01336f3a48170d75bd27a832fb67bd6151d52917;hp=2744ba637712d04ab437976dbc47c04a788fea73;hb=783f364f5546f1de60aed84d953d9295672ac454;hpb=a114591eac9f52502048db886da2fb228c62254d

diff --git a/resources/libraries/robot/honeycomb/persistence.robot b/resources/libraries/robot/honeycomb/persistence.robot
index 2744ba6377..01336f3a48 100644
--- a/resources/libraries/robot/honeycomb/persistence.robot
+++ b/resources/libraries/robot/honeycomb/persistence.robot
@@ -13,8 +13,7 @@
 
 *** Settings ***
 | Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords
-| ...     | WITH NAME | InterfaceAPI
-| Library | resources/libraries/python/honeycomb/HcPersistence.py
+| Library | resources.libraries.python.honeycomb.HcPersistence
 | Resource | resources/libraries/robot/honeycomb/honeycomb.robot
 | Resource | resources/libraries/robot/honeycomb/interfaces.robot
 | Resource | resources/libraries/robot/honeycomb/vxlan.robot
@@ -26,7 +25,7 @@
 | Documentation | Keywords used to test Honeycomb persistence.
 
 *** Keywords ***
-| Honeycomb is restarted
+| Restart Honeycomb
 | | [Documentation] | Restarts Honeycomb without clearing persistence data.
 | | ...
 | | ... | *Arguments:*
@@ -34,14 +33,14 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb is restarted \| ${nodes['DUT1']} \|
+| | ... | \| Restart Honeycomb \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
 | | Stop Honeycomb service on DUTs | ${node}
 | | Log Persisted Configuration | ${node}
-| | Setup Honeycomb service on DUTs | ${node}
+| | Configure Honeycomb service on DUTs | ${node}
 
-| VPP is restarted
+| Restart VPP
 | | [Documentation] | Restarts VPP and waits until it reconnects with Honeycomb.
 | | ...
 | | ... | *Arguments:*
@@ -49,10 +48,12 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| VPP is restarted \| ${nodes['DUT1']} \|
+| | ... | \| Restart VPP \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
-| | Setup DUT | ${node}
+| | Restart Vpp Service | ${node}
+| | Verify Vpp | ${node}
+| | VPP Enable Traces On DUT | ${node}
 | | Check VPP connection | ${node}
 
 | Check VPP connection
@@ -70,7 +71,7 @@
 | | Wait until keyword succeeds | 2min | 20sec
 | | ... | Check Honeycomb startup state | ${node}
 
-| Honeycomb and VPP are restarted
+| Restart Honeycomb and VPP in pesistence test
 | | [Documentation] | Stops Honeycomb, restarts VPP and then starts Honeycomb\
 | | ... | again.
 | | ...
@@ -79,13 +80,15 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb and VPP are restarted \| ${nodes['DUT1']} \|
+| | ... | \| Restart Honeycomb and VPP \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
 | | Stop Honeycomb service on DUTs | ${node}
 | | Log Persisted Configuration | ${node}
-| | Setup DUT | ${node}
-| | Setup Honeycomb service on DUTs | ${node}
+| | Restart Vpp Service | ${node}
+| | Verify Vpp | ${node}
+| | VPP Enable Traces On DUT | ${node}
+| | Configure Honeycomb service on DUTs | ${node}
 
 | Multi-Feature Persistence Test Configuration
 | | [Documentation] | Uses Honeycomb to set basic settings for VxLAN,\
@@ -111,7 +114,7 @@
 | | ... | ${node} | ${vhost_interface} | ${vhost_user_client}
 | | Honeycomb creates sub-interface | ${node} | ${interface}
 | | ... | ${sub_if_1_match} | ${sub_if_1_tags} | ${sub_if_1_settings}
-| | Honeycomb sets interface state | ${node} | ${interface} | up
+| | Honeycomb configures interface state | ${node} | ${interface} | up
 | | Honeycomb sets the sub-interface up
 | | ... | ${node} | ${interface} | ${sub_if_id}
 | | Honeycomb adds sub-interface to bridge domain
@@ -142,9 +145,9 @@
 | | Bridge domain Operational Data From VAT Should Be
 | | ... | ${node} | ${0} | ${bd_settings}
 | | TAP Operational Data From Honeycomb Should Be
-| | ... | ${node} | ${tap_interface} | ${tap_settings}
+| | ... | ${node} | ${tap_interface} | ${tap_settings_oper}
 | | TAP Operational Data From VAT Should Be
-| | ... | ${node} | ${tap_interface} | ${tap_settings}
+| | ... | ${node} | ${tap_interface_vat} | ${tap_settings_vat}
 | | Vhost-user Operational Data From Honeycomb Should Be
 | | ... | ${node} | ${vhost_interface} | ${vhost_user_client}
 | | Vhost-user Operational Data From VAT Should Be
@@ -157,14 +160,14 @@
 | | Interface state from VAT should be | ${node} | ${interface} | up
 | | Sub-interface bridge domain Operational Data From Honeycomb Should Be
 | | ... | ${node} | ${interface} | ${sub_if_id} | ${sub_bd_settings}
-| | Sub-interface bridge domain Operational Data From VAT Should Be
+| | Sub-interface bridge domain Operational Data From PAPI Should Be
 | | ... | ${node} | ${sub_if_name} | ${sub_bd_settings}
 | | Rewrite tag from Honeycomb should be
 | | ... | ${node} | ${interface} | ${sub_if_id} | ${tag_rewrite_pop_1_oper}
 | | Rewrite tag from VAT should be
 | | ... | ${node} | ${sub_if_name} | ${tag_rewrite_pop_1_VAT}
-| | ${data_conf}= | InterfaceAPI.Get all interfaces cfg data | ${node}
-| | ${data_oper}= | InterfaceAPI.Get all interfaces oper data | ${node}
+| | ${data_conf}= | Get all interfaces cfg data | ${node}
+| | ${data_oper}= | Get all interfaces oper data | ${node}
 | | Compare interface lists | ${data_conf} | ${data_oper}
 
 | Honeycomb and VPP should have default configuration
@@ -185,7 +188,7 @@
 | | ... | ${node} | ${vx_interface}
 | | VxLAN Operational Data From VAT Should Be empty | ${node}
 | | Honeycomb should show no bridge domains | ${node}
-| | VAT should show no bridge domains | ${node}
+| | PAPI should show no bridge domains | ${node}
 | | TAP Operational Data From Honeycomb Should Be empty
 | | ... | ${node} | ${tap_interface}
 | | TAP Operational Data From VAT Should Be empty
@@ -213,8 +216,10 @@
 | | [Arguments] | ${node}
 | | Stop Honeycomb service on DUTs | ${node}
 | | Modify persistence files | ${node} | { | abc
-| | Setup DUT | ${node}
-| | Setup Honeycomb service on DUTs | ${node}
+| | Restart Vpp Service | ${node}
+| | Verify Vpp | ${node}
+| | VPP Enable Traces On DUT | ${node}
+| | Configure Honeycomb service on DUTs | ${node}
 
 | Log persisted configuration on node
 | | [Documentation] | Logs the content of Honeycomb's persitence files.
@@ -243,14 +248,14 @@
 | | [Arguments] | ${node}
 | | Honeycomb and VPP should have default configuration | ${node}
 | | Import Variables | resources/test_data/honeycomb/interface_ip.py
-| | Honeycomb sets interface state | ${node} | ${interface} | up
-| | Honeycomb sets interface ipv4 address with prefix
+| | Honeycomb configures interface state | ${node} | ${interface} | up
+| | Honeycomb sets interface IPv4 address with prefix
 | | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_prefix}
-| | Honeycomb adds interface ipv4 neighbor
+| | Honeycomb adds interface IPv4 neighbor
 | | ... | ${node} | ${interface} | ${ipv4_neighbor} | ${neighbor_mac}
-| | Honeycomb sets interface ipv6 address
+| | Honeycomb sets interface IPv6 address
 | | ... | ${node} | ${interface} | ${ipv6_address} | ${ipv6_prefix}
-| | Honeycomb adds interface ipv6 neighbor
+| | Honeycomb adds interface IPv6 neighbor
 | | ... | ${node} | ${interface} | ${ipv6_neighbor} | ${neighbor_mac}
 
 | Interface Persistence Check
@@ -322,5 +327,5 @@
 | | ... | ${node} | ${interface} | ${if_bd_settings}
 | | L2 FIB Entry from Honeycomb should be
 | | ... | ${node} | ${bd_name} | ${l2_fib_forward_oper}
-| | L2 FIB entry from VAT should be
+| | L2 FIB entry from PAPI should be
 | | ... | ${node} | ${bd_index} | ${l2_fib_forward_vat}
\ No newline at end of file