Some command line scripts fixes

[ganeti-local] / scripts / gnt-job

diff --git a/scripts/gnt-job b/scripts/gnt-job
index 39f0743..ce81709 100755 (executable)
--- a/scripts/gnt-job
+++ b/scripts/gnt-job
@@ -28,6 +28,7 @@ import sys
 from ganeti.cli import *
 from ganeti import constants
 from ganeti import errors
+from ganeti import utils
 
 
 #: default list of fields for L{ListJobs}
@@ -38,6 +39,7 @@ _LIST_DEF_FIELDS = ["id", "status", "summary"]
 _USER_JOB_STATUS = {
   constants.JOB_STATUS_QUEUED: "queued",
   constants.JOB_STATUS_WAITLOCK: "waiting",
+  constants.JOB_STATUS_CANCELING: "canceling",
   constants.JOB_STATUS_RUNNING: "running",
   constants.JOB_STATUS_CANCELED: "canceled",
   constants.JOB_STATUS_SUCCESS: "success",
@@ -62,7 +64,7 @@ def ListJobs(opts, args):
   else:
     selected_fields = opts.output.split(",")
 
-  output = GetClient().QueryJobs(None, selected_fields)
+  output = GetClient().QueryJobs(args, selected_fields)
   if not opts.no_headers:
     # TODO: Implement more fields
     headers = {
@@ -82,10 +84,6 @@ def ListJobs(opts, args):
   else:
     headers = None
 
-  # we don't have yet unitfields here
-  unitfields = None
-  numfields = None
-
   # change raw values to nicer strings
   for row in output:
     for idx, field in enumerate(selected_fields):
@@ -105,8 +103,7 @@ def ListJobs(opts, args):
       row[idx] = str(val)
 
   data = GenerateTable(separator=opts.separator, headers=headers,
-                       fields=selected_fields, unitfields=unitfields,
-                       numfields=numfields, data=output)
+                       fields=selected_fields, data=output)
   for line in data:
     ToStdout(line)
 
@@ -140,8 +137,8 @@ def AutoArchiveJobs(opts, args):
   @param opts: the command line options selected by the user
   @type args: list
   @param args: should contain only one element, the age as a time spec
-      that can be parsed by L{cli.ParseTimespec} or the keyword I{all},
-      which will cause all jobs to be archived
+      that can be parsed by L{ganeti.cli.ParseTimespec} or the
+      keyword I{all}, which will cause all jobs to be archived
   @rtype: int
   @return: the desired exit code
 
@@ -155,7 +152,9 @@ def AutoArchiveJobs(opts, args):
   else:
     age = ParseTimespec(age)
 
-  client.AutoArchiveJobs(age)
+  (archived_count, jobs_left) = client.AutoArchiveJobs(age)
+  ToStdout("Archived %s jobs, %s unchecked left", archived_count, jobs_left)
+
   return 0
 
 
@@ -172,8 +171,10 @@ def CancelJobs(opts, args):
   client = GetClient()
 
   for job_id in args:
-    client.CancelJob(job_id)
+    (success, msg) = client.CancelJob(job_id)
+    ToStdout(msg)
 
+  # TODO: Different exit value if not all jobs were canceled?
   return 0
 
 
@@ -302,15 +303,16 @@ def ShowJobs(opts, args):
       format(3, "Execution log:")
       for serial, log_ts, log_type, log_msg in log:
         time_txt = FormatTimestamp(log_ts)
-        encoded = str(log_msg).encode('string_escape')
+        encoded = utils.SafeEncode(log_msg)
         format(4, "%s:%s:%s %s" % (serial, time_txt, log_type, encoded))
   return 0
 
 
 commands = {
-  'list': (ListJobs, ARGS_NONE,
-            [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT],
-            "", "List the jobs and their status. The available fields are"
+  'list': (ListJobs, ARGS_ANY,
+            [DEBUG_OPT, NOHDR_OPT, SEP_OPT, FIELDS_OPT],
+            "[job_id ...]",
+           "List the jobs and their status. The available fields are"
            " (see the man page for details): id, status, op_list,"
            " op_status, op_result."
            " The default field"