Revision 87e87959

b/lib/client/gnt_instance.py
219 219

  
220 220
  return GenericList(constants.QR_INSTANCE, selected_fields, args, opts.units,
221 221
                     opts.separator, not opts.no_headers,
222
                     format_override=fmtoverride, verbose=opts.verbose)
222
                     format_override=fmtoverride, verbose=opts.verbose,
223
                     force_filter=opts.force_filter)
223 224

  
224 225

  
225 226
def ListInstanceFields(opts, args):
......
1382 1383
    "Show information on the specified instance(s)"),
1383 1384
  'list': (
1384 1385
    ListInstances, ARGS_MANY_INSTANCES,
1385
    [NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT, VERBOSE_OPT],
1386
    [NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT, VERBOSE_OPT,
1387
     FORCE_FILTER_OPT],
1386 1388
    "[<instance>...]",
1387 1389
    "Lists the instances and their status. The available fields can be shown"
1388 1390
    " using the \"list-fields\" command (see the man page for details)."
b/man/gnt-instance.rst
625 625

  
626 626
| **list**
627 627
| [--no-headers] [--separator=*SEPARATOR*] [--units=*UNITS*] [-v]
628
| [-o *[+]FIELD,...*] [instance...]
628
| [-o *[+]FIELD,...*] [--filter] [instance...]
629 629

  
630 630
Shows the currently configured instances with memory usage, disk
631 631
usage, the node they are running on, and their run status.
......
664 664
clusters when you only want some data and it makes sense to specify
665 665
a reduced set of output fields.
666 666

  
667
The default output field list is: name, os, pnode, admin\_state,
668
oper\_state, oper\_ram.
667
If exactly one argument is given and it appears to be a query filter
668
(see **ganeti(7)**), the query result is filtered accordingly. For
669
ambiguous cases (e.g. a single field name as a filter) the ``--filter``
670
(``-F``) option forces the argument to be treated as a filter (e.g.
671
``gnt-instance list -F admin_state``).
672

  
673
The default output field list is: ``name``, ``os``, ``pnode``,
674
``admin_state``, ``oper_state``, ``oper_ram``.
669 675

  
670 676

  
671 677
LIST-FIELDS

Also available in: Unified diff