X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Fhoneycomb.robot;h=9017584f5af2d905274c29cfda1954b54b05524b;hp=603fbfa72f1176eca2cc290ce7438635618930c1;hb=4a946c16a4935e52b3e9039e4661813c256a8934;hpb=a8c974af22940a86ca54069f7eedb65172bd9de2

diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot
index 603fbfa72f..9017584f5a 100644
--- a/resources/libraries/robot/honeycomb/honeycomb.robot
+++ b/resources/libraries/robot/honeycomb/honeycomb.robot
@@ -213,9 +213,8 @@
 | | ${use_odl_client}= | Get Variable Value | ${HC_ODL}
 | | Run Keyword If | '${use_odl_client}' != '${NONE}'
 | | ... | Run Keywords
-| | ... | Stop ODL Client | ${node} | /tmp
-| | ... | ${use_odl_client}= | Set Variable | ${NONE}
-| | ... | Set Global Variable | ${use_odl_client}
+| | ... | Stop ODL Client | ${node} | /tmp | AND
+| | ... | Set Global Variable | ${use_odl_client} | ${NONE}
 | | Stop Honeycomb service on DUTs | ${node}
 
 | Enable Honeycomb Feature