Revision 2e04d454 lib/query.py

b/lib/query.py
1348 1348
  if bool(ctx.live_data.get(inst.name)):
1349 1349
    if inst.name in ctx.wrongnode_inst:
1350 1350
      return constants.INSTST_WRONGNODE
1351
    elif inst.admin_state:
1351
    elif inst.admin_state == constants.ADMINST_UP:
1352 1352
      return constants.INSTST_RUNNING
1353 1353
    else:
1354 1354
      return constants.INSTST_ERRORUP
1355 1355

  
1356
  if inst.admin_state:
1356
  if inst.admin_state == constants.ADMINST_UP:
1357 1357
    return constants.INSTST_ERRORDOWN
1358
  elif inst.admin_state == constants.ADMINST_DOWN:
1359
    return constants.INSTST_ADMINDOWN
1358 1360

  
1359
  return constants.INSTST_ADMINDOWN
1361
  return constants.INSTST_ADMINOFFLINE
1360 1362

  
1361 1363

  
1362 1364
def _GetInstDiskSize(index):
......
1775 1777
     IQ_NODES, 0,
1776 1778
     lambda ctx, inst: map(compat.partial(_GetInstNodeGroup, ctx, None),
1777 1779
                           inst.secondary_nodes)),
1778
    (_MakeField("admin_state", "Autostart", QFT_BOOL,
1779
                "Desired state of instance (if set, the instance should be"
1780
                " up)"),
1780
    (_MakeField("admin_state", "InstanceState", QFT_TEXT,
1781
                "Desired state of instance"),
1781 1782
     IQ_CONFIG, 0, _GetItemAttr("admin_state")),
1782 1783
    (_MakeField("tags", "Tags", QFT_OTHER, "Tags"), IQ_CONFIG, 0,
1783 1784
     lambda ctx, inst: list(inst.GetTags())),
......
1808 1809
  status_values = (constants.INSTST_RUNNING, constants.INSTST_ADMINDOWN,
1809 1810
                   constants.INSTST_WRONGNODE, constants.INSTST_ERRORUP,
1810 1811
                   constants.INSTST_ERRORDOWN, constants.INSTST_NODEDOWN,
1811
                   constants.INSTST_NODEOFFLINE)
1812
                   constants.INSTST_NODEOFFLINE, constants.INSTST_ADMINOFFLINE)
1812 1813
  status_doc = ("Instance status; \"%s\" if instance is set to be running"
1813 1814
                " and actually is, \"%s\" if instance is stopped and"
1814 1815
                " is not running, \"%s\" if instance running, but not on its"
1815 1816
                " designated primary node, \"%s\" if instance should be"
1816 1817
                " stopped, but is actually running, \"%s\" if instance should"
1817 1818
                " run, but doesn't, \"%s\" if instance's primary node is down,"
1818
                " \"%s\" if instance's primary node is marked offline" %
1819
                status_values)
1819
                " \"%s\" if instance's primary node is marked offline,"
1820
                " \"%s\" if instance is offline and does not use dynamic"
1821
                " resources" % status_values)
1820 1822
  fields.append((_MakeField("status", "Status", QFT_TEXT, status_doc),
1821 1823
                 IQ_LIVE, 0, _GetInstStatus))
1822 1824
  assert set(status_values) == constants.INSTST_ALL, \

Also available in: Unified diff