X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Fhoneycomb.robot;h=1b08e3955f06cb77e77a9e0d64c07daed0eb7f39;hb=835cb6439afb359dc2ebef02355314c4bebde75e;hp=d0f9f0fbf6bba387708084caf8d9c56074a3b46f;hpb=912acb80b6607a6b904242a0ec695c874580bd02;p=csit.git

diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot
index d0f9f0fbf6..1b08e3955f 100644
--- a/resources/libraries/robot/honeycomb/honeycomb.robot
+++ b/resources/libraries/robot/honeycomb/honeycomb.robot
@@ -41,6 +41,7 @@
 | | Start honeycomb on DUTs | @{duts}
 | | Wait until keyword succeeds | 4min | 16sec
 | | ... | Check honeycomb startup state | @{duts}
+| | Sleep | 5s | Make sure all modules are loaded and ready.
 
 | Stop Honeycomb service on DUTs
 | | [Documentation] | *Cleanup environment after honeycomb testing.*
@@ -247,8 +248,11 @@
 | | Run Keyword If | '${use_odl_client}' != '${NONE}'
 | | ... | Run Keywords
 | | ... | Stop ODL Client | ${node} | /tmp | AND
+| | ... | Wait until keyword succeeds | 2min | 15sec
+| | ... | Check ODL shutdown state | ${node} | AND
 | | ... | Set Global Variable | ${use_odl_client} | ${NONE}
 | | Stop Honeycomb service on DUTs | ${node}
+| | Stop VPP Service on DUT | ${node}
 
 | Enable Honeycomb Feature
 | | [Documentation] | Enable the specified feature in Honeycomb configuration.
@@ -320,3 +324,4 @@
 | | [Arguments] | ${node}
 | | Log Honeycomb and VPP process distribution on cores | ${node}
 | | Stop Honeycomb service on DUTs | ${node}
+| | Stop VPP Service on DUT | ${node}