Revision f965260c lib/cmdlib.py

b/lib/cmdlib.py
10199 10199
    dev_sstatus = self._ComputeBlockdevStatus(snode, instance.name, dev)
10200 10200

  
10201 10201
    if dev.children:
10202
      dev_children = [self._ComputeDiskStatus(instance, snode, child)
10203
                      for child in dev.children]
10202
      dev_children = map(compat.partial(self._ComputeDiskStatus,
10203
                                        instance, snode),
10204
                         dev.children)
10204 10205
    else:
10205 10206
      dev_children = []
10206 10207

  
......
10223 10224
    cluster = self.cfg.GetClusterInfo()
10224 10225

  
10225 10226
    for instance in self.wanted_instances:
10226
      if not self.op.static:
10227
      pnode = self.cfg.GetNodeInfo(instance.primary_node)
10228

  
10229
      if self.op.static or pnode.offline:
10230
        remote_state = None
10231
        if pnode.offline:
10232
          self.LogWarning("Primary node %s is marked offline, returning static"
10233
                          " information only for instance %s" %
10234
                          (pnode.name, instance.name))
10235
      else:
10227 10236
        remote_info = self.rpc.call_instance_info(instance.primary_node,
10228 10237
                                                  instance.name,
10229 10238
                                                  instance.hypervisor)
......
10233 10242
          remote_state = "up"
10234 10243
        else:
10235 10244
          remote_state = "down"
10236
      else:
10237
        remote_state = None
10245

  
10238 10246
      if instance.admin_up:
10239 10247
        config_state = "up"
10240 10248
      else:
10241 10249
        config_state = "down"
10242 10250

  
10243
      disks = [self._ComputeDiskStatus(instance, None, device)
10244
               for device in instance.disks]
10251
      disks = map(compat.partial(self._ComputeDiskStatus, instance, None),
10252
                  instance.disks)
10245 10253

  
10246 10254
      result[instance.name] = {
10247 10255
        "name": instance.name,

Also available in: Unified diff