Updated Branches: refs/heads/4.3 61386f406 -> aeb5ec07c
Fixed a connection issue under asyncmgr. Fixed a connection issue under asyncmgr. Added __init__.py files to directory to make it a package.This file was missing under few directories and so not appearing as packages while refactoring. Adding one None Check Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aeb5ec07 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aeb5ec07 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aeb5ec07 Branch: refs/heads/4.3 Commit: aeb5ec07c68a4f1116496ffd54e993e48b5c9f0d Parents: 61386f4 Author: Santhosh Edukulla <santhosh.eduku...@citrix.com> Authored: Mon Nov 11 16:55:09 2013 +0530 Committer: Girish Shilamkar <gir...@clogeny.com> Committed: Mon Nov 11 16:59:59 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/asyncJobMgr.py | 2 +- tools/marvin/marvin/cloudstackConnection.py | 2 ++ tools/marvin/marvin/sandbox/demo/__init__.py | 17 +++++++++++++++++ tools/marvin/marvin/sandbox/demo/live/__init__.py | 17 +++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aeb5ec07/tools/marvin/marvin/asyncJobMgr.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/asyncJobMgr.py b/tools/marvin/marvin/asyncJobMgr.py index 0d7939c..e24170e 100644 --- a/tools/marvin/marvin/asyncJobMgr.py +++ b/tools/marvin/marvin/asyncJobMgr.py @@ -88,7 +88,7 @@ class workThread(threading.Thread): time.mktime(jobstatus.endTime.timetuple()) - time.mktime( jobstatus.startTime.timetuple()) else: - result = self.connection.marvin_request(cmd) + result = self.connection.marvinRequest(cmd) if result is None: jobstatus.status = False else: http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aeb5ec07/tools/marvin/marvin/cloudstackConnection.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py index 2c027c3..75af874 100644 --- a/tools/marvin/marvin/cloudstackConnection.py +++ b/tools/marvin/marvin/cloudstackConnection.py @@ -272,6 +272,8 @@ class cloudConnection(object): self.auth, payload=payload, method=method) + if response is None: + return None self.logging.debug("Request: %s Response: %s" % (response.url, response.text)) try: http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aeb5ec07/tools/marvin/marvin/sandbox/demo/__init__.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/sandbox/demo/__init__.py b/tools/marvin/marvin/sandbox/demo/__init__.py new file mode 100644 index 0000000..00ae6c0 --- /dev/null +++ b/tools/marvin/marvin/sandbox/demo/__init__.py @@ -0,0 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aeb5ec07/tools/marvin/marvin/sandbox/demo/live/__init__.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/sandbox/demo/live/__init__.py b/tools/marvin/marvin/sandbox/demo/live/__init__.py new file mode 100644 index 0000000..00ae6c0 --- /dev/null +++ b/tools/marvin/marvin/sandbox/demo/live/__init__.py @@ -0,0 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +
