X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ffunc%2Fhoneycomb%2F__init__.robot;h=7e9d07aad0ec5f19ad17566910e9e47a726ac60a;hp=1b129d9c86ac49f328998f13d729d475281cc697;hb=df228e1794d4a5a1c3028e1e214731b5f0450b99;hpb=c53c0cbad736e937a4a41bf13eff4c5d8b5dcb55

diff --git a/tests/func/honeycomb/__init__.robot b/tests/func/honeycomb/__init__.robot
index 1b129d9c86..7e9d07aad0 100644
--- a/tests/func/honeycomb/__init__.robot
+++ b/tests/func/honeycomb/__init__.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2017 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -20,13 +20,29 @@
 | 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
+| ... | Configure ODL Client 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}
+| | Configure Restconf binding address | ${node}
+| | Enable Module Features | ${node}
+| | Configure Log Level | ${node} | TRACE
+| | Configure Persistence | ${node} | disable
+| | Configure jVPP timeout | ${node} | ${14}
+| | Clear Persisted Honeycomb Configuration | ${node}
+| | Setup Honeycomb Service On DUTs | ${node}
+
+| Configure ODL Client for testing
+| | [Arguments] | ${node}
+| | ${use_odl_client}= | Get Variable Value | ${HC_ODL}
+| | Run Keyword If | '${use_odl_client}' != ${NONE}
+| | ... | Run Keywords
+| | ... | Set Global Variable | ${use_odl_client} | AND
+| | ... | Setup ODL Client Service On DUT | ${node} | ${use_odl_client}
+| | ... | ELSE | Log | Variable HC_ODL is not present. Not using ODL.
+| | ... | level=INFO