Skip to content

Commit e498bf0

Browse files
Santhosh EdukullaGirish Shilamkar
authored andcommitted
CLOUDSTACK-5443: Fixed the issue.
1 parent 2b1d997 commit e498bf0

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

tools/marvin/marvin/cloudstackConnection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def __init__(self, mgmtDet, asyncTimeout=3600, logger=None,
6464
def __copy__(self):
6565
return cloudConnection(self.mgtDetails,
6666
self.asyncTimeout,
67-
self.logging,
67+
self.logger,
6868
self.path)
6969

7070
def poll(self, jobid, response):

tools/marvin/marvin/cloudstackTestClient.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@
3333
Server. Retrieved from configuration file.
3434
asyncTimeout :
3535
defaultWorkerThreads :
36-
logging :
36+
logger : provides logging facilities for this library
3737
'''
3838

3939

4040
class cloudstackTestClient(object):
4141
def __init__(self, mgmtDetails,
4242
dbSvrDetails, asyncTimeout=3600,
4343
defaultWorkerThreads=10,
44-
logging=None):
44+
logger=None):
4545
self.mgmtDetails = mgmtDetails
4646
self.connection = \
4747
cloudstackConnection.cloudConnection(self.mgmtDetails,
4848
asyncTimeout,
49-
logging)
49+
logger)
5050
self.apiClient =\
5151
cloudstackAPIClient.CloudStackAPIClient(self.connection)
5252
self.dbConnection = None
@@ -157,7 +157,7 @@ def createUserApiClient(self, UserName, DomainName, acctType=0):
157157
newUserConnection =\
158158
cloudstackConnection.cloudConnection(mgtDetails,
159159
self.connection.asyncTimeout,
160-
self.connection.logging)
160+
self.connection.logger)
161161
self.userApiClient =\
162162
cloudstackAPIClient.CloudStackAPIClient(newUserConnection)
163163
self.userApiClient.connection = newUserConnection

tools/marvin/marvin/deployDataCenter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ def loadCfg(self):
510510
cloudstackTestClient.\
511511
cloudstackTestClient(mgtDetails,
512512
dbSvrDetails,
513-
logging=self.tcRunLogger)
513+
logger=self.tcRunLogger)
514514

515515
if mgtDetails.apiKey is None:
516516
mgtDetails.apiKey, mgtDetails.securityKey = self.registerApiKey()
@@ -519,7 +519,7 @@ def loadCfg(self):
519519
cloudstackTestClient.cloudstackTestClient(
520520
mgtDetails,
521521
dbSvrDetails,
522-
logging=self.tcRunLogger)
522+
logger=self.tcRunLogger)
523523

524524
self.apiClient = self.testClient.getApiClient()
525525
"""set hypervisor"""

0 commit comments

Comments
 (0)