X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/82599b3ef6d9c396a49d6131788c3c7b146292f5..61413377c7a1c624c4a5f2c2ec55dbc3d8691896:/lib/query.py diff --git a/lib/query.py b/lib/query.py index 99207c6..8d8b667 100644 --- a/lib/query.py +++ b/lib/query.py @@ -63,8 +63,8 @@ from ganeti import ht from ganeti.constants import (QFT_UNKNOWN, QFT_TEXT, QFT_BOOL, QFT_NUMBER, QFT_UNIT, QFT_TIMESTAMP, QFT_OTHER, - QRFS_NORMAL, QRFS_UNKNOWN, QRFS_NODATA, - QRFS_UNAVAIL, QRFS_OFFLINE) + RS_NORMAL, RS_UNKNOWN, RS_NODATA, + RS_UNAVAIL, RS_OFFLINE) # Constants for requesting data from the caller/data provider. Each property @@ -79,7 +79,8 @@ from ganeti.constants import (QFT_UNKNOWN, QFT_TEXT, QFT_BOOL, QFT_NUMBER, (IQ_CONFIG, IQ_LIVE, - IQ_DISKUSAGE) = range(100, 103) + IQ_DISKUSAGE, + IQ_CONSOLE) = range(100, 104) (LQ_MODE, LQ_OWNER, @@ -104,12 +105,28 @@ _VERIFY_FN = { QFT_OTHER: lambda _: True, } +# Unique objects for special field statuses +_FS_UNKNOWN = object() +_FS_NODATA = object() +_FS_UNAVAIL = object() +_FS_OFFLINE = object() + +#: VType to QFT mapping +_VTToQFT = { + # TODO: fix validation of empty strings + constants.VTYPE_STRING: QFT_OTHER, # since VTYPE_STRINGs can be empty + constants.VTYPE_MAYBE_STRING: QFT_OTHER, + constants.VTYPE_BOOL: QFT_BOOL, + constants.VTYPE_SIZE: QFT_UNIT, + constants.VTYPE_INT: QFT_NUMBER, + } + def _GetUnknownField(ctx, item): # pylint: disable-msg=W0613 """Gets the contents of an unknown field. """ - return (QRFS_UNKNOWN, None) + return _FS_UNKNOWN def _GetQueryFields(fielddefs, selected): @@ -196,15 +213,13 @@ class Query: support iteration using C{__iter__} """ - result = [[fn(ctx, item) for (_, _, fn) in self._fields] + result = [[_ProcessResult(fn(ctx, item)) for (_, _, fn) in self._fields] for item in ctx] # Verify result if __debug__: - for (idx, row) in enumerate(result): - assert _VerifyResultRow(self._fields, row), \ - ("Inconsistent result for fields %s in row %s: %r" % - (GetAllFields(self._fields), idx, row)) + for row in result: + _VerifyResultRow(self._fields, row) return result @@ -225,6 +240,22 @@ class Query: for row in self.Query(ctx)] +def _ProcessResult(value): + """Converts result values into externally-visible ones. + + """ + if value is _FS_UNKNOWN: + return (RS_UNKNOWN, None) + elif value is _FS_NODATA: + return (RS_NODATA, None) + elif value is _FS_UNAVAIL: + return (RS_UNAVAIL, None) + elif value is _FS_OFFLINE: + return (RS_OFFLINE, None) + else: + return (RS_NORMAL, value) + + def _VerifyResultRow(fields, row): """Verifies the contents of a query result row. @@ -234,21 +265,31 @@ def _VerifyResultRow(fields, row): @param row: Row data """ - return (len(row) == len(fields) and - compat.all((status == QRFS_NORMAL and _VERIFY_FN[fdef.kind](value)) or - # Value for an abnormal status must be None - (status != QRFS_NORMAL and value is None) - for ((status, value), (fdef, _, _)) in zip(row, fields))) - - -def _PrepareFieldList(fields): + assert len(row) == len(fields) + errs = [] + for ((status, value), (fdef, _, _)) in zip(row, fields): + if status == RS_NORMAL: + if not _VERIFY_FN[fdef.kind](value): + errs.append("normal field %s fails validation (value is %s)" % + (fdef.name, value)) + elif value is not None: + errs.append("abnormal field %s has a non-None value" % fdef.name) + assert not errs, ("Failed validation: %s in row %s" % + (utils.CommaJoin(errors), row)) + + +def _PrepareFieldList(fields, aliases): """Prepares field list for use by L{Query}. Converts the list to a dictionary and does some verification. - @type fields: list of tuples; (L{objects.QueryFieldDefinition}, data kind, - retrieval function) - @param fields: List of fields, see L{Query.__init__} for a better description + @type fields: list of tuples; (L{objects.QueryFieldDefinition}, data + kind, retrieval function) + @param fields: List of fields, see L{Query.__init__} for a better + description + @type aliases: list of tuples; (alias, target) + @param aliases: list of tuples containing aliases; for each + alias/target pair, a duplicate will be created in the field list @rtype: dict @return: Field dictionary for L{Query} @@ -272,7 +313,15 @@ def _PrepareFieldList(fields): result[fdef.name] = field - assert len(result) == len(fields) + for alias, target in aliases: + assert alias not in result, "Alias %s overrides an existing field" % alias + assert target in result, "Missing target %s for alias %s" % (target, alias) + (fdef, k, fn) = result[target] + fdef = fdef.Copy() + fdef.name = alias + result[alias] = (fdef, k, fn) + + assert len(result) == len(fields) + len(aliases) assert compat.all(name == fdef.name for (name, (fdef, _, _)) in result.items()) @@ -350,7 +399,7 @@ def _GetItemAttr(attr): """ getter = operator.attrgetter(attr) - return lambda _, item: (QRFS_NORMAL, getter(item)) + return lambda _, item: getter(item) def _GetItemTimestamp(getter): @@ -367,9 +416,9 @@ def _GetItemTimestamp(getter): timestamp = getter(item) if timestamp is None: # Old configs might not have all timestamps - return (QRFS_UNAVAIL, None) + return _FS_UNAVAIL else: - return (QRFS_NORMAL, timestamp) + return timestamp return fn @@ -468,7 +517,7 @@ def _GetGroup(cb): ng = ctx.groups.get(node.group, None) if ng is None: # Nodes always have a group, or the configuration is corrupt - return (QRFS_UNAVAIL, None) + return _FS_UNAVAIL return cb(ctx, node, ng) @@ -485,7 +534,7 @@ def _GetNodeGroup(ctx, node, ng): # pylint: disable-msg=W0613 @param ng: The node group this node belongs to """ - return (QRFS_NORMAL, ng.name) + return ng.name def _GetNodePower(ctx, node): @@ -497,9 +546,9 @@ def _GetNodePower(ctx, node): """ if ctx.oob_support[node.name]: - return (QRFS_NORMAL, node.powered) + return node.powered - return (QRFS_UNAVAIL, None) + return _FS_UNAVAIL def _GetNdParams(ctx, node, ng): @@ -512,7 +561,7 @@ def _GetNdParams(ctx, node, ng): @param ng: The node group this node belongs to """ - return (QRFS_NORMAL, ctx.cluster.SimpleFillND(ng.FillND(node))) + return ctx.cluster.SimpleFillND(ng.FillND(node)) def _GetLiveNodeField(field, kind, ctx, node): @@ -526,28 +575,28 @@ def _GetLiveNodeField(field, kind, ctx, node): """ if node.offline: - return (QRFS_OFFLINE, None) + return _FS_OFFLINE if not ctx.curlive_data: - return (QRFS_NODATA, None) + return _FS_NODATA try: value = ctx.curlive_data[field] except KeyError: - return (QRFS_UNAVAIL, None) + return _FS_UNAVAIL if kind == QFT_TEXT: - return (QRFS_NORMAL, value) + return value assert kind in (QFT_NUMBER, QFT_UNIT) # Try to convert into number try: - return (QRFS_NORMAL, int(value)) + return int(value) except (ValueError, TypeError): logging.exception("Failed to convert node field '%s' (value %r) to int", value, field) - return (QRFS_UNAVAIL, None) + return _FS_UNAVAIL def _BuildNodeFields(): @@ -556,31 +605,31 @@ def _BuildNodeFields(): """ fields = [ (_MakeField("pip", "PrimaryIP", QFT_TEXT), NQ_CONFIG, - lambda ctx, node: (QRFS_NORMAL, node.primary_ip)), + _GetItemAttr("primary_ip")), (_MakeField("sip", "SecondaryIP", QFT_TEXT), NQ_CONFIG, - lambda ctx, node: (QRFS_NORMAL, node.secondary_ip)), + _GetItemAttr("secondary_ip")), (_MakeField("tags", "Tags", QFT_OTHER), NQ_CONFIG, - lambda ctx, node: (QRFS_NORMAL, list(node.GetTags()))), + lambda ctx, node: list(node.GetTags())), (_MakeField("master", "IsMaster", QFT_BOOL), NQ_CONFIG, - lambda ctx, node: (QRFS_NORMAL, node.name == ctx.master_name)), + lambda ctx, node: node.name == ctx.master_name), (_MakeField("role", "Role", QFT_TEXT), NQ_CONFIG, - lambda ctx, node: (QRFS_NORMAL, _GetNodeRole(node, ctx.master_name))), + lambda ctx, node: _GetNodeRole(node, ctx.master_name)), (_MakeField("group", "Group", QFT_TEXT), NQ_GROUP, _GetGroup(_GetNodeGroup)), (_MakeField("group.uuid", "GroupUUID", QFT_TEXT), - NQ_CONFIG, lambda ctx, node: (QRFS_NORMAL, node.group)), + NQ_CONFIG, _GetItemAttr("group")), (_MakeField("powered", "Powered", QFT_BOOL), NQ_OOB, _GetNodePower), (_MakeField("ndparams", "NodeParameters", QFT_OTHER), NQ_GROUP, _GetGroup(_GetNdParams)), (_MakeField("custom_ndparams", "CustomNodeParameters", QFT_OTHER), - NQ_GROUP, lambda ctx, node: (QRFS_NORMAL, node.ndparams)), + NQ_GROUP, _GetItemAttr("ndparams")), ] def _GetLength(getter): - return lambda ctx, node: (QRFS_NORMAL, len(getter(ctx)[node.name])) + return lambda ctx, node: len(getter(ctx)[node.name]) def _GetList(getter): - return lambda ctx, node: (QRFS_NORMAL, list(getter(ctx)[node.name])) + return lambda ctx, node: list(getter(ctx)[node.name]) # Add fields operating on instance lists for prefix, titleprefix, getter in \ @@ -608,7 +657,7 @@ def _BuildNodeFields(): # Add timestamps fields.extend(_GetItemTimestampFields(NQ_CONFIG)) - return _PrepareFieldList(fields) + return _PrepareFieldList(fields, []) class InstanceQueryData: @@ -616,7 +665,7 @@ class InstanceQueryData: """ def __init__(self, instances, cluster, disk_usage, offline_nodes, bad_nodes, - live_data): + live_data, wrongnode_inst, console): """Initializes this class. @param instances: List of instance objects @@ -629,6 +678,10 @@ class InstanceQueryData: @param bad_nodes: List of faulty nodes @type live_data: dict; instance name as key @param live_data: Per-instance live data + @type wrongnode_inst: set + @param wrongnode_inst: Set of instances running on wrong node(s) + @type console: dict; instance name as key + @param console: Per-instance console information """ assert len(set(bad_nodes) & set(offline_nodes)) == len(offline_nodes), \ @@ -642,6 +695,8 @@ class InstanceQueryData: self.offline_nodes = offline_nodes self.bad_nodes = bad_nodes self.live_data = live_data + self.wrongnode_inst = wrongnode_inst + self.console = console # Used for individual rows self.inst_hvparams = None @@ -672,12 +727,12 @@ def _GetInstOperState(ctx, inst): @param inst: Instance object """ - # Can't use QRFS_OFFLINE here as it would describe the instance to be offline - # when we actually don't know due to missing data + # Can't use RS_OFFLINE here as it would describe the instance to + # be offline when we actually don't know due to missing data if inst.primary_node in ctx.bad_nodes: - return (QRFS_NODATA, None) + return _FS_NODATA else: - return (QRFS_NORMAL, bool(ctx.live_data.get(inst.name))) + return bool(ctx.live_data.get(inst.name)) def _GetInstLiveData(name): @@ -697,16 +752,16 @@ def _GetInstLiveData(name): """ if (inst.primary_node in ctx.bad_nodes or inst.primary_node in ctx.offline_nodes): - # Can't use QRFS_OFFLINE here as it would describe the instance to be + # Can't use RS_OFFLINE here as it would describe the instance to be # offline when we actually don't know due to missing data - return (QRFS_NODATA, None) + return _FS_NODATA if inst.name in ctx.live_data: data = ctx.live_data[inst.name] if name in data: - return (QRFS_NORMAL, data[name]) + return data[name] - return (QRFS_UNAVAIL, None) + return _FS_UNAVAIL return fn @@ -720,21 +775,23 @@ def _GetInstStatus(ctx, inst): """ if inst.primary_node in ctx.offline_nodes: - return (QRFS_NORMAL, "ERROR_nodeoffline") + return "ERROR_nodeoffline" if inst.primary_node in ctx.bad_nodes: - return (QRFS_NORMAL, "ERROR_nodedown") + return "ERROR_nodedown" if bool(ctx.live_data.get(inst.name)): - if inst.admin_up: - return (QRFS_NORMAL, "running") + if inst.name in ctx.wrongnode_inst: + return "ERROR_wrongnode" + elif inst.admin_up: + return "running" else: - return (QRFS_NORMAL, "ERROR_up") + return "ERROR_up" if inst.admin_up: - return (QRFS_NORMAL, "ERROR_down") + return "ERROR_down" - return (QRFS_NORMAL, "ADMIN_down") + return "ADMIN_down" def _GetInstDiskSize(index): @@ -752,9 +809,9 @@ def _GetInstDiskSize(index): """ try: - return (QRFS_NORMAL, inst.disks[index].size) + return inst.disks[index].size except IndexError: - return (QRFS_UNAVAIL, None) + return _FS_UNAVAIL return fn @@ -779,7 +836,7 @@ def _GetInstNic(index, cb): try: nic = inst.nics[index] except IndexError: - return (QRFS_UNAVAIL, None) + return _FS_UNAVAIL return cb(ctx, index, nic) @@ -795,9 +852,9 @@ def _GetInstNicIp(ctx, _, nic): # pylint: disable-msg=W0613 """ if nic.ip is None: - return (QRFS_UNAVAIL, None) + return _FS_UNAVAIL else: - return (QRFS_NORMAL, nic.ip) + return nic.ip def _GetInstNicBridge(ctx, index, _): @@ -813,9 +870,9 @@ def _GetInstNicBridge(ctx, index, _): nicparams = ctx.inst_nicparams[index] if nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED: - return (QRFS_NORMAL, nicparams[constants.NIC_LINK]) + return nicparams[constants.NIC_LINK] else: - return (QRFS_UNAVAIL, None) + return _FS_UNAVAIL def _GetInstAllNicBridges(ctx, inst): @@ -838,7 +895,7 @@ def _GetInstAllNicBridges(ctx, inst): assert len(result) == len(inst.nics) - return (QRFS_NORMAL, result) + return result def _GetInstNicParam(name): @@ -859,7 +916,7 @@ def _GetInstNicParam(name): """ assert len(ctx.inst_nicparams) >= index - return (QRFS_NORMAL, ctx.inst_nicparams[index][name]) + return ctx.inst_nicparams[index][name] return fn @@ -870,7 +927,7 @@ def _GetInstanceNetworkFields(): @return: List of field definitions used as input for L{_PrepareFieldList} """ - nic_mac_fn = lambda ctx, _, nic: (QRFS_NORMAL, nic.mac) + nic_mac_fn = lambda ctx, _, nic: nic.mac nic_mode_fn = _GetInstNicParam(constants.NIC_MODE) nic_link_fn = _GetInstNicParam(constants.NIC_LINK) @@ -889,17 +946,17 @@ def _GetInstanceNetworkFields(): # All NICs (_MakeField("nic.count", "NICs", QFT_NUMBER), IQ_CONFIG, - lambda ctx, inst: (QRFS_NORMAL, len(inst.nics))), + lambda ctx, inst: len(inst.nics)), (_MakeField("nic.macs", "NIC_MACs", QFT_OTHER), IQ_CONFIG, - lambda ctx, inst: (QRFS_NORMAL, [nic.mac for nic in inst.nics])), + lambda ctx, inst: [nic.mac for nic in inst.nics]), (_MakeField("nic.ips", "NIC_IPs", QFT_OTHER), IQ_CONFIG, - lambda ctx, inst: (QRFS_NORMAL, [nic.ip for nic in inst.nics])), + lambda ctx, inst: [nic.ip for nic in inst.nics]), (_MakeField("nic.modes", "NIC_modes", QFT_OTHER), IQ_CONFIG, - lambda ctx, inst: (QRFS_NORMAL, [nicp[constants.NIC_MODE] - for nicp in ctx.inst_nicparams])), + lambda ctx, inst: [nicp[constants.NIC_MODE] + for nicp in ctx.inst_nicparams]), (_MakeField("nic.links", "NIC_links", QFT_OTHER), IQ_CONFIG, - lambda ctx, inst: (QRFS_NORMAL, [nicp[constants.NIC_LINK] - for nicp in ctx.inst_nicparams])), + lambda ctx, inst: [nicp[constants.NIC_LINK] + for nicp in ctx.inst_nicparams]), (_MakeField("nic.bridges", "NIC_bridges", QFT_OTHER), IQ_CONFIG, _GetInstAllNicBridges), ] @@ -935,7 +992,23 @@ def _GetInstDiskUsage(ctx, inst): if usage is None: usage = 0 - return (QRFS_NORMAL, usage) + return usage + + +def _GetInstanceConsole(ctx, inst): + """Get console information for instance. + + @type ctx: L{InstanceQueryData} + @type inst: L{objects.Instance} + @param inst: Instance object + + """ + consinfo = ctx.console[inst.name] + + if consinfo is None: + return _FS_UNAVAIL + + return consinfo def _GetInstanceDiskFields(): @@ -947,14 +1020,10 @@ def _GetInstanceDiskFields(): fields = [ (_MakeField("disk_usage", "DiskUsage", QFT_UNIT), IQ_DISKUSAGE, _GetInstDiskUsage), - (_MakeField("sda_size", "LegacyDisk/0", QFT_UNIT), IQ_CONFIG, - _GetInstDiskSize(0)), - (_MakeField("sdb_size", "LegacyDisk/1", QFT_UNIT), IQ_CONFIG, - _GetInstDiskSize(1)), (_MakeField("disk.count", "Disks", QFT_NUMBER), IQ_CONFIG, - lambda ctx, inst: (QRFS_NORMAL, len(inst.disks))), + lambda ctx, inst: len(inst.disks)), (_MakeField("disk.sizes", "Disk_sizes", QFT_OTHER), IQ_CONFIG, - lambda ctx, inst: (QRFS_NORMAL, [disk.size for disk in inst.disks])), + lambda ctx, inst: [disk.size for disk in inst.disks]), ] # Disks by number @@ -976,8 +1045,8 @@ def _GetInstanceParameterFields(): # TODO: Consider moving titles closer to constants be_title = { constants.BE_AUTO_BALANCE: "Auto_balance", - constants.BE_MEMORY: "Configured_memory", - constants.BE_VCPUS: "VCPUs", + constants.BE_MEMORY: "ConfigMemory", + constants.BE_VCPUS: "ConfigVCPUs", } hv_title = { @@ -995,43 +1064,40 @@ def _GetInstanceParameterFields(): fields = [ # Filled parameters (_MakeField("hvparams", "HypervisorParameters", QFT_OTHER), - IQ_CONFIG, lambda ctx, _: (QRFS_NORMAL, ctx.inst_hvparams)), + IQ_CONFIG, lambda ctx, _: ctx.inst_hvparams), (_MakeField("beparams", "BackendParameters", QFT_OTHER), - IQ_CONFIG, lambda ctx, _: (QRFS_NORMAL, ctx.inst_beparams)), - (_MakeField("vcpus", "LegacyVCPUs", QFT_NUMBER), IQ_CONFIG, - lambda ctx, _: (QRFS_NORMAL, ctx.inst_beparams[constants.BE_VCPUS])), + IQ_CONFIG, lambda ctx, _: ctx.inst_beparams), # Unfilled parameters (_MakeField("custom_hvparams", "CustomHypervisorParameters", QFT_OTHER), - IQ_CONFIG, lambda ctx, inst: (QRFS_NORMAL, inst.hvparams)), + IQ_CONFIG, _GetItemAttr("hvparams")), (_MakeField("custom_beparams", "CustomBackendParameters", QFT_OTHER), - IQ_CONFIG, lambda ctx, inst: (QRFS_NORMAL, inst.beparams)), + IQ_CONFIG, _GetItemAttr("beparams")), (_MakeField("custom_nicparams", "CustomNicParameters", QFT_OTHER), - IQ_CONFIG, lambda ctx, inst: (QRFS_NORMAL, - [nic.nicparams for nic in inst.nics])), + IQ_CONFIG, lambda ctx, inst: [nic.nicparams for nic in inst.nics]), ] # HV params def _GetInstHvParam(name): - return lambda ctx, _: (QRFS_NORMAL, ctx.inst_hvparams.get(name, None)) + return lambda ctx, _: ctx.inst_hvparams.get(name, _FS_UNAVAIL) fields.extend([ - # For now all hypervisor parameters are exported as QFT_OTHER - (_MakeField("hv/%s" % name, hv_title.get(name, "hv/%s" % name), QFT_OTHER), + (_MakeField("hv/%s" % name, hv_title.get(name, "hv/%s" % name), + _VTToQFT[kind]), IQ_CONFIG, _GetInstHvParam(name)) - for name in constants.HVS_PARAMETERS + for name, kind in constants.HVS_PARAMETER_TYPES.items() if name not in constants.HVC_GLOBALS ]) # BE params def _GetInstBeParam(name): - return lambda ctx, _: (QRFS_NORMAL, ctx.inst_beparams.get(name, None)) + return lambda ctx, _: ctx.inst_beparams.get(name, None) fields.extend([ - # For now all backend parameters are exported as QFT_OTHER - (_MakeField("be/%s" % name, be_title.get(name, "be/%s" % name), QFT_OTHER), - IQ_CONFIG, _GetInstBeParam(name)) - for name in constants.BES_PARAMETERS + (_MakeField("be/%s" % name, be_title.get(name, "be/%s" % name), + _VTToQFT[kind]), IQ_CONFIG, + _GetInstBeParam(name)) + for name, kind in constants.BES_PARAMETER_TYPES.items() ]) return fields @@ -1055,13 +1121,15 @@ def _BuildInstanceFields(): """ fields = [ (_MakeField("pnode", "Primary_node", QFT_TEXT), IQ_CONFIG, - lambda ctx, inst: (QRFS_NORMAL, inst.primary_node)), + _GetItemAttr("primary_node")), (_MakeField("snodes", "Secondary_Nodes", QFT_OTHER), IQ_CONFIG, - lambda ctx, inst: (QRFS_NORMAL, list(inst.secondary_nodes))), + lambda ctx, inst: list(inst.secondary_nodes)), (_MakeField("admin_state", "Autostart", QFT_BOOL), IQ_CONFIG, - lambda ctx, inst: (QRFS_NORMAL, inst.admin_up)), + _GetItemAttr("admin_up")), (_MakeField("tags", "Tags", QFT_OTHER), IQ_CONFIG, - lambda ctx, inst: (QRFS_NORMAL, list(inst.GetTags()))), + lambda ctx, inst: list(inst.GetTags())), + (_MakeField("console", "Console", QFT_OTHER), IQ_CONSOLE, + _GetInstanceConsole), ] # Add simple fields @@ -1072,9 +1140,9 @@ def _BuildInstanceFields(): fields.extend([ (_MakeField("oper_state", "Running", QFT_BOOL), IQ_LIVE, _GetInstOperState), - (_MakeField("oper_ram", "RuntimeMemory", QFT_UNIT), IQ_LIVE, + (_MakeField("oper_ram", "Memory", QFT_UNIT), IQ_LIVE, _GetInstLiveData("memory")), - (_MakeField("oper_vcpus", "RuntimeVCPUs", QFT_NUMBER), IQ_LIVE, + (_MakeField("oper_vcpus", "VCPUs", QFT_NUMBER), IQ_LIVE, _GetInstLiveData("vcpus")), (_MakeField("status", "Status", QFT_TEXT), IQ_LIVE, _GetInstStatus), ]) @@ -1084,7 +1152,13 @@ def _BuildInstanceFields(): fields.extend(_GetInstanceNetworkFields()) fields.extend(_GetItemTimestampFields(IQ_CONFIG)) - return _PrepareFieldList(fields) + aliases = [ + ("vcpus", "be/vcpus"), + ("sda_size", "disk.size/0"), + ("sdb_size", "disk.size/1"), + ] + + return _PrepareFieldList(fields, aliases) class LockQueryData: @@ -1113,7 +1187,7 @@ def _GetLockOwners(_, data): if owners: owners = utils.NiceSort(owners) - return (QRFS_NORMAL, owners) + return owners def _GetLockPending(_, data): @@ -1126,7 +1200,7 @@ def _GetLockPending(_, data): pending = [(mode, utils.NiceSort(names)) for (mode, names) in pending] - return (QRFS_NORMAL, pending) + return pending def _BuildLockFields(): @@ -1135,12 +1209,12 @@ def _BuildLockFields(): """ return _PrepareFieldList([ (_MakeField("name", "Name", QFT_TEXT), None, - lambda ctx, (name, mode, owners, pending): (QRFS_NORMAL, name)), + lambda ctx, (name, mode, owners, pending): name), (_MakeField("mode", "Mode", QFT_OTHER), LQ_MODE, - lambda ctx, (name, mode, owners, pending): (QRFS_NORMAL, mode)), + lambda ctx, (name, mode, owners, pending): mode), (_MakeField("owner", "Owner", QFT_OTHER), LQ_OWNER, _GetLockOwners), (_MakeField("pending", "Pending", QFT_OTHER), LQ_PENDING, _GetLockPending), - ]) + ], []) class GroupQueryData: @@ -1186,11 +1260,10 @@ def _BuildGroupFields(): for (name, (title, kind)) in _GROUP_SIMPLE_FIELDS.items()] def _GetLength(getter): - return lambda ctx, group: (QRFS_NORMAL, len(getter(ctx)[group.uuid])) + return lambda ctx, group: len(getter(ctx)[group.uuid]) def _GetSortedList(getter): - return lambda ctx, group: (QRFS_NORMAL, - utils.NiceSort(getter(ctx)[group.uuid])) + return lambda ctx, group: utils.NiceSort(getter(ctx)[group.uuid]) group_to_nodes = operator.attrgetter("group_to_nodes") group_to_instances = operator.attrgetter("group_to_instances") @@ -1213,7 +1286,7 @@ def _BuildGroupFields(): fields.extend(_GetItemTimestampFields(GQ_CONFIG)) - return _PrepareFieldList(fields) + return _PrepareFieldList(fields, []) #: Fields available for node queries