Skip to content

Commit 901d633

Browse files
Santhosh EdukullaSrikanteswaraRao Talluri
Santhosh Edukulla
authored and
SrikanteswaraRao Talluri
committed
Added few changes for CLOUDSTACK-6316
1. Added pep8 changes, delete dc flag. 2. Now, delete dc works only if flag is set under config. 3. SSH, retries and delay were altered to reduce the time for ssh connection Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com> Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
1 parent b2543ef commit 901d633

9 files changed

Lines changed: 604 additions & 570 deletions

File tree

‎tools/marvin/marvin/cloudstackConnection.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def __poll(self, jobid, response_cmd):
112112
timeout -= 5
113113
self.logger.debug("=== JobId:%s is Still Processing, "
114114
"Will TimeOut in:%s ====" % (str(jobid),
115-
str(timeout)))
115+
str(timeout)))
116116
end_time = time.time()
117117
tot_time = int(start_time - end_time)
118118
self.logger.debug(

‎tools/marvin/marvin/cloudstackTestClient.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ def submitCmdsAndWait(self, cmds, workers=1):
421421
'''
422422
if self.__asyncJobMgr is None:
423423
self.__asyncJobMgr = asyncJobMgr(self.__apiClient,
424-
self.__dbConnection)
424+
self.__dbConnection)
425425
return self.__asyncJobMgr.submitCmdsAndWait(cmds, workers)
426426

427427
def submitJob(self, job, ntimes=1, nums_threads=10, interval=1):
@@ -431,7 +431,7 @@ def submitJob(self, job, ntimes=1, nums_threads=10, interval=1):
431431
'''
432432
if self.__asyncJobMgr is None:
433433
self.__asyncJobMgr = asyncJobMgr(self.__apiClient,
434-
self.__dbConnection)
434+
self.__dbConnection)
435435
self.__asyncJobMgr.submitJobExecuteNtimes(job, ntimes,
436436
nums_threads,
437437
interval)
@@ -443,5 +443,5 @@ def submitJobs(self, jobs, nums_threads=10, interval=1):
443443
'''
444444
if self.__asyncJobMgr is None:
445445
self.__asyncJobMgr = asyncJobMgr(self.__apiClient,
446-
self.__dbConnection)
446+
self.__dbConnection)
447447
self.__asyncJobMgr.submitJobs(jobs, nums_threads, interval)

‎tools/marvin/marvin/codes.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@
6262
ISOLATED_NETWORK = "ISOLATED"
6363
SHARED_NETWORK = "SHARED"
6464
VPC_NETWORK = "VPC"
65-
ERROR_NO_HOST_FOR_MIGRATION = "Could not find suitable host for migration, please ensure setup has required no. of hosts"
65+
ERROR_NO_HOST_FOR_MIGRATION = \
66+
"Could not find suitable host for migration, " \
67+
"please ensure setup has required no. of hosts"
6668
NAT_RULE = "nat rule"
6769
STATIC_NAT_RULE = "static nat rule"
6870
UNKNOWN = "UNKNOWN"

0 commit comments

Comments
 (0)