X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ffunc%2Fhoneycomb%2F__init__.robot;fp=tests%2Ffunc%2Fhoneycomb%2F__init__.robot;h=9057cef9f84897ea138db26fa80132b0981ef1a0;hp=1b129d9c86ac49f328998f13d729d475281cc697;hb=4f4eaa1d52f3bdbe3caecdc1d6a024c369a2834a;hpb=8003aa2c3d1a0d4c1dbf3b6286d841a47b5fbb4c

diff --git a/tests/func/honeycomb/__init__.robot b/tests/func/honeycomb/__init__.robot
index 1b129d9c86..9057cef9f8 100644
--- a/tests/func/honeycomb/__init__.robot
+++ b/tests/func/honeycomb/__init__.robot
@@ -20,13 +20,22 @@
 | Resource | resources/libraries/robot/default.robot
 | Resource | resources/libraries/robot/honeycomb/honeycomb.robot
 | Suite Setup | Run Keywords | Setup All DUTs Before Test | AND
-| ... | Clear Persisted Honeycomb Configuration | ${node} | AND
-| ... | Copy Java Libraries | ${node} | AND
-| ... | Configure Unsecured Access | ${node} | AND
-| ... | Enable Module Features | ${node} | AND
-| ... | Configure Log Level | ${node} | TRACE | AND
-| ... | Setup Honeycomb Service On DUTs | ${node} | AND
+| ... | Configure Honeycomb for testing | ${node} | AND
 | ... | Set Global Variable | ${node}
-| Suite Teardown | Run keywords
-| ... | Stop Honeycomb Service On DUTs | ${node} | AND
+| Suite Teardown
 | ... | Archive Honeycomb log file | ${node}
+
+*** Keywords ***
+| Configure Honeycomb for testing
+| | [Arguments] | ${node}
+| | Copy Java Libraries | ${node}
+| | Configure Unsecured Access | ${node}
+| | Enable Module Features | ${node}
+| | Configure Log Level | ${node} | TRACE
+| | Configure Persistence | ${node} | disable
+| | Clear Persisted Honeycomb Configuration | ${node}
+| | Setup Honeycomb Service On DUTs | ${node}
+| | ${use_odl_client}= | Find ODL client on node | ${node}
+| | Set Global Variable | ${use_odl_client}
+| | Run Keyword If | ${use_odl_client}
+| | ... | Start ODL Client on node | ${node}