From aebbb15a64b3f2b96fc7b89be229f82116bd710d Mon Sep 17 00:00:00 2001 From: Santhosh Edukulla Date: Mon, 11 Nov 2013 16:55:09 +0530 Subject: [PATCH] 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 --- tools/marvin/marvin/asyncJobMgr.py | 2 +- tools/marvin/marvin/cloudstackConnection.py | 2 ++ tools/marvin/marvin/sandbox/demo/__init__.py | 17 +++++++++++++++++ .../marvin/marvin/sandbox/demo/live/__init__.py | 17 +++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tools/marvin/marvin/sandbox/demo/__init__.py create mode 100644 tools/marvin/marvin/sandbox/demo/live/__init__.py diff --git a/tools/marvin/marvin/asyncJobMgr.py b/tools/marvin/marvin/asyncJobMgr.py index 0d7939ce845..e24170e18ff 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: diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py index 644cf3a091e..23f81fb48c2 100644 --- a/tools/marvin/marvin/cloudstackConnection.py +++ b/tools/marvin/marvin/cloudstackConnection.py @@ -271,6 +271,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: diff --git a/tools/marvin/marvin/sandbox/demo/__init__.py b/tools/marvin/marvin/sandbox/demo/__init__.py new file mode 100644 index 00000000000..00ae6c00d2e --- /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. + 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 00000000000..00ae6c00d2e --- /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. +