Revision ceab32dd lib/cli.py

b/lib/cli.py
34 34
from ganeti import mcpu
35 35
from ganeti import constants
36 36
from ganeti import opcodes
37
from ganeti import luxi
37 38

  
38 39
from optparse import (OptionParser, make_option, TitledHelpFormatter,
39 40
                      Option, OptionValueError, SUPPRESS_HELP)
40 41

  
41
__all__ = ["DEBUG_OPT", "NOHDR_OPT", "SEP_OPT", "GenericMain", "SubmitOpCode",
42
__all__ = ["DEBUG_OPT", "NOHDR_OPT", "SEP_OPT", "GenericMain",
43
           "SubmitOpCode", "SubmitJob", "SubmitQuery",
42 44
           "cli_option", "GenerateTable", "AskUser",
43 45
           "ARGS_NONE", "ARGS_FIXED", "ARGS_ATLEAST", "ARGS_ANY", "ARGS_ONE",
44 46
           "USEUNITS_OPT", "FIELDS_OPT", "FORCE_OPT",
......
386 388
  return proc.ExecOpCode(op)
387 389

  
388 390

  
391
def SubmitJob(job, cl=None):
392
  if cl is None:
393
    cl = luxi.Client()
394
  jid = cl.SubmitJob(job)
395
  return jid
396

  
397

  
398
def SubmitQuery(data, cl=None):
399
  if cl is None:
400
    cl = luxi.Client()
401
  result = cl.Query(data)
402
  if not result['success']:
403
    raise ValueError(result)
404
  return result['result']
405

  
406

  
389 407
def FormatError(err):
390 408
  """Return a formatted error message for a given error.
391 409

  

Also available in: Unified diff