aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Cmarada <mcmarada@cisco.com>2019-04-09 16:53:46 +0200
committerPeter Mikus <pmikus@cisco.com>2019-04-10 06:33:53 +0000
commitd0dd5b06400631a5c8e8327923f9fe37e3e37f62 (patch)
tree4c2dd42180b880e455da0b669cab59a19769ad7c
parent374ea2f45d17f361aa612becba657ecaade0d0b5 (diff)
fix auth for newer ODL versions
Since oxygen we need to add also "-p karaf" argument when starting karaf and because we are not using older versions anymore we can remove the if condition and use new authentication by default. Change-Id: I458fa35b7f26222dd5562349e6859844bfb7d05f Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
-rw-r--r--resources/libraries/python/honeycomb/HoneycombSetup.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py
index b4617eb42a..b9c4c56802 100644
--- a/resources/libraries/python/honeycomb/HoneycombSetup.py
+++ b/resources/libraries/python/honeycomb/HoneycombSetup.py
@@ -519,9 +519,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 " \