A couple of small fixes to iallocator

[ganeti-local] / scripts / gnt-debug

diff --git a/scripts/gnt-debug b/scripts/gnt-debug
index 6db5af4..ff7e01b 100755 (executable)
--- a/scripts/gnt-debug
+++ b/scripts/gnt-debug
@@ -19,18 +19,19 @@
 # 02110-1301, USA.
 
 
+# pylint: disable-msg=W0401,W0614
+# W0401: Wildcard import ganeti.cli
+# W0614: Unused import %s from wildcard import (since we need cli)
+
 import sys
-import os
-import itertools
 import simplejson
 import time
 
 from optparse import make_option
-from cStringIO import StringIO
 
 from ganeti.cli import *
+from ganeti import cli
 from ganeti import opcodes
-from ganeti import logger
 from ganeti import constants
 from ganeti import utils
 from ganeti import errors
@@ -39,72 +40,61 @@ from ganeti import errors
 def Delay(opts, args):
   """Sleeps for a while
 
+  @param opts: the command line options selected by the user
+  @type args: list
+  @param args: should contain only one element, the duration
+      the sleep
+  @rtype: int
+  @return: the desired exit code
+
   """
   delay = float(args[0])
   op = opcodes.OpTestDelay(duration=delay,
                            on_master=opts.on_master,
                            on_nodes=opts.on_nodes)
+  SubmitOpCode(op)
 
-  job = opcodes.Job(op_list=[op])
-  jid = SubmitJob(job)
-  print "Job id", jid
   return 0
 
 
 def GenericOpCodes(opts, args):
-  """Send any opcode to the master
+  """Send any opcode to the master.
+
+  @todo: The function is broken and needs to be converted to the
+      current job queue API
+  @param opts: the command line options selected by the user
+  @type args: list
+  @param args: should contain only one element, the path of
+      the file with the opcode definition
+  @rtype: int
+  @return: the desired exit code
 
   """
+  cl = cli.GetClient()
   fname = args[0]
   op_data = simplejson.loads(open(fname).read())
   op_list = [opcodes.OpCode.LoadOpCode(val) for val in op_data]
-  job = opcodes.Job(op_list=op_list)
-  jid = SubmitJob(job)
-  print "Job id:", jid
-  query = {
-    "object": "jobs",
-    "fields": ["status"],
-    "names": [jid],
-    }
-
-  # wait for job to complete (either by success or failure)
-  while True:
-    jdata = SubmitQuery(query)
-    if not jdata:
-      # job not found, gone away!
-      print "Job lost!"
-      return 1
-
-    status = jdata[0][0]
-    print status
-    if status in (opcodes.Job.STATUS_SUCCESS, opcodes.Job.STATUS_FAIL):
-      break
-
-    # sleep between checks
-    time.sleep(0.5)
-
-  # job has finished, get and process its results
-  query["fields"].extend(["op_list", "op_status", "op_result"])
-  jdata = SubmitQuery(query)
-  if not jdata:
-    # job not found, gone away!
-    print "Job lost!"
-    return 1
-  print jdata[0]
-  status, op_list, op_status, op_result = jdata[0]
-  for idx, op in enumerate(op_list):
-    print idx, op.OP_ID, op_status[idx], op_result[idx]
+  jid = cli.SendJob(op_list, cl=cl)
+  ToStdout("Job id: %s", jid)
+  cli.PollJob(jid, cl=cl)
   return 0
 
 
 def TestAllocator(opts, args):
-  """Runs the test allocator opcode"""
+  """Runs the test allocator opcode.
+
+  @param opts: the command line options selected by the user
+  @type args: list
+  @param args: should contain only one element, the iallocator name
+  @rtype: int
+  @return: the desired exit code
 
+  """
   try:
     disks = [{"size": utils.ParseUnit(val), "mode": 'w'}
              for val in opts.disks.split(",")]
   except errors.UnitParseError, err:
-    print >> sys.stderr, "Invalid disks parameter '%s': %s" % (opts.disks, err)
+    ToStderr("Invalid disks parameter '%s': %s", opts.disks, err)
     return 1
 
   nics = [val.split("/") for val in opts.nics.split(",")]
@@ -134,7 +124,7 @@ def TestAllocator(opts, args):
                                allocator=opts.allocator,
                                )
   result = SubmitOpCode(op)
-  print result
+  ToStdout("%s" % result)
   return 0
 
 
@@ -148,11 +138,11 @@ commands = {
                          action="append",
                          help="Select nodes to sleep on"),
              ],
-            "Executes a TestDelay OpCode"),
+            "[opts...] <duration>", "Executes a TestDelay OpCode"),
   'submit-job': (GenericOpCodes, ARGS_ONE,
                  [DEBUG_OPT,
                   ],
-                 "Submits a job built from a json-file"
+                 "<op_list_file>", "Submits a job built from a json-file"
                  " with a list of serialized opcodes"),
   'allocator': (TestAllocator, ARGS_ONE,
                 [DEBUG_OPT,
@@ -166,7 +156,7 @@ commands = {
                  make_option("-m", "--mode", default="relocate",
                              choices=["relocate", "allocate"],
                              help="Request mode, either allocate or"
-                             "relocate"),
+                             " relocate"),
                  cli_option("--mem", default=128, type="unit",
                             help="Memory size for the instance (MiB)"),
                  make_option("--disks", default="4096,4096",
@@ -184,7 +174,7 @@ commands = {
                  make_option("--tags", default=None,
                              help="Comma separated list of tags"),
                  ],
-                "Executes a TestAllocator OpCode"),
+                "{opts...} <instance>", "Executes a TestAllocator OpCode"),
   }