import textwrap
import os.path
import copy
+import time
from cStringIO import StringIO
from ganeti import utils
from ganeti import mcpu
from ganeti import constants
from ganeti import opcodes
+from ganeti import luxi
from optparse import (OptionParser, make_option, TitledHelpFormatter,
Option, OptionValueError, SUPPRESS_HELP)
-__all__ = ["DEBUG_OPT", "NOHDR_OPT", "SEP_OPT", "GenericMain", "SubmitOpCode",
+__all__ = ["DEBUG_OPT", "NOHDR_OPT", "SEP_OPT", "GenericMain",
+ "SubmitOpCode", "SubmitJob", "SubmitQuery",
"cli_option", "GenerateTable", "AskUser",
"ARGS_NONE", "ARGS_FIXED", "ARGS_ATLEAST", "ARGS_ANY", "ARGS_ONE",
"USEUNITS_OPT", "FIELDS_OPT", "FORCE_OPT",
help="Print sizes in human readable format")
FIELDS_OPT = make_option("-o", "--output", dest="output", action="store",
- type="string", help="Select output fields",
+ type="string", help="Comma separated list of"
+ " output fields",
metavar="FIELDS")
FORCE_OPT = make_option("-f", "--force", dest="force", action="store_true",
default=False, help="Force the operation")
-_LOCK_OPT = make_option("--lock-retries", default=None,
- type="int", help=SUPPRESS_HELP)
-
TAG_SRC_OPT = make_option("--from", dest="tags_source",
default=None, help="File with tag names")
cli_option = CliOption
-def _ParseArgs(argv, commands):
+def _ParseArgs(argv, commands, aliases):
"""Parses the command line and return the function which must be
executed together with its arguments
commands: dictionary with special contents, see the design doc for
cmdline handling
+ aliases: dictionary with command aliases {'alias': 'target, ...}
"""
if len(argv) == 0:
# argument. optparse.py does it the same.
sys.exit(0)
- if len(argv) < 2 or argv[1] not in commands.keys():
+ if len(argv) < 2 or not (argv[1] in commands or
+ argv[1] in aliases):
# let's do a nice thing
sortedcmds = commands.keys()
sortedcmds.sort()
"\n%(bin)s <command> --help to see details, or"
" man %(bin)s\n" % {"bin": binary})
# compute the max line length for cmd + usage
- mlen = max([len(" %s %s" % (cmd, commands[cmd][3])) for cmd in commands])
+ mlen = max([len(" %s" % cmd) for cmd in commands])
mlen = min(60, mlen) # should not get here...
# and format a nice command list
print "Commands:"
for cmd in sortedcmds:
- cmdstr = " %s %s" % (cmd, commands[cmd][3])
+ cmdstr = " %s" % (cmd,)
help_text = commands[cmd][4]
help_lines = textwrap.wrap(help_text, 79-3-mlen)
- print "%-*s - %s" % (mlen, cmdstr,
- help_lines.pop(0))
+ print "%-*s - %s" % (mlen, cmdstr, help_lines.pop(0))
for line in help_lines:
print "%-*s %s" % (mlen, "", line)
print
return None, None, None
+
+ # get command, unalias it, and look it up in commands
cmd = argv.pop(1)
+ if cmd in aliases:
+ if cmd in commands:
+ raise errors.ProgrammerError("Alias '%s' overrides an existing"
+ " command" % cmd)
+
+ if aliases[cmd] not in commands:
+ raise errors.ProgrammerError("Alias '%s' maps to non-existing"
+ " command '%s'" % (cmd, aliases[cmd]))
+
+ cmd = aliases[cmd]
+
func, nargs, parser_opts, usage, description = commands[cmd]
- parser_opts.append(_LOCK_OPT)
parser = OptionParser(option_list=parser_opts,
description=description,
formatter=TitledHelpFormatter(),
interaction functions.
"""
- if feedback_fn is None:
- feedback_fn = logger.ToStdout
- if proc is None:
- proc = mcpu.Processor(feedback=feedback_fn)
- return proc.ExecOpCode(op)
+ # TODO: Fix feedback_fn situation.
+ cl = luxi.Client()
+ job = opcodes.Job(op_list=[op])
+ jid = SubmitJob(job)
+
+ query = {
+ "object": "jobs",
+ "fields": ["status"],
+ "names": [jid],
+ }
+
+ while True:
+ jdata = SubmitQuery(query)
+ if not jdata:
+ # job not found, go away!
+ raise errors.JobLost("Job with id %s lost" % jid)
+
+ status = jdata[0][0]
+ if status in (opcodes.Job.STATUS_SUCCESS, opcodes.Job.STATUS_FAIL):
+ break
+ time.sleep(1)
+
+ query["fields"].extend(["op_list", "op_status", "op_result"])
+ jdata = SubmitQuery(query)
+ if not jdata:
+ raise errors.JobLost("Job with id %s lost" % jid)
+ status, op_list, op_status, op_result = jdata[0]
+ if status != opcodes.Job.STATUS_SUCCESS:
+ raise errors.OpExecError(op_result[0])
+ return op_result[0]
+
+
+def SubmitJob(job, cl=None):
+ if cl is None:
+ cl = luxi.Client()
+ return cl.SubmitJob(job)
+
+
+def SubmitQuery(data, cl=None):
+ if cl is None:
+ cl = luxi.Client()
+ return cl.Query(data)
def FormatError(err):
return retcode, obuf.getvalue().rstrip('\n')
-def GenericMain(commands, override=None):
+def GenericMain(commands, override=None, aliases=None):
"""Generic main function for all the gnt-* commands.
Arguments:
- override: if not None, we expect a dictionary with keys that will
override command line options; this can be used to pass
options from the scripts to generic functions
+ - aliases: dictionary with command aliases {'alias': 'target, ...}
"""
# save the program name and the entire command line for later logging
binary = "<unknown program>"
old_cmdline = ""
- func, options, args = _ParseArgs(sys.argv, commands)
+ if aliases is None:
+ aliases = {}
+
+ func, options, args = _ParseArgs(sys.argv, commands, aliases)
if func is None: # parse error
return 1
for key, val in override.iteritems():
setattr(options, key, val)
- logger.SetupLogging(debug=options.debug, program=binary)
+ logger.SetupLogging(program=binary, debug=options.debug)
utils.debug = options.debug
- try:
- utils.Lock('cmd', max_retries=options.lock_retries, debug=options.debug)
- except errors.LockError, err:
- logger.ToStderr(str(err))
- return 1
- except KeyboardInterrupt:
- logger.ToStderr("Aborting.")
- return 1
if old_cmdline:
logger.Info("run with arguments '%s'" % old_cmdline)
logger.Info("run with no arguments")
try:
- try:
- result = func(options, args)
- except errors.GenericError, err:
- result, err_msg = FormatError(err)
- logger.ToStderr(err_msg)
- finally:
- utils.Unlock('cmd')
- utils.LockCleanup()
+ result = func(options, args)
+ except errors.GenericError, err:
+ result, err_msg = FormatError(err)
+ logger.ToStderr(err_msg)
return result