X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FGetSlivers.py;h=aefcf93dae81faa2fe73b943c74c6f47064cf945;hb=df42713daf2e012ddd0bd680df3a8de8eca3c22e;hp=890b65f098b78155685bd9cbfe9f1407ff52a368;hpb=702fe8daa8d3acb5854433668184472c2c83fa4b;p=plcapi.git diff --git a/PLC/Methods/GetSlivers.py b/PLC/Methods/GetSlivers.py index 890b65f..aefcf93 100644 --- a/PLC/Methods/GetSlivers.py +++ b/PLC/Methods/GetSlivers.py @@ -1,3 +1,5 @@ +# $Id$ +# $URL$ import time from PLC.Faults import * @@ -6,28 +8,33 @@ 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 +from PLC.Interfaces import Interface, Interfaces from PLC.NodeGroups import NodeGroup, NodeGroups from PLC.ConfFiles import ConfFile, ConfFiles from PLC.Slices import Slice, Slices from PLC.Persons import Person, Persons +from PLC.Sites import Sites +from PLC.Roles import Roles from PLC.Keys import Key, Keys -from PLC.SliceAttributes import SliceAttribute, SliceAttributes +from PLC.SliceTags import SliceTag, SliceTags from PLC.InitScripts import InitScript, InitScripts +# XXX used to check if slice expiration time is sane +MAXINT = 2L**31-1 + def get_slivers(api, slice_filter, node = None): # Get slice information - slices = Slices(api, slice_filter) + slices = Slices(api, slice_filter, ['slice_id', 'name', 'instantiation', 'expires', 'person_ids', 'slice_tag_ids']) # Build up list of users and slice attributes person_ids = set() - slice_attribute_ids = set() + slice_tag_ids = set() for slice in slices: person_ids.update(slice['person_ids']) - slice_attribute_ids.update(slice['slice_attribute_ids']) + slice_tag_ids.update(slice['slice_tag_ids']) # Get user information - all_persons = Persons(api, person_ids, ['person_id', 'enabled', 'key_ids']).dict() + all_persons = Persons(api, {'person_id':person_ids,'enabled':True}, ['person_id', 'enabled', 'key_ids']).dict() # Build up list of keys key_ids = set() @@ -38,7 +45,7 @@ def get_slivers(api, slice_filter, node = None): all_keys = Keys(api, key_ids, ['key_id', 'key', 'key_type']).dict() # Get slice attributes - all_slice_attributes = SliceAttributes(api, slice_attribute_ids).dict() + all_slice_tags = SliceTags(api, slice_tag_ids).dict() slivers = [] for slice in slices: @@ -57,10 +64,10 @@ def get_slivers(api, slice_filter, node = None): 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]) + slice_tags = [] + for slice_tag_id in slice['slice_tag_ids']: + if slice_tag_id in all_slice_tags: + slice_tags.append(all_slice_tags[slice_tag_id]) # Per-node sliver attributes take precedence over global # slice attributes, so set them first. @@ -69,27 +76,31 @@ def get_slivers(api, slice_filter, node = None): 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'], + for sliver_attribute in filter(lambda a: a['node_id'] == node['node_id'], slice_tags): + sliver_attributes.append(sliver_attribute['tagname']) + attributes.append({'tagname': sliver_attribute['tagname'], 'value': sliver_attribute['value']}) # set nodegroup slice attributes - for slice_attribute in filter(lambda a: a['nodegroup_id'] in node['nodegroup_ids'], slice_attributes): + for slice_tag in filter(lambda a: a['nodegroup_id'] in node['nodegroup_ids'], slice_tags): # Do not set any nodegroup slice attributes for # which there is at least one sliver attribute # already set. - if slice_attribute['name'] not in slice_attributes: - attributes.append({'name': slice_attribute['name'], - 'value': slice_attribute['value']}) + if slice_tag not in slice_tags: + attributes.append({'tagname': slice_tag['tagname'], + 'value': slice_tag['value']}) - for slice_attribute in filter(lambda a: a['node_id'] is None, slice_attributes): + for slice_tag in filter(lambda a: a['node_id'] is None, slice_tags): # 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']}) + if slice_tag['tagname'] not in sliver_attributes: + attributes.append({'tagname': slice_tag['tagname'], + 'value': slice_tag['value']}) + + # XXX Sanity check; though technically this should be a system invariant + # checked with an assertion + if slice['expires'] > MAXINT: slice['expires']= MAXINT slivers.append({ 'name': slice['name'], @@ -102,7 +113,7 @@ def get_slivers(api, slice_filter, node = None): return slivers -class GetSlivers(Method): +class v43GetSlivers(Method): """ Returns a struct containing information about the specified node (or calling node, if called by a node and node_id_or_hostname is @@ -110,7 +121,7 @@ class GetSlivers(Method): node. All of the information returned by this call can be gathered from - other calls, e.g. GetNodes, GetNodeNetworks, GetSlices, etc. This + other calls, e.g. GetNodes, GetInterfaces, GetSlices, etc. This function exists almost solely for the benefit of Node Manager. """ @@ -126,10 +137,17 @@ class GetSlivers(Method): 'timestamp': Parameter(int, "Timestamp of this call, in seconds since UNIX epoch"), 'node_id': Node.fields['node_id'], 'hostname': Node.fields['hostname'], - 'networks': [NodeNetwork.fields], - 'groups': [NodeGroup.fields['name']], + 'networks': [Interface.fields], + 'groups': [NodeGroup.fields['groupname']], 'conf_files': [ConfFile.fields], 'initscripts': [InitScript.fields], + 'accounts': [{ + 'name': Parameter(str, "unix style account name", max = 254), + 'keys': [{ + 'key_type': Key.fields['key_type'], + 'key': Key.fields['key'] + }], + }], 'slivers': [{ 'name': Slice.fields['name'], 'slice_id': Slice.fields['slice_id'], @@ -140,8 +158,8 @@ class GetSlivers(Method): 'key': Key.fields['key'] }], 'attributes': [{ - 'name': SliceAttribute.fields['name'], - 'value': SliceAttribute.fields['value'] + 'tagname': SliceTag.fields['tagname'], + 'value': SliceTag.fields['value'] }] }] } @@ -164,11 +182,11 @@ class GetSlivers(Method): if node['peer_id'] is not None: raise PLCInvalidArgument, "Not a local node" - # Get nodenetwork information - networks = NodeNetworks(self.api, node['nodenetwork_ids']) + # Get interface information + networks = Interfaces(self.api, node['interface_ids']) # Get node group information - nodegroups = NodeGroups(self.api, node['nodegroup_ids']).dict('name') + nodegroups = NodeGroups(self.api, node['nodegroup_ids']).dict('groupname') groups = nodegroups.keys() # Get all (enabled) configuration files @@ -189,21 +207,22 @@ class GetSlivers(Method): 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] + conf_file = all_conf_files[conf_file_id] + conf_files[conf_file['dest']] = conf_file # 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] - + conf_file = all_conf_files[conf_file_id] + conf_files[conf_file['dest']] = conf_file # Get all (enabled) initscripts initscripts = InitScripts(self.api, {'enabled': True}) # Get system slices - system_slice_attributes = SliceAttributes(self.api, {'name': 'system', 'value': '1'}).dict('slice_id') - system_slice_ids = system_slice_attributes.keys() + system_slice_tags = SliceTags(self.api, {'tagname': 'system', 'value': '1'}).dict('slice_id') + system_slice_ids = system_slice_tags.keys() # Get nm-controller slices controller_and_delegated_slices = Slices(self.api, {'instantiation': ['nm-controller', 'delegated']}, ['slice_id']).dict('slice_id') @@ -212,6 +231,48 @@ class GetSlivers(Method): slivers = get_slivers(self.api, slice_ids, node) + # get the special accounts and keys needed for the node + # root + # site_admin + accounts = [] + if False and 'site_id' not in node: + nodes = Nodes(self.api, node['node_id']) + node = nodes[0] + + # used in conjunction with reduce to flatten lists, like in + # reduce ( reduce_flatten_list, [ [1] , [2,3] ], []) => [ 1,2,3 ] + def reduce_flatten_list (x,y): return x+y + + def get_site_roles_keys(site_id_or_name,roles): + site = Sites (self.api,site_id_or_name,['person_ids'])[0] + persons = Persons(self.api,{'person_id':site['person_ids'], 'enabled':True}, + ['roles','key_ids','enabled'] ) + key_ids = [] + for role in roles: + key_ids.extend(reduce (reduce_flatten_list, [ p['key_ids'] for p in persons if role in p['roles'] ], [])) + return [ key['key'] for key in Keys (self.api, key_ids) if key['key_type']=='ssh'] + + def get_all_admin_keys(): + # get all admins key_ids and flatten them into a list of key_ids + key_ids = reduce (reduce_flatten_list, + [ p['key_ids'] for p in \ + Persons(self.api,{'peer_id':None,'enabled':True}, \ + ['roles','key_ids','enabled']) \ + if 'admin' in p['roles'] ], + # starting point for reduce in case there's no admin - I know.. + []) + # fetch the corresponding keys, and extract the 'key' part into a list + # this does not return duplicates + return [ key['key'] for key in Keys (self.api, key_ids) if key['key_type']=='ssh'] + + # 'site_admin' account setup + personsitekeys=get_site_roles_keys(node['site_id'],['pi','tech']) + accounts.append({'name':'site_admin','keys':personsitekeys}) + + # 'root' account setup on nodes from all 'admin' users + personsitekeys=get_all_admin_keys() + accounts.append({'name':'root','keys':personsitekeys}) + node.update_last_contact() return { @@ -222,5 +283,40 @@ class GetSlivers(Method): 'groups': groups, 'conf_files': conf_files.values(), 'initscripts': initscripts, - 'slivers': slivers + 'slivers': slivers, + 'accounts': accounts } + +class v42GetSlivers(v43GetSlivers): + """ + Legacy wrapper for v43GetSlivers. + """ + + def call(self, auth, node_id_or_hostname = None): + result = v43GetSlivers.call(self,auth,node_id_or_hostname) + networks = result['networks'] + + for i in range(0,len(networks)): + network = networks[i] + if network.has_key("interface_id"): + network['nodenetwork_id']=network['interface_id'] + if network.has_key("interface_tag_ids"): + network['nodenetwork_setting_ids']=network['interface_tag_ids'] + networks[i]=network + + result['networks']=networks + return result + +class GetSlivers(v42GetSlivers): + """ + 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, GetInterfaces, GetSlices, etc. This + function exists almost solely for the benefit of Node Manager. + """ + + pass