You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2013/12/11 15:12:30 UTC
git commit: updated refs/heads/4.3 to c05d94a
Updated Branches:
refs/heads/4.3 3cd004c92 -> c05d94a51
CLOUDSTACK-5443: Fixed the issue.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c05d94a5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c05d94a5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c05d94a5
Branch: refs/heads/4.3
Commit: c05d94a51feeedfe91eeb32c4e0a0d5c83b7031b
Parents: 3cd004c
Author: Santhosh Edukulla <Sa...@citrix.com>
Authored: Wed Dec 11 19:37:29 2013 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Wed Dec 11 19:42:17 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/cloudstackConnection.py | 2 +-
tools/marvin/marvin/cloudstackTestClient.py | 8 ++++----
tools/marvin/marvin/deployDataCenter.py | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c05d94a5/tools/marvin/marvin/cloudstackConnection.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py
index 48a2d21..fb03e3b 100644
--- a/tools/marvin/marvin/cloudstackConnection.py
+++ b/tools/marvin/marvin/cloudstackConnection.py
@@ -64,7 +64,7 @@ class cloudConnection(object):
def __copy__(self):
return cloudConnection(self.mgtDetails,
self.asyncTimeout,
- self.logging,
+ self.logger,
self.path)
def poll(self, jobid, response):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c05d94a5/tools/marvin/marvin/cloudstackTestClient.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py
index 8a41fad..4ac510b 100644
--- a/tools/marvin/marvin/cloudstackTestClient.py
+++ b/tools/marvin/marvin/cloudstackTestClient.py
@@ -33,7 +33,7 @@ from marvin.integration.lib.utils import random_gen
Server. Retrieved from configuration file.
asyncTimeout :
defaultWorkerThreads :
- logging :
+ logger : provides logging facilities for this library
'''
@@ -41,12 +41,12 @@ class cloudstackTestClient(object):
def __init__(self, mgmtDetails,
dbSvrDetails, asyncTimeout=3600,
defaultWorkerThreads=10,
- logging=None):
+ logger=None):
self.mgmtDetails = mgmtDetails
self.connection = \
cloudstackConnection.cloudConnection(self.mgmtDetails,
asyncTimeout,
- logging)
+ logger)
self.apiClient =\
cloudstackAPIClient.CloudStackAPIClient(self.connection)
self.dbConnection = None
@@ -157,7 +157,7 @@ class cloudstackTestClient(object):
newUserConnection =\
cloudstackConnection.cloudConnection(mgtDetails,
self.connection.asyncTimeout,
- self.connection.logging)
+ self.connection.logger)
self.userApiClient =\
cloudstackAPIClient.CloudStackAPIClient(newUserConnection)
self.userApiClient.connection = newUserConnection
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c05d94a5/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index 0a175d9..c4f6e1e 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -510,7 +510,7 @@ class deployDataCenters(object):
cloudstackTestClient.\
cloudstackTestClient(mgtDetails,
dbSvrDetails,
- logging=self.tcRunLogger)
+ logger=self.tcRunLogger)
if mgtDetails.apiKey is None:
mgtDetails.apiKey, mgtDetails.securityKey = self.registerApiKey()
@@ -519,7 +519,7 @@ class deployDataCenters(object):
cloudstackTestClient.cloudstackTestClient(
mgtDetails,
dbSvrDetails,
- logging=self.tcRunLogger)
+ logger=self.tcRunLogger)
self.apiClient = self.testClient.getApiClient()
"""set hypervisor"""