apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5443: Fixed the issue.

Browse Source
This commit is contained in:
Santhosh Edukulla 2013-12-11 19:37:29 +05:30 committed by Girish Shilamkar
parent 2b1d997728
commit e498bf00d4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/marvin/marvin/cloudstackConnection.py
View File

@ -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):

8
tools/marvin/marvin/cloudstackTestClient.py
View File

@ -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

4
tools/marvin/marvin/deployDataCenter.py
View File

@ -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"""