Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 43E0510F17 for ; Fri, 11 Oct 2013 01:01:30 +0000 (UTC) Received: (qmail 1531 invoked by uid 500); 11 Oct 2013 01:01:08 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 1385 invoked by uid 500); 11 Oct 2013 01:01:08 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 319 invoked by uid 99); 11 Oct 2013 01:01:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Oct 2013 01:01:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 533FD914DD7; Fri, 11 Oct 2013 01:01:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Date: Fri, 11 Oct 2013 01:02:04 -0000 Message-Id: In-Reply-To: <11ff256d26b645d7860bb642f44d76a4@git.apache.org> References: <11ff256d26b645d7860bb642f44d76a4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [61/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a pep8: fix regression from 10938612cc9f518e254f8756581548eeb52913b4 Signed-off-by: Prasanna Santhanam 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/pluggable_vm_snapshot Commit: 52c2bc0baf69c31ef54617e391e5badf85db53e9 Parents: bb74937 Author: Prasanna Santhanam Authored: Thu Oct 10 17:47:33 2013 +0530 Committer: Prasanna Santhanam 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))