A couple of small fixes to iallocator

[ganeti-local] / scripts / gnt-debug

diff --git a/scripts/gnt-debug b/scripts/gnt-debug
old mode 100644 (file)
new mode 100755 (executable)
index e570099..ff7e01b
--- a/scripts/gnt-debug
+++ b/scripts/gnt-debug
@@ -19,15 +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
@@ -36,15 +40,91 @@ 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)
+
+  return 0
+
+
+def GenericOpCodes(opts, args):
+  """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]
+  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.
+
+  @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:
+    ToStderr("Invalid disks parameter '%s': %s", opts.disks, err)
+    return 1
+
+  nics = [val.split("/") for val in opts.nics.split(",")]
+  for row in nics:
+    while len(row) < 3:
+      row.append(None)
+    for i in range(3):
+      if row[i] == '':
+        row[i] = None
+  nic_dict = [{"mac": v[0], "ip": v[1], "bridge": v[2]} for v in nics]
+
+  if opts.tags is None:
+    opts.tags = []
+  else:
+    opts.tags = opts.tags.split(",")
 
-  job = opcodes.Job(op_list=[op])
-  jid = SubmitJob(job)
-  print "Job id", jid
+  op = opcodes.OpTestAllocator(mode=opts.mode,
+                               name=args[0],
+                               mem_size=opts.mem,
+                               disks=disks,
+                               disk_template=opts.disk_template,
+                               nics=nic_dict,
+                               os=opts.os_type,
+                               vcpus=opts.vcpus,
+                               tags=opts.tags,
+                               direction=opts.direction,
+                               allocator=opts.allocator,
+                               )
+  result = SubmitOpCode(op)
+  ToStdout("%s" % result)
   return 0
 
 
@@ -59,6 +139,42 @@ commands = {
                          help="Select nodes to sleep on"),
              ],
             "[opts...] <duration>", "Executes a TestDelay OpCode"),
+  'submit-job': (GenericOpCodes, ARGS_ONE,
+                 [DEBUG_OPT,
+                  ],
+                 "<op_list_file>", "Submits a job built from a json-file"
+                 " with a list of serialized opcodes"),
+  'allocator': (TestAllocator, ARGS_ONE,
+                [DEBUG_OPT,
+                 make_option("--dir", dest="direction",
+                             default="in", choices=["in", "out"],
+                             help="Show allocator input (in) or allocator"
+                             " results (out)"),
+                 make_option("--algorithm", dest="allocator",
+                             default=None,
+                             help="Allocator algorithm name"),
+                 make_option("-m", "--mode", default="relocate",
+                             choices=["relocate", "allocate"],
+                             help="Request mode, either allocate or"
+                             " relocate"),
+                 cli_option("--mem", default=128, type="unit",
+                            help="Memory size for the instance (MiB)"),
+                 make_option("--disks", default="4096,4096",
+                             help="Comma separated list of disk sizes (MiB)"),
+                 make_option("-t", "--disk-template", default="drbd",
+                             help="Select the disk template"),
+                 make_option("--nics", default="00:11:22:33:44:55",
+                             help="Comma separated list of nics, each nic"
+                             " definition is of form mac/ip/bridge, if"
+                             " missing values are replace by None"),
+                 make_option("-o", "--os-type", default=None,
+                             help="Select os for the instance"),
+                 make_option("-p", "--vcpus", default=1, type="int",
+                             help="Select number of VCPUs for the instance"),
+                 make_option("--tags", default=None,
+                             help="Comma separated list of tags"),
+                 ],
+                "{opts...} <instance>", "Executes a TestAllocator OpCode"),
   }