Updated Branches: refs/heads/master bb7493775 -> 52c2bc0ba
pep8: fix regression from 10938612cc9f518e254f8756581548eeb52913b4 Signed-off-by: Prasanna Santhanam <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52c2bc0b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52c2bc0b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52c2bc0b Branch: refs/heads/master Commit: 52c2bc0baf69c31ef54617e391e5badf85db53e9 Parents: bb74937 Author: Prasanna Santhanam <t...@apache.org> Authored: Thu Oct 10 17:47:33 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Thu Oct 10 17:47:52 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/cloudstackConnection.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52c2bc0b/tools/marvin/marvin/cloudstackConnection.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py index c5a4c67..686c533 100644 --- a/tools/marvin/marvin/cloudstackConnection.py +++ b/tools/marvin/marvin/cloudstackConnection.py @@ -32,8 +32,10 @@ from requests import RequestException class cloudConnection(object): + """ Connections to make API calls to the cloudstack management server """ + def __init__(self, mgtSvr, port=8096, user=None, passwd=None, apiKey=None, securityKey=None, asyncTimeout=3600, logging=None, scheme='http', @@ -144,9 +146,11 @@ class cloudConnection(object): try: if method == 'POST': - response = requests.post(self.baseurl, params=payload, verify=False) + response = requests.post( + self.baseurl, params=payload, verify=False) else: - response = requests.get(self.baseurl, params=payload, verify=False) + response = requests.get( + self.baseurl, params=payload, verify=False) except ConnectionError, c: self.logging.debug("Connection refused. Reason: %s : %s" % (self.baseurl, c))
