apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack

Browse Source
This commit is contained in:
Isaac Chiang 2013-06-16 23:07:10 +08:00
commit ae27d664f8
2 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/cli/cloudmonkey/config.py
View File

@ -18,7 +18,7 @@
# Use following rules for versioning: # Use following rules for versioning:
# <cloudstack version>-<cli increment, starts from 0> # <cloudstack version>-<cli increment, starts from 0>
__version__ = "4.1.0-0" __version__ = "4.2.0-0"
__description__ = "Command Line Interface for Apache CloudStack" __description__ = "Command Line Interface for Apache CloudStack"
__maintainer__ = "Rohit Yadav" __maintainer__ = "Rohit Yadav"
__maintaineremail__ = "bhaisaab@apache.org" __maintaineremail__ = "bhaisaab@apache.org"

47
tools/cli/cloudmonkey/requester.py
View File

@ -125,61 +125,36 @@ def monkeyrequest(command, args, isasync, asyncblock, logger, host, port,
command = "queryAsyncJobResult" command = "queryAsyncJobResult"
request = {'jobid': jobid} request = {'jobid': jobid}
timeout = int(timeout) timeout = int(timeout)
pollperiod = 3 pollperiod = 2
progress = 1 progress = 1
while timeout > 0: while timeout > 0:
print '\r' + '.' * progress, print '\r' + '.' * progress,
sys.stdout.flush() sys.stdout.flush()
progress += 1 time.sleep(pollperiod)
timeout = timeout - pollperiod timeout = timeout - pollperiod
progress += 1
logger_debug(logger, "Job %s to timeout in %ds" % (jobid, timeout)) logger_debug(logger, "Job %s to timeout in %ds" % (jobid, timeout))
sys.stdout.flush() response, error = make_request(command, request, logger,
if re.match("queryAsyncJobResult", command): host, port, apikey, secretkey,
time.sleep(pollperiod) protocol, path)
else: if error is not None:
response, error = monkeyrequest(command, request, isasync, return response, error
asyncblock, logger,
host, port, apikey, secretkey,
timeout, protocol, path)
response = process_json(response)
responsekeys = filter(lambda x: 'response' in x, response.keys()) responsekeys = filter(lambda x: 'response' in x, response.keys())
if len(responsekeys) < 1: if len(responsekeys) < 1:
time.sleep(pollperiod)
continue continue
result = response[responsekeys[0]] result = response[responsekeys[0]]
jobstatus = result['jobstatus'] jobstatus = result['jobstatus']
jobresultcode = result['jobresultcode']
try:
jobresult = result["jobresult"]
logger_debug(logger, "jobresult %s" % (jobresult))
sys.stdout.flush()
return response, None
except KeyError:
logger_debug(logger, "No jobresult yet %s" % (result))
sys.stdout.flush()
if jobresultcode != 0:
error = "Error: resultcode %d for jobid %s" % (jobresultcode,
jobid)
logger_debug(logger, "%s" % (error))
return response, error
else:
# if we get a valid respons resultcode give back results
response, error = monkeyrequest(command, request, isasync,
asyncblock, logger,
host, port, apikey, secretkey,
timeout, protocol, path)
logger_debug(logger, "Ok: %s" % (jobid))
return response, error
if jobstatus == 2: if jobstatus == 2:
jobresult = result["jobresult"]
error = "\rAsync job %s failed\nError %s, %s" % (jobid, error = "\rAsync job %s failed\nError %s, %s" % (jobid,
jobresult["errorcode"], jobresult["errortext"]) jobresult["errorcode"], jobresult["errortext"])
return response, error return response, error
elif jobstatus == 1: elif jobstatus == 1:
print '\r', print "\r" + " " * progress,
return response, error return response, error
else: else:
logger_debug(logger, "We should not arrive here!") logger_debug(logger, "We should not arrive here!")