Repository: cloudstack-cloudmonkey Updated Branches: refs/heads/master e0e53ba51 -> cea286ce6
requester: first try api key, next integration port, lastly username:password Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/8eacc30b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/8eacc30b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/8eacc30b Branch: refs/heads/master Commit: 8eacc30b6b2423864036d884618d95c5711777b3 Parents: e0e53ba Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Tue Aug 12 12:53:09 2014 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Tue Aug 12 12:53:09 2014 +0200 ---------------------------------------------------------------------- cloudmonkey/requester.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/8eacc30b/cloudmonkey/requester.py ---------------------------------------------------------------------- diff --git a/cloudmonkey/requester.py b/cloudmonkey/requester.py index ae8c927..2a34850 100644 --- a/cloudmonkey/requester.py +++ b/cloudmonkey/requester.py @@ -152,8 +152,9 @@ def make_request(command, args, logger, host, port, args["expires"] = expirationtime.strftime('%Y-%m-%dT%H:%M:%S+0000') # try to use the apikey/secretkey method by default - # if not present, use the username/password method - if not credentials['apikey']: + # followed by trying to check if we're using integration port + # finally use the username/password method + if not credentials['apikey'] and (long(port) != 8096): url = "%s://%s:%s%s" % (protocol, host, port, path) return make_request_with_password(command, args, logger, url, credentials)
