cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject git commit: updated refs/heads/master to e498bf0
Date Wed, 11 Dec 2013 14:10:15 GMT
Updated Branches:
  refs/heads/master 2b1d99772 -> e498bf00d


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/e498bf00
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e498bf00
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e498bf00

Branch: refs/heads/master
Commit: e498bf00d4c4b781faebabfcd6d0f594f06240d9
Parents: 2b1d997
Author: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Authored: Wed Dec 11 19:37:29 2013 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Wed Dec 11 19:37:29 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/e498bf00/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/e498bf00/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/e498bf00/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"""


Mime
View raw message