aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'resources/libraries')
-rw-r--r--resources/libraries/python/honeycomb/HoneycombSetup.py12
-rw-r--r--resources/libraries/robot/honeycomb/honeycomb.robot2
2 files changed, 10 insertions, 4 deletions
diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py
index d4175b13e4..a8a4f0e292 100644
--- a/resources/libraries/python/honeycomb/HoneycombSetup.py
+++ b/resources/libraries/python/honeycomb/HoneycombSetup.py
@@ -499,13 +499,15 @@ class HoneycombSetup(object):
"in progress ...".format(node['host']))
@staticmethod
- def install_odl_features(node, path, *features):
+ def install_odl_features(node, odl_name, 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
"""
@@ -513,10 +515,14 @@ class HoneycombSetup(object):
ssh = SSH()
ssh.connect(node)
- cmd = "{path}/*karaf*/bin/client -u karaf feature:install " \
+ auth = "-u karaf"
+ if odl_name.lower() == "oxygen":
+ auth = "-u karaf -p karaf"
+
+ cmd = "{path}/*karaf*/bin/client {auth} feature:install " \
"odl-restconf-all " \
"odl-netconf-connector-all " \
- "odl-netconf-topology".format(path=path)
+ "odl-netconf-topology".format(path=path, auth=auth)
for feature in features:
cmd += " {0}".format(feature)
diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot
index 165dbc036b..88de12b84c 100644
--- a/resources/libraries/robot/honeycomb/honeycomb.robot
+++ b/resources/libraries/robot/honeycomb/honeycomb.robot
@@ -166,7 +166,7 @@
| | Copy ODL Client | ${node} | ${odl_name} | /mnt/common | /tmp
| | Setup ODL Client | ${node} | /tmp
| | Wait until keyword succeeds | 2min | 30sec
-| | ... | Install ODL Features | ${node} | /tmp
+| | ... | Install ODL Features | ${node} | ${odl_name} | /tmp
| | Wait until keyword succeeds | 4min | 15sec
| | ... | Mount Honeycomb on ODL | ${node}
| | Wait until keyword succeeds | 2min | 15sec