X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FGetSlivers.py;h=ec1e83e68fc973572df83ec797ec1e3fbdbe8994;hb=2a0cd82ae62a17d7c07e3b32611063a95993533d;hp=d4dbba8e217876a4bf83dec2bc3ce525a436d930;hpb=a74ba7ba88db85e1575101c62cbda610e773ba4f;p=plcapi.git diff --git a/PLC/Methods/GetSlivers.py b/PLC/Methods/GetSlivers.py index d4dbba8..ec1e83e 100644 --- a/PLC/Methods/GetSlivers.py +++ b/PLC/Methods/GetSlivers.py @@ -18,11 +18,16 @@ from PLC.Roles import Roles from PLC.Keys import Key, Keys from PLC.SliceTags import SliceTag, SliceTags from PLC.InitScripts import InitScript, InitScripts +from PLC.Leases import Lease, Leases +from PLC.Timestamp import Duration +from PLC.Methods.GetSliceFamily import GetSliceFamily + +from PLC.Accessors.Accessors_standard import * # XXX used to check if slice expiration time is sane MAXINT = 2L**31-1 -def get_slivers(api, slice_filter, node = None): +def get_slivers(api, auth, slice_filter, node = None): # Get slice information slices = Slices(api, slice_filter, ['slice_id', 'name', 'instantiation', 'expires', 'person_ids', 'slice_tag_ids']) @@ -76,13 +81,13 @@ 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_tags): + for sliver_attribute in [ a for a in slice_tags if a['node_id'] == node['node_id'] ]: sliver_attributes.append(sliver_attribute['tagname']) attributes.append({'tagname': sliver_attribute['tagname'], 'value': sliver_attribute['value']}) # set nodegroup slice attributes - for slice_tag in filter(lambda a: a['nodegroup_id'] in node['nodegroup_ids'], slice_tags): + for slice_tag in [ a for a in slice_tags if a['nodegroup_id'] in node['nodegroup_ids'] ]: # Do not set any nodegroup slice attributes for # which there is at least one sliver attribute # already set. @@ -90,7 +95,7 @@ def get_slivers(api, slice_filter, node = None): attributes.append({'tagname': slice_tag['tagname'], 'value': slice_tag['value']}) - for slice_tag in filter(lambda a: a['node_id'] is None, slice_tags): + for slice_tag in [ a for a in slice_tags if a['node_id'] is None ]: # Do not set any global slice attributes for # which there is at least one sliver attribute # already set. @@ -102,18 +107,22 @@ def get_slivers(api, slice_filter, node = None): # checked with an assertion if slice['expires'] > MAXINT: slice['expires']= MAXINT + # expose the slice vref as computed by GetSliceFamily + family = GetSliceFamily (api).call(auth, slice['slice_id']) + slivers.append({ 'name': slice['name'], 'slice_id': slice['slice_id'], 'instantiation': slice['instantiation'], 'expires': slice['expires'], 'keys': keys, - 'attributes': attributes + 'attributes': attributes, + 'GetSliceFamily': family, }) return slivers -class v43GetSlivers(Method): +class GetSlivers(Method): """ Returns a struct containing information about the specified node (or calling node, if called by a node and node_id_or_hostname is @@ -137,7 +146,7 @@ class v43GetSlivers(Method): 'timestamp': Parameter(int, "Timestamp of this call, in seconds since UNIX epoch"), 'node_id': Node.fields['node_id'], 'hostname': Node.fields['hostname'], - 'networks': [Interface.fields], + 'interfaces': [Interface.fields], 'groups': [NodeGroup.fields['groupname']], 'conf_files': [ConfFile.fields], 'initscripts': [InitScript.fields], @@ -161,7 +170,21 @@ class v43GetSlivers(Method): 'tagname': SliceTag.fields['tagname'], 'value': SliceTag.fields['value'] }] - }] + }], + # how to reach the xmpp server + 'xmpp': {'server':Parameter(str,"hostname for the XMPP server"), + 'user':Parameter(str,"username for the XMPP server"), + 'password':Parameter(str,"username for the XMPP server"), + }, + # we consider three policies (reservation-policy) + # none : the traditional way to use a node + # lease_or_idle : 0 or 1 slice runs at a given time + # lease_or_shared : 1 slice is running during a lease, otherwise all the slices come back + 'reservation_policy': Parameter(str,"one among none, lease_or_idle, lease_or_shared"), + 'leases': [ { 'slice_id' : Lease.fields['slice_id'], + 't_from' : Lease.fields['t_from'], + 't_until' : Lease.fields['t_until'], + }], } def call(self, auth, node_id_or_hostname = None): @@ -183,7 +206,7 @@ class v43GetSlivers(Method): raise PLCInvalidArgument, "Not a local node" # Get interface information - networks = Interfaces(self.api, node['interface_ids']) + interfaces = Interfaces(self.api, node['interface_ids']) # Get node group information nodegroups = NodeGroups(self.api, node['nodegroup_ids']).dict('groupname') @@ -225,11 +248,12 @@ class v43GetSlivers(Method): system_slice_ids = system_slice_tags.keys() # Get nm-controller slices + # xxx Thierry: should these really be exposed regardless of their mapping to nodes ? controller_and_delegated_slices = Slices(self.api, {'instantiation': ['nm-controller', 'delegated']}, ['slice_id']).dict('slice_id') controller_and_delegated_slice_ids = controller_and_delegated_slices.keys() slice_ids = system_slice_ids + controller_and_delegated_slice_ids + node['slice_ids'] - slivers = get_slivers(self.api, slice_ids, node) + slivers = get_slivers(self.api, auth, slice_ids, node) # get the special accounts and keys needed for the node # root @@ -239,82 +263,80 @@ class v43GetSlivers(Method): nodes = Nodes(self.api, node['node_id']) node = nodes[0] - def getpersonsitekeys(site_id_or_name,theroles): - site_filter = site_id_or_name - site_return_filter = ['person_ids'] - sites = Sites(self.api, site_filter, site_return_filter) - site = sites[0] - person_filter = {'person_id':site['person_ids'],'enabled':True} - person_return_filter = ['person_id', 'enabled', 'key_ids','role_ids','roles'] - site_persons = Persons(self.api, person_filter, person_return_filter) - - # collect the keys into a table to weed out duplicates - site_keys = {} - for site_person in site_persons: - if site_person['enabled'] is False: continue - for role in theroles: - if role in site_person['roles']: - keys_filter = site_person['key_ids'] - keys_return_filter = ['key_id', 'key', 'key_type'] - keys = Keys(self.api, keys_filter, keys_return_filter) - for key in keys: - if key['key_type'] == 'ssh': - site_keys[key['key']]=None - return site_keys.keys() + # 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 + + # power users are pis and techs + def get_site_power_user_keys(api,site_id_or_name): + site = Sites (api,site_id_or_name,['person_ids'])[0] + key_ids = reduce (reduce_flatten_list, + [ p['key_ids'] for p in \ + Persons(api,{ 'person_id':site['person_ids'], + 'enabled':True, '|role_ids' : [20, 40] }, + ['key_ids']) ], + []) + return [ key['key'] for key in Keys (api, key_ids) if key['key_type']=='ssh'] + + # all admins regardless of their site + def get_all_admin_keys(api): + key_ids = reduce (reduce_flatten_list, + [ p['key_ids'] for p in \ + Persons(api, {'peer_id':None, 'enabled':True, '|role_ids':[10] }, + ['key_ids']) ], + []) + return [ key['key'] for key in Keys (api, key_ids) if key['key_type']=='ssh'] # 'site_admin' account setup - personsitekeys=getpersonsitekeys(node['site_id'],['pi','tech']) + personsitekeys=get_site_power_user_keys(self.api,node['site_id']) accounts.append({'name':'site_admin','keys':personsitekeys}) # 'root' account setup on nodes from all 'admin' users - # registered with the PLC main site - personsitekeys=getpersonsitekeys(self.api.config.PLC_SLICE_PREFIX,['admin']) + personsitekeys=get_all_admin_keys(self.api) accounts.append({'name':'root','keys':personsitekeys}) + hrn = GetNodeHrn(self.api).call(auth,node['node_id']) + + # XMPP config for omf federation + try: + if not self.api.config.PLC_OMF_ENABLED: + raise Exception,"OMF disabled" + xmpp={'server':self.api.config.PLC_OMF_XMPP_SERVER, + 'user':self.api.config.PLC_OMF_XMPP_USER, + 'password':self.api.config.PLC_OMF_XMPP_PASSWORD, + } + except: + xmpp={'server':None,'user':None,'password':None} + node.update_last_contact() + # expose leases & reservation policy + # in a first implementation we only support none and lease_or_idle + lease_exposed_fields = [ 'slice_id', 't_from', 't_until', ] + leases=None + if node['node_type'] != 'reservable': + reservation_policy='none' + else: + reservation_policy='lease_or_idle' + # expose the leases for the next 24 hours + leases = [ dict ( [ (k,l[k]) for k in lease_exposed_fields ] ) + for l in Leases (self.api, {'node_id':node['node_id'], + 'clip': (timestamp, timestamp+24*Duration.HOUR), + '-SORT': 't_from', + }) ] + return { 'timestamp': timestamp, 'node_id': node['node_id'], 'hostname': node['hostname'], - 'networks': networks, + 'interfaces': interfaces, 'groups': groups, 'conf_files': conf_files.values(), 'initscripts': initscripts, 'slivers': slivers, - 'accounts': accounts + 'accounts': accounts, + 'xmpp':xmpp, + 'hrn':hrn, + 'reservation_policy': reservation_policy, + 'leases':leases, } - -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