X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ffunc%2Fhoneycomb%2F__init__.robot;h=3f79a6a1f8f2b21962aa970406ea4b244ca96519;hp=a38d53a4645570c46d739e440175b1875379a64c;hb=53d69321e41aa6fd94abc16c7050314dc2e53f08;hpb=19c91adadd57bfc4e7514993b2a711a826d52e04

diff --git a/tests/func/honeycomb/__init__.robot b/tests/func/honeycomb/__init__.robot
index a38d53a464..3f79a6a1f8 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:
@@ -19,9 +19,31 @@
 | Library | resources/libraries/python/honeycomb/HcPersistence.py
 | 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
-| ... | Configure Unsecured Access | ${node} | AND
-| ... | Setup Honeycomb Service On DUTs | ${node} | AND
+| ...
+| Suite Setup | Run Keywords | Configure all DUTs before test | AND
+| ... | Configure Honeycomb for testing | ${node} | AND
+| ... | Configure ODL Client for testing | ${node} | AND
 | ... | Set Global Variable | ${node}
-| Suite Teardown | Stop Honeycomb Service On DUTs | ${node}
+| ...
+| 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}
+| | Configure 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
+| | ... | Configure ODL Client Service On DUT | ${node} | ${use_odl_client}
+| | ... | ELSE | Log | Variable HC_ODL is not present. Not using ODL.
+| | ... | level=INFO