Revision 843094ad lib/cmdlib/node.py
| b/lib/cmdlib/node.py | ||
|---|---|---|
| 44 | 44 |
RedistributeAncillaryFiles, ExpandNodeUuidAndName, ShareAll, SupportsOob, \ |
| 45 | 45 |
CheckInstanceState, INSTANCE_DOWN, GetUpdatedParams, \ |
| 46 | 46 |
AdjustCandidatePool, CheckIAllocatorOrNode, LoadNodeEvacResult, \ |
| 47 |
GetWantedNodes, MapInstanceDisksToNodes, RunPostHook, \
|
|
| 47 |
GetWantedNodes, MapInstanceLvsToNodes, RunPostHook, \
|
|
| 48 | 48 |
FindFaultyInstanceDisks |
| 49 | 49 |
|
| 50 | 50 |
|
| ... | ... | |
| 1316 | 1316 |
volumes = self.rpc.call_node_volumes(node_uuids) |
| 1317 | 1317 |
|
| 1318 | 1318 |
ilist = self.cfg.GetAllInstancesInfo() |
| 1319 |
vol2inst = MapInstanceDisksToNodes(ilist.values())
|
|
| 1319 |
vol2inst = MapInstanceLvsToNodes(ilist.values())
|
|
| 1320 | 1320 |
|
| 1321 | 1321 |
output = [] |
| 1322 | 1322 |
for node_uuid in node_uuids: |
| ... | ... | |
| 1346 | 1346 |
elif field == "size": |
| 1347 | 1347 |
val = int(float(vol["size"])) |
| 1348 | 1348 |
elif field == "instance": |
| 1349 |
val = vol2inst.get((node_uuid, vol["vg"] + "/" + vol["name"]), "-") |
|
| 1349 |
inst = vol2inst.get((node_uuid, vol["vg"] + "/" + vol["name"]), |
|
| 1350 |
None) |
|
| 1351 |
if inst is not None: |
|
| 1352 |
val = inst.name |
|
| 1353 |
else: |
|
| 1354 |
val = "-" |
|
| 1350 | 1355 |
else: |
| 1351 | 1356 |
raise errors.ParameterError(field) |
| 1352 | 1357 |
node_output.append(str(val)) |
Also available in: Unified diff