cmdlib: Adapt the rpc calls

[ganeti-local] / lib / cli.py

diff --git a/lib/cli.py b/lib/cli.py
index 256562e..e3ec55d 100644 (file)
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -50,6 +50,7 @@ from optparse import (OptionParser, TitledHelpFormatter,
 
 __all__ = [
   # Command line options
+  "ABSOLUTE_OPT",
   "ADD_UIDS_OPT",
   "ALLOCATABLE_OPT",
   "ALLOC_POLICY_OPT",
@@ -1381,6 +1382,11 @@ RUNTIME_MEM_OPT = cli_option("-m", "--runtime-memory", dest="runtime_mem",
                              " ballooning it up or down to the new value",
                              default=None, type="unit", metavar="<size>")
 
+ABSOLUTE_OPT = cli_option("--absolute", dest="absolute",
+                          action="store_true", default=False,
+                          help="Marks the grow as absolute instead of the"
+                          " (default) relative mode")
+
 #: Options provided by all commands
 COMMON_OPTS = [DEBUG_OPT]
 
@@ -2800,7 +2806,7 @@ def _WarnUnknownFields(fdefs):
 
 def GenericList(resource, fields, names, unit, separator, header, cl=None,
                 format_override=None, verbose=False, force_filter=False,
-                namefield=None):
+                namefield=None, qfilter=None):
   """Generic implementation for listing all items of a resource.
 
   @param resource: One of L{constants.QR_VIA_LUXI}
@@ -2826,12 +2832,19 @@ def GenericList(resource, fields, names, unit, separator, header, cl=None,
   @type namefield: string
   @param namefield: Name of field to use for simple filters (see
     L{qlang.MakeFilter} for details)
+  @type qfilter: list or None
+  @param qfilter: Query filter (in addition to names)
 
   """
   if not names:
     names = None
 
-  qfilter = qlang.MakeFilter(names, force_filter, namefield=namefield)
+  namefilter = qlang.MakeFilter(names, force_filter, namefield=namefield)
+
+  if qfilter is None:
+    qfilter = namefilter
+  elif namefilter is not None:
+    qfilter = [qlang.OP_AND, namefilter, qfilter]
 
   if cl is None:
     cl = GetClient()