X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FGetSlivers.py;h=41dc7061f0ae69c99d1c9c61f7017f914b036e23;hb=3a24db70ba35a4ffb85d5e7c761b5dbc87b93e40;hp=04982d4c82fa0d6982775d85f4436119320effff;hpb=582a9d6c7de8de214d9824c2e232737fc4d7b74a;p=plcapi.git diff --git a/PLC/Methods/GetSlivers.py b/PLC/Methods/GetSlivers.py index 04982d4..41dc706 100644 --- a/PLC/Methods/GetSlivers.py +++ b/PLC/Methods/GetSlivers.py @@ -3,6 +3,7 @@ import time from PLC.Faults import * from PLC.Method import Method from PLC.Parameter import Parameter, Mixed +from PLC.Filter import Filter from PLC.Auth import Auth from PLC.Nodes import Node, Nodes from PLC.NodeNetworks import NodeNetwork, NodeNetworks @@ -13,33 +14,106 @@ from PLC.Persons import Person, Persons from PLC.Keys import Key, Keys from PLC.SliceAttributes import SliceAttribute, SliceAttributes +def get_slivers(api, slice_filter, node = None): + # Get slice information + slices = Slices(api, slice_filter) + + # Build up list of users and slice attributes + person_ids = set() + slice_attribute_ids = set() + for slice in slices: + person_ids.update(slice['person_ids']) + slice_attribute_ids.update(slice['slice_attribute_ids']) + + # Get user information + all_persons = Persons(api, person_ids).dict() + + # Build up list of keys + key_ids = set() + for person in all_persons.values(): + key_ids.update(person['key_ids']) + + # Get user account keys + all_keys = Keys(api, key_ids).dict() + + # Get slice attributes + all_slice_attributes = SliceAttributes(api, slice_attribute_ids).dict() + + slivers = [] + for slice in slices: + keys = [] + for person_id in slice['person_ids']: + if person_id in all_persons: + person = all_persons[person_id] + if not person['enabled']: + continue + for key_id in person['key_ids']: + if key_id in all_keys: + key = all_keys[key_id] + keys += [{'key_type': key['key_type'], + 'key': key['key']}] + + attributes = [] + + # All (per-node and global) attributes for this slice + slice_attributes = [] + for slice_attribute_id in slice['slice_attribute_ids']: + if slice_attribute_id in all_slice_attributes: + slice_attributes.append(all_slice_attributes[slice_attribute_id]) + + # Per-node sliver attributes take precedence over global + # slice attributes, so set them first. + sliver_attributes = [] + + if node is not None: + for sliver_attribute in filter(lambda a: a['node_id'] == node['node_id'], slice_attributes): + sliver_attributes.append(sliver_attribute['name']) + attributes.append({'name': sliver_attribute['name'], + 'value': sliver_attribute['value']}) + + for slice_attribute in filter(lambda a: a['node_id'] is None, slice_attributes): + # Do not set any global slice attributes for + # which there is at least one sliver attribute + # already set. + if slice_attribute['name'] not in sliver_attributes: + attributes.append({'name': slice_attribute['name'], + 'value': slice_attribute['value']}) + + slivers.append({ + 'name': slice['name'], + 'slice_id': slice['slice_id'], + 'instantiation': slice['instantiation'], + 'expires': slice['expires'], + 'keys': keys, + 'attributes': attributes + }) + + return slivers + class GetSlivers(Method): """ - Returns an array of structs representing nodes and their slivers - (slices bound to nodes). If node_hostnames is specified, only - information about the specified nodes will be returned. If not - specified and called by a node, only information about the caller - will be returned. + Returns a struct containing information about the specified node + (or calling node, if called by a node and node_id_or_hostname is + not specified), including the current set of slivers bound to the + node. All of the information returned by this call can be gathered from other calls, e.g. GetNodes, GetNodeNetworks, GetSlices, etc. This - function exists primarily for the benefit of Node Manager and - Federation Manager. + function exists almost solely for the benefit of Node Manager. """ roles = ['admin', 'node'] accepts = [ Auth(), - [Mixed(Node.fields['node_id'], - Node.fields['hostname'])] + Mixed(Node.fields['node_id'], + Node.fields['hostname']), ] - returns = [{ + returns = { 'timestamp': Parameter(int, "Timestamp of this call, in seconds since UNIX epoch"), 'node_id': Node.fields['node_id'], 'hostname': Node.fields['hostname'], - 'boot_state': Node.fields['boot_state'], 'networks': [NodeNetwork.fields], 'groups': [NodeGroup.fields['name']], 'conf_files': [ConfFile.fields], @@ -57,120 +131,71 @@ class GetSlivers(Method): 'value': SliceAttribute.fields['value'] }] }] - }] + } - def call(self, auth, node_id_or_hostname_list = None): + def call(self, auth, node_id_or_hostname = None): timestamp = int(time.time()) - if node_id_or_hostname_list is None and isinstance(self.caller, Node): - all_nodes = {self.caller['node_id']: self.caller} + # Get node + if node_id_or_hostname is None: + if isinstance(self.caller, Node): + node = self.caller + else: + raise PLCInvalidArgument, "'node_id_or_hostname' not specified" else: - all_nodes = Nodes(self.api, node_id_or_hostname_list) - # XXX Add foreign nodes + nodes = Nodes(self.api, [node_id_or_hostname]) + if not nodes: + raise PLCInvalidArgument, "No such node" + node = nodes[0] - nodenetwork_ids = set() - nodegroup_ids = set() - slice_ids = set() - for node_id, node in all_nodes.iteritems(): - nodenetwork_ids.update(node['nodenetwork_ids']) - nodegroup_ids.update(node['nodegroup_ids']) - slice_ids.update(node['slice_ids']) + if node['peer_id'] is not None: + raise PLCInvalidArgument, "Not a local node" # Get nodenetwork information - if nodenetwork_ids: - all_nodenetworks = NodeNetworks(self.api, nodenetwork_ids) - else: - all_nodenetworks = {} + networks = NodeNetworks(self.api, node['nodenetwork_ids']) # Get node group information - if nodegroup_ids: - all_nodegroups = NodeGroups(self.api, nodegroup_ids) - else: - all_nodegroups = {} - - # Get configuration files - all_conf_files = ConfFiles(self.api, {'enabled': True}) - - if slice_ids: - # Get slices - all_slices = Slices(self.api, slice_ids) - - person_ids = set() - slice_attribute_ids = set() - for slice_id, slice in all_slices.iteritems(): - person_ids.update(slice['person_ids']) - slice_attribute_ids.update(slice['slice_attribute_ids']) - - # Get user accounts - all_persons = Persons(self.api, person_ids) - - key_ids = set() - for person_id, person in all_persons.iteritems(): - key_ids.update(person['key_ids']) - - # Get user account keys - all_keys = Keys(self.api, key_ids) - - # Get slice attributes - all_slice_attributes = SliceAttributes(self.api, slice_attribute_ids) - - nodes = [] - for node_id, node in all_nodes.iteritems(): - networks = [all_nodenetworks[nodenetwork_id] for nodenetwork_id in node['nodenetwork_ids']] - nodegroups = [all_nodegroups[nodegroup_id] for nodegroup_id in node['nodegroup_ids']] - groups = [nodegroup['name'] for nodegroup in nodegroups] - conf_files = dict([(conf_file['dest'], conf_file) for conf_file in all_conf_files.values()]) - - # If a node belongs to multiple node - # groups for which the same configuration file is defined, - # it is undefined which one takes precedence. - for nodegroup in nodegroups: - for conf_file in map(lambda id: all_conf_files[id], nodegroup['conf_file_ids']): - conf_files[conf_file['dest']] = conf_file - - # Node configuration files always take precedence over - # node group configuration files. - for conf_file in map(lambda id: all_conf_files[id], node['conf_file_ids']): + nodegroups = NodeGroups(self.api, node['nodegroup_ids']).dict('name') + groups = nodegroups.keys() + + # Get all (enabled) configuration files + all_conf_files = ConfFiles(self.api, {'enabled': True}).dict() + conf_files = {} + + # Global configuration files are the default. If multiple + # entries for the same global configuration file exist, it is + # undefined which one takes precedence. + for conf_file in all_conf_files.values(): + if not conf_file['node_ids'] and not conf_file['nodegroup_ids']: conf_files[conf_file['dest']] = conf_file - - slivers = [] - for slice in map(lambda id: all_slices[id], node['slice_ids']): - keys = [] - for person in map(lambda id: all_persons[id], slice['person_ids']): - keys += [{'key_type': all_keys[key_id]['key_type'], - 'key': all_keys[key_id]['key']} \ - for key_id in person['key_ids']] - - attributes = {} - for slice_attribute in map(lambda id: all_slice_attributes[id], - slice['slice_attribute_ids']): - # Per-node sliver attributes (slice attributes - # with non-null node_id fields) take precedence - # over global slice attributes. - if not attributes.has_key(slice_attribute['name']) or \ - slice_attribute['node_id'] is not None: - attributes[slice_attribute['name']] = { - 'name': slice_attribute['name'], - 'value': slice_attribute['value'] - } - - slivers.append({ - 'name': slice['name'], - 'slice_id': slice['slice_id'], - 'instantiation': slice['instantiation'], - 'expires': slice['expires'], - 'keys': keys, - 'attributes': attributes.values() - }) - - nodes.append({ - 'timestamp': timestamp, - 'node_id': node['node_id'], - 'hostname': node['hostname'], - 'networks': networks, - 'groups': groups, - 'conf_files': conf_files.values(), - 'slivers': slivers - }) - - return nodes + + # Node group configuration files take precedence over global + # ones. If a node belongs to multiple node groups for which + # the same configuration file is defined, it is undefined + # which one takes precedence. + for nodegroup in nodegroups.values(): + for conf_file_id in nodegroup['conf_file_ids']: + if conf_file_id in all_conf_files: + conf_files[conf_file['dest']] = all_conf_files[conf_file_id] + + # Node configuration files take precedence over node group + # configuration files. + for conf_file_id in node['conf_file_ids']: + if conf_file_id in all_conf_files: + conf_files[conf_file['dest']] = all_conf_files[conf_file_id] + + # Get system slices + system_slice_attributes = SliceAttributes(self.api, {'name': 'system', 'value': '1'}).dict('slice_id') + system_slice_ids = system_slice_attributes.keys() + + slivers = get_slivers(self.api, system_slice_ids + node['slice_ids'], node) + + return { + 'timestamp': timestamp, + 'node_id': node['node_id'], + 'hostname': node['hostname'], + 'networks': networks, + 'groups': groups, + 'conf_files': conf_files.values(), + 'slivers': slivers + }