Revision 3c286190 lib/query.py
| b/lib/query.py | ||
|---|---|---|
| 1343 | 1343 |
# Add simple fields |
| 1344 | 1344 |
fields.extend([ |
| 1345 | 1345 |
(_MakeField(name, title, kind, doc), NQ_CONFIG, flags, _GetItemAttr(name)) |
| 1346 |
for (name, (title, kind, flags, doc)) in _NODE_SIMPLE_FIELDS.items() |
|
| 1347 |
]) |
|
| 1346 |
for (name, (title, kind, flags, doc)) in _NODE_SIMPLE_FIELDS.items()]) |
|
| 1348 | 1347 |
|
| 1349 | 1348 |
# Add fields requiring live data |
| 1350 | 1349 |
fields.extend([ |
| 1351 | 1350 |
(_MakeField(name, title, kind, doc), NQ_LIVE, 0, |
| 1352 | 1351 |
compat.partial(_GetLiveNodeField, nfield, kind)) |
| 1353 |
for (name, (title, kind, nfield, doc)) in _NODE_LIVE_FIELDS.items() |
|
| 1354 |
]) |
|
| 1352 |
for (name, (title, kind, nfield, doc)) in _NODE_LIVE_FIELDS.items()]) |
|
| 1355 | 1353 |
|
| 1356 | 1354 |
# Add timestamps |
| 1357 | 1355 |
fields.extend(_GetItemTimestampFields(NQ_CONFIG)) |
| ... | ... | |
| 1772 | 1770 |
(_MakeField("disk.size/%s" % i, "Disk/%s" % i, QFT_UNIT,
|
| 1773 | 1771 |
"Disk size of %s disk" % utils.FormatOrdinal(i + 1)), |
| 1774 | 1772 |
IQ_CONFIG, 0, _GetInstDiskSize(i)) |
| 1775 |
for i in range(constants.MAX_DISKS) |
|
| 1776 |
]) |
|
| 1773 |
for i in range(constants.MAX_DISKS)]) |
|
| 1777 | 1774 |
|
| 1778 | 1775 |
return fields |
| 1779 | 1776 |
|
| ... | ... | |
| 1821 | 1818 |
_VTToQFT[kind], "The \"%s\" hypervisor parameter" % name), |
| 1822 | 1819 |
IQ_CONFIG, 0, _GetInstHvParam(name)) |
| 1823 | 1820 |
for name, kind in constants.HVS_PARAMETER_TYPES.items() |
| 1824 |
if name not in constants.HVC_GLOBALS |
|
| 1825 |
]) |
|
| 1821 |
if name not in constants.HVC_GLOBALS]) |
|
| 1826 | 1822 |
|
| 1827 | 1823 |
# BE params |
| 1828 | 1824 |
def _GetInstBeParam(name): |
| ... | ... | |
| 1833 | 1829 |
constants.BES_PARAMETER_TITLES.get(name, "be/%s" % name), |
| 1834 | 1830 |
_VTToQFT[kind], "The \"%s\" backend parameter" % name), |
| 1835 | 1831 |
IQ_CONFIG, 0, _GetInstBeParam(name)) |
| 1836 |
for name, kind in constants.BES_PARAMETER_TYPES.items() |
|
| 1837 |
]) |
|
| 1832 |
for name, kind in constants.BES_PARAMETER_TYPES.items()]) |
|
| 1838 | 1833 |
|
| 1839 | 1834 |
return fields |
| 1840 | 1835 |
|
| ... | ... | |
| 1937 | 1932 |
# Add simple fields |
| 1938 | 1933 |
fields.extend([ |
| 1939 | 1934 |
(_MakeField(name, title, kind, doc), IQ_CONFIG, flags, _GetItemAttr(name)) |
| 1940 |
for (name, (title, kind, flags, doc)) in _INST_SIMPLE_FIELDS.items() |
|
| 1941 |
]) |
|
| 1935 |
for (name, (title, kind, flags, doc)) in _INST_SIMPLE_FIELDS.items()]) |
|
| 1942 | 1936 |
|
| 1943 | 1937 |
# Fields requiring talking to the node |
| 1944 | 1938 |
fields.extend([ |
| ... | ... | |
| 2431 | 2425 |
fields.extend([ |
| 2432 | 2426 |
(_MakeField(name, title, kind, doc), CQ_CONFIG, flags, _GetItemAttr(name)) |
| 2433 | 2427 |
for (name, (title, kind, flags, doc)) in _CLUSTER_SIMPLE_FIELDS.items() |
| 2434 |
]) |
|
| 2428 |
],)
|
|
| 2435 | 2429 |
|
| 2436 | 2430 |
# Version fields |
| 2437 | 2431 |
fields.extend([ |
| 2438 | 2432 |
(_MakeField(name, title, kind, doc), None, 0, _StaticValue(value)) |
| 2439 |
for (name, (title, kind, value, doc)) in _CLUSTER_VERSION_FIELDS.items() |
|
| 2440 |
]) |
|
| 2433 |
for (name, (title, kind, value, doc)) in _CLUSTER_VERSION_FIELDS.items()]) |
|
| 2441 | 2434 |
|
| 2442 | 2435 |
# Add timestamps |
| 2443 | 2436 |
fields.extend(_GetItemTimestampFields(CQ_CONFIG)) |
| 2444 | 2437 |
|
| 2445 | 2438 |
return _PrepareFieldList(fields, [ |
| 2446 |
("name", "cluster_name"),
|
|
| 2447 |
]) |
|
| 2439 |
("name", "cluster_name")])
|
|
| 2448 | 2440 |
|
| 2449 | 2441 |
|
| 2450 | 2442 |
class NetworkQueryData: |
| ... | ... | |
| 2501 | 2493 |
"The external reservations"), |
| 2502 | 2494 |
} |
| 2503 | 2495 |
|
| 2496 |
|
|
| 2504 | 2497 |
def _GetNetworkStatsField(field, kind, ctx): |
| 2505 | 2498 |
"""Gets the value of a "stats" field from L{NetworkQueryData}.
|
| 2506 | 2499 |
|
| ... | ... | |
| 2542 | 2535 |
fields.extend([ |
| 2543 | 2536 |
(_MakeField(name, title, kind, doc), |
| 2544 | 2537 |
NETQ_CONFIG, 0, _GetItemAttr(name)) |
| 2545 |
for (name, (title, kind, _, doc)) in _NETWORK_SIMPLE_FIELDS.items() |
|
| 2546 |
]) |
|
| 2538 |
for (name, (title, kind, _, doc)) in _NETWORK_SIMPLE_FIELDS.items()]) |
|
| 2547 | 2539 |
|
| 2548 | 2540 |
def _GetLength(getter): |
| 2549 | 2541 |
return lambda ctx, network: len(getter(ctx)[network.uuid]) |
| ... | ... | |
| 2558 | 2550 |
fields.extend([ |
| 2559 | 2551 |
(_MakeField("group_cnt", "NodeGroups", QFT_NUMBER, "Number of nodegroups"),
|
| 2560 | 2552 |
NETQ_GROUP, 0, _GetLength(network_to_groups)), |
| 2561 |
(_MakeField("group_list", "GroupList", QFT_OTHER, "List of nodegroups"),
|
|
| 2553 |
(_MakeField("group_list", "GroupList", QFT_OTHER, "List of nodegroups"),
|
|
| 2562 | 2554 |
NETQ_GROUP, 0, _GetSortedList(network_to_groups)), |
| 2563 | 2555 |
]) |
| 2564 | 2556 |
|
| ... | ... | |
| 2574 | 2566 |
fields.extend([ |
| 2575 | 2567 |
(_MakeField(name, title, kind, doc), NETQ_STATS, 0, |
| 2576 | 2568 |
compat.partial(_GetNetworkStatsField, name, kind)) |
| 2577 |
for (name, (title, kind, _, doc)) in _NETWORK_STATS_FIELDS.items() |
|
| 2578 |
]) |
|
| 2569 |
for (name, (title, kind, _, doc)) in _NETWORK_STATS_FIELDS.items()]) |
|
| 2579 | 2570 |
|
| 2580 | 2571 |
return _PrepareFieldList(fields, []) |
| 2581 | 2572 |
|
Also available in: Unified diff