X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fhoneycomb%2FHoneycombSetup.py;h=796639e87973d3768145e2c3ec179648d5ae2bcf;hb=494c42cf77c2571a64854256a68abd7f180cd5d6;hp=45050747ee8e34a136701cddd9f280643f7fa6ac;hpb=68a4959b2f4b23ecf1c894c10a365fbdbb3dbf6a;p=csit.git

diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py
index 45050747ee..796639e879 100644
--- a/resources/libraries/python/honeycomb/HoneycombSetup.py
+++ b/resources/libraries/python/honeycomb/HoneycombSetup.py
@@ -22,7 +22,7 @@ from robot.api import logger
 
 from resources.libraries.python.HTTPRequest import HTTPRequest, HTTPCodes, \
     HTTPRequestError
-from resources.libraries.python.constants import Constants as Const
+from resources.libraries.python.Constants import Constants as Const
 from resources.libraries.python.honeycomb.HoneycombUtil import HoneycombError
 from resources.libraries.python.honeycomb.HoneycombUtil \
     import HoneycombUtil as HcUtil
@@ -503,15 +503,13 @@ class HoneycombSetup(object):
                         "in progress ...".format(node['host']))
 
     @staticmethod
-    def install_odl_features(node, odl_name, path, *features):
+    def install_odl_features(node, path, *features):
         """Install required features on a running ODL client.
 
         :param node: Honeycomb node.
-        :param odl_name: Name of ODL client version to use.
         :param path: Path to ODL client on node.
         :param features: Optional, list of additional features to install.
         :type node: dict
-        :type odl_name: str
         :type path: str
         :type features: list
         """
@@ -519,9 +517,7 @@ class HoneycombSetup(object):
         ssh = SSH()
         ssh.connect(node)
 
-        auth = "-u karaf"
-        if odl_name.lower() == "oxygen" or odl_name.lower() == "fluorine":
-            auth = "-u karaf -p karaf"
+        auth = "-u karaf -p karaf"
 
         cmd = "{path}/*karaf*/bin/client {auth} feature:install " \
               "odl-restconf-all " \