gnt-node list: Query filter support

[ganeti-local] / lib / client / gnt_group.py

diff --git a/lib/client/gnt_group.py b/lib/client/gnt_group.py
index e0f2c42..9395875 100644 (file)
--- a/lib/client/gnt_group.py
+++ b/lib/client/gnt_group.py
@@ -1,7 +1,7 @@
 #
 #
 
-# Copyright (C) 2010 Google Inc.
+# Copyright (C) 2010, 2011 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -101,7 +101,7 @@ def ListGroups(opts, args):
 
   return GenericList(constants.QR_GROUP, desired_fields, args, None,
                      opts.separator, not opts.no_headers,
-                     format_override=fmtoverride)
+                     format_override=fmtoverride, verbose=opts.verbose)
 
 
 def ListGroupFields(opts, args):
@@ -121,7 +121,7 @@ def ListGroupFields(opts, args):
 def SetGroupParams(opts, args):
   """Modifies a node group's parameters.
 
-  @param opts: the command line options seletect by the user
+  @param opts: the command line options selected by the user
   @type args: list
   @param args: should contain only one element, the node group name
 
@@ -138,7 +138,7 @@ def SetGroupParams(opts, args):
     ToStderr("Please give at least one of the parameters.")
     return 1
 
-  op = opcodes.OpSetGroupParams(group_name=args[0], # pylint: disable-msg=W0142
+  op = opcodes.OpGroupSetParams(group_name=args[0], # pylint: disable-msg=W0142
                                 **all_changes)
   result = SubmitOrSend(op, opts)
 
@@ -175,8 +175,8 @@ def RenameGroup(opts, args):
   @return: the desired exit code
 
   """
-  old_name, new_name = args
-  op = opcodes.OpRenameGroup(old_name=old_name, new_name=new_name)
+  group_name, new_name = args
+  op = opcodes.OpGroupRename(group_name=group_name, new_name=new_name)
   SubmitOpCode(op, opts=opts)
 
 
@@ -189,7 +189,7 @@ commands = {
     "<group_name> <node>...", "Assign nodes to a group"),
   "list": (
     ListGroups, ARGS_MANY_GROUPS,
-    [NOHDR_OPT, SEP_OPT, FIELDS_OPT],
+    [NOHDR_OPT, SEP_OPT, FIELDS_OPT, VERBOSE_OPT],
     "[<group_name>...]",
     "Lists the node groups in the cluster. The available fields can be shown"
     " using the \"list-fields\" command (see the man page for details)."
@@ -203,11 +203,11 @@ commands = {
     "<group_name>", "Alters the parameters of a node group"),
   "remove": (
     RemoveGroup, ARGS_ONE_GROUP, [DRY_RUN_OPT],
-    "[--dry-run] <group_name>",
+    "[--dry-run] <group-name>",
     "Remove an (empty) node group from the cluster"),
   "rename": (
     RenameGroup, [ArgGroup(min=2, max=2)], [DRY_RUN_OPT],
-    "[--dry-run] <old_name> <new_name>", "Rename a node group"),
+    "[--dry-run] <group-name> <new-name>", "Rename a node group"),
 }