From d0dd5b06400631a5c8e8327923f9fe37e3e37f62 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Tue, 9 Apr 2019 16:53:46 +0200 Subject: [PATCH 1/1] 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 --- resources/libraries/python/honeycomb/HoneycombSetup.py | 4 +--- 1 file changed, 1 insertion(+), 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 " \ -- 2.16.6