Revision d8052456 scripts/gnt-instance

b/scripts/gnt-instance
162 162

  
163 163
  """
164 164
  if opts.output is None:
165
    selected_fields = ["name", "os", "pnode", "admin_state",
166
                       "oper_state", "oper_ram"]
165
    selected_fields = ["name", "os", "pnode", "status", "oper_ram"]
167 166
  else:
168 167
    selected_fields = opts.output.split(",")
169 168

  
......
171 170
  output = SubmitOpCode(op)
172 171

  
173 172
  if not opts.no_headers:
174
    headers = {"name": "Instance", "os": "OS", "pnode": "Primary_node",
175
               "snodes": "Secondary_Nodes", "admin_state": "Autostart",
176
               "oper_state": "Status", "admin_ram": "Configured_memory",
177
               "oper_ram": "Memory", "disk_template": "Disk_template",
178
               "ip": "IP Address", "mac": "MAC Address",
179
               "bridge": "Bridge", "vcpus": "VCPUs",
180
               "sda_size": "Disk/0", "sdb_size": "Disk/1"}
173
    headers = {
174
      "name": "Instance", "os": "OS", "pnode": "Primary_node",
175
      "snodes": "Secondary_Nodes", "admin_state": "Autostart",
176
      "oper_state": "Running", "admin_ram": "Configured_memory",
177
      "oper_ram": "Memory", "disk_template": "Disk_template",
178
      "ip": "IP Address", "mac": "MAC Address",
179
      "bridge": "Bridge", "vcpus": "VCPUs",
180
      "sda_size": "Disk/0", "sdb_size": "Disk/1",
181
      "status": "Status",
182
      }
181 183
  else:
182 184
    headers = None
183 185

  
......
810 812
  'info': (ShowInstanceConfig, ARGS_ANY, [DEBUG_OPT], "[<instance>...]",
811 813
           "Show information on the specified instance"),
812 814
  'list': (ListInstances, ARGS_NONE,
813
           [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT],
814
           "", "Lists the instances and their status. The available fields"
815
           " are (see the man page for details): oper_state, oper_ram,"
815
           [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT], "",
816
           "Lists the instances and their status. The available fields are"
817
           " (see the man page for details): status, oper_state, oper_ram,"
816 818
           " name, os, pnode, snodes, admin_state, admin_ram, disk_template,"
817 819
           " ip, mac, bridge, sda_size, sdb_size, vcpus. The default field"
818
           " list is (in order): name, os, pnode, admin_state, oper_state,"
820
           " list is (in order): name, os, pnode, status,"
819 821
           " oper_ram."),
820 822
  'reinstall': (ReinstallInstance, ARGS_ONE, [DEBUG_OPT, FORCE_OPT, os_opt],
821 823
                "[-f] <instance>", "Reinstall the instance"),

Also available in: Unified diff