X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Fpersistence.robot;h=aac920914cb5fece6680c4cff2f836beebf52732;hp=f05fe4d5e5802e06edb3d70ab34cd0c51343ec3a;hb=fc42ade3d5c7ed279e867cb55ca42a44db5e706d;hpb=bcf99a0eb0e8770f28c2e3c8c0965ad6c0acba94

diff --git a/resources/libraries/robot/honeycomb/persistence.robot b/resources/libraries/robot/honeycomb/persistence.robot
index f05fe4d5e5..aac920914c 100644
--- a/resources/libraries/robot/honeycomb/persistence.robot
+++ b/resources/libraries/robot/honeycomb/persistence.robot
@@ -14,7 +14,7 @@
 *** Settings ***
 | Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords
 | ...     | WITH NAME | InterfaceAPI
-| Library | resources.libraries.python.honeycomb.HcPersistence
+| Library | resources/libraries/python/honeycomb/HcPersistence.py
 | Resource | resources/libraries/robot/honeycomb/honeycomb.robot
 | Resource | resources/libraries/robot/honeycomb/interfaces.robot
 | Resource | resources/libraries/robot/honeycomb/vxlan.robot
@@ -22,7 +22,7 @@
 | Resource | resources/libraries/robot/honeycomb/tap.robot
 | Resource | resources/libraries/robot/honeycomb/vhost_user.robot
 | Resource | resources/libraries/robot/honeycomb/sub_interface.robot
-| Variables | tests/suites/honeycomb/resources/persistence.py | ${interface}
+| Variables | resources/test_data/honeycomb/persistence.py | ${interface}
 | Documentation | Keywords used to test Honeycomb persistence.
 
 *** Keywords ***
@@ -37,6 +37,7 @@
 | | ... | \| Honeycomb is restarted \| ${nodes['DUT1']} \|
 | | [Arguments] | ${node}
 | | Stop Honeycomb service on DUTs | ${node}
+| | Log Persisted Configuration | ${node}
 | | Setup Honeycomb service on DUTs | ${node}
 
 | VPP is restarted
@@ -78,6 +79,7 @@
 | | ... | \| Honeycomb and VPP are restarted \| ${nodes['DUT1']} \|
 | | [Arguments] | ${node}
 | | Stop Honeycomb service on DUTs | ${node}
+| | Log Persisted Configuration | ${node}
 | | Setup DUT | ${node}
 | | Setup Honeycomb service on DUTs | ${node}
 
@@ -101,7 +103,7 @@
 | | Honeycomb creates TAP interface
 | | ... | ${node} | ${tap_interface} | ${tap_settings}
 | | Honeycomb creates vhost-user interface
-| | ... | ${node} | ${vhost_interface} | ${vhost_user_server}
+| | ... | ${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
@@ -109,6 +111,8 @@
 | | ... | ${node} | ${interface} | ${sub_if_id}
 | | Honeycomb adds sub-interface to bridge domain
 | | ... | ${node} | ${interface} | ${sub_if_id} | ${sub_bd_settings}
+| | Honeycomb configures tag rewrite
+| | ... | ${node} | ${interface} | ${sub_if_id} | ${tag_rewrite_pop_1}
 
 | Honeycomb and VPP should verify every setting
 | | [Documentation] | Uses Honeycomb and VAT to verify settings for VxLAN,\
@@ -136,9 +140,9 @@
 | | TAP configuration from VAT should be
 | | ... | ${node} | ${tap_interface} | ${tap_settings}
 | | Vhost-user configuration from Honeycomb should be
-| | ... | ${node} | ${vhost_interface} | ${vhost_user_server}
+| | ... | ${node} | ${vhost_interface} | ${vhost_user_client}
 | | Vhost-user configuration from VAT should be
-| | ... | ${node} | ${vhost_user_server}
+| | ... | ${node} | ${vhost_user_client}
 | | Sub-interface configuration from Honeycomb should be
 | | ... | ${node} | ${interface} | ${sub_if_id} | ${sub_if_1_oper}
 | | Sub-interface configuration from VAT should be
@@ -149,6 +153,10 @@
 | | ... | ${node} | ${interface} | ${sub_if_id} | ${sub_bd_settings}
 | | Sub-interface bridge domain configuration from VAT 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}
 
 | Honeycomb and VPP should have default configuration
 | | [Documentation] | Uses Honeycomb and VAT to verify settings for VxLAN,\