Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
HC Tests: fix authentication for ODL Oxygen jobs
[csit.git]
/
resources
/
libraries
/
python
/
honeycomb
/
HoneycombSetup.py
diff --git
a/resources/libraries/python/honeycomb/HoneycombSetup.py
b/resources/libraries/python/honeycomb/HoneycombSetup.py
index
d4175b1
..
a8a4f0e
100644
(file)
--- 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
"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.
"""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
: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
"""
:type path: str
:type features: list
"""
@@
-513,10
+515,14
@@
class HoneycombSetup(object):
ssh = SSH()
ssh.connect(node)
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-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)
for feature in features:
cmd += " {0}".format(feature)