X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Fhoneycomb.robot;h=7813ee26bf41deac6f7a23b00954987717d80b9a;hp=c04bd23a57d374eaabf27582e6945e97ff80e927;hb=a114591eac9f52502048db886da2fb228c62254d;hpb=ce469c1a7d56c2be639e5cecde961c4ef6354fb5

diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot
index c04bd23a57..7813ee26bf 100644
--- a/resources/libraries/robot/honeycomb/honeycomb.robot
+++ b/resources/libraries/robot/honeycomb/honeycomb.robot
@@ -14,6 +14,7 @@
 *** Settings ***
 | Library | resources/libraries/python/honeycomb/HoneycombSetup.py
 | Library | resources/libraries/python/honeycomb/HoneycombUtil.py
+| Library | resources/libraries/python/honeycomb/HcPersistence.py
 
 *** Keywords ***
 | Setup Honeycomb service on DUTs
@@ -36,7 +37,7 @@
 | | ...
 | | [Arguments] | @{duts}
 | | Start honeycomb on DUTs | @{duts}
-| | Wait until keyword succeeds | 4min | 20sec
+| | Wait until keyword succeeds | 4min | 16sec
 | | ... | Check honeycomb startup state | @{duts}
 
 | Stop honeycomb service on DUTs
@@ -58,7 +59,7 @@
 | | ...
 | | [Arguments] | @{duts}
 | | Stop honeycomb on DUTs | @{duts}
-| | Wait until keyword succeeds | 2m | 10s
+| | Wait until keyword succeeds | 60sec | 16sec
 | | ... | Check honeycomb shutdown state | @{duts}
 
 | Clear persisted Honeycomb configuration
@@ -71,4 +72,62 @@
 | | ...
 | | ... | \| Clear persisted Honeycomb configuration \| ${nodes['DUT1']} \|
 | | [Arguments] | @{duts}
-| | Clear persisted Honeycomb config | @{duts}
\ No newline at end of file
+| | Clear persisted Honeycomb config | @{duts}
+
+| 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 Honeycomb and VPP and clear persisted configuration \
+| | ... | \| ${nodes['DUT1']} \|
+| | [Arguments] | ${node}
+| | Stop Honeycomb service on DUTs | ${node}
+| | Clear persisted Honeycomb configuration | ${node}
+| | Log | Persistence files cleared. | console=True
+| | Setup DUT | ${node}
+| | Setup Honeycomb service on DUTs | ${node}
+
+| Restart Honeycomb and VPP
+| | [Documentation] | Restarts Honeycomb service and wait until it starts up.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Restart Honeycomb and VPP \| ${nodes['DUT1']} \|
+| | [Arguments] | ${node}
+| | Restart Honeycomb and VPP on DUTs | ${node}
+| | Wait until keyword succeeds | 4min | 16sec
+| | ... | Check honeycomb startup state | ${node}
+
+| Archive Honeycomb log file
+| | [Documentation] | Copy honeycomb.log file from Honeycomb node\
+| | ... | to test executor.
+| | ... | *Arguments:*
+| | ... | - node - information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Archive Honeycomb log file \| ${nudes['DUT1']} \|
+| | [Arguments] | ${node}
+| | Archive Honeycomb log | ${node}
+
+| Find ODL client on node
+| | [Arguments] | ${node}
+| | ${odl_present}= | Find ODL Client | ${node}
+| | Return from keyword | ${odl_present}
+
+| Start ODL client on node
+| | [Arguments] | ${node}
+| | Start ODL client | ${node}
+| | Wait until keyword succeeds | 4min | 16sec
+| | ... | Mount Honeycomb on ODL | ${node}
+| | Wait until keyword succeeds | 2min | 16sec
+| | ... | Check ODL startup state | ${node}
+| | Wait until keyword succeeds | 2min | 16sec
+| | ... | Check honeycomb startup state | ${node}