X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fnitos%2Fnitosdriver.py;h=3b1f30e1f96889928fa7d3fe9283beb473b3762d;hb=65140a14a72e7009d8fd2f1d1f35e42ec98edc21;hp=b917ee125b4cb900319f71fa3d59ab956d7835da;hpb=dd60c312f56f2612c5aa59be0b27a6973b35f791;p=sfa.git diff --git a/sfa/nitos/nitosdriver.py b/sfa/nitos/nitosdriver.py index b917ee12..3b1f30e1 100644 --- a/sfa/nitos/nitosdriver.py +++ b/sfa/nitos/nitosdriver.py @@ -7,7 +7,7 @@ from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \ from sfa.util.sfalogging import logger from sfa.util.defaultdict import defaultdict from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch -from sfa.util.xrn import hrn_to_urn, get_leaf +from sfa.util.xrn import Xrn, hrn_to_urn, get_leaf, urn_to_hrn from sfa.util.cache import Cache # one would think the driver should not need to mess with the SFA db, but.. @@ -29,7 +29,6 @@ from sfa.nitos.nitosslices import NitosSlices from sfa.nitos.nitosxrn import NitosXrn, slicename_to_hrn, hostname_to_hrn, hrn_to_nitos_slicename, xrn_to_hostname - def list_to_dict(recs, key): """ convert a list of dictionaries into a dictionary keyed on the @@ -52,11 +51,47 @@ class NitosDriver (Driver): self.shell = NitosShell (config) self.cache=None self.testbedInfo = self.shell.getTestbedInfo() - if config.SFA_AGGREGATE_CACHING: - if NitosDriver.cache is None: - NitosDriver.cache = Cache() - self.cache = NitosDriver.cache +# un-comment below lines to enable caching +# if config.SFA_AGGREGATE_CACHING: +# if NitosDriver.cache is None: +# NitosDriver.cache = Cache() +# self.cache = NitosDriver.cache + ########################################### + ########## utility methods for NITOS driver + ########################################### + + + def filter_nitos_results (self, listo, filters_dict): + """ + the Nitos scheduler API does not provide a get result filtring so we do it here + """ + mylist = [] + mylist.extend(listo) + for dicto in mylist: + for filter in filters_dict: + if filter not in dicto or dicto[filter] != filters_dict[filter]: + listo.remove(dicto) + break + return listo + + def convert_id (self, list_of_dict): + """ + convert object id retrived in string format to int format + """ + for dicto in list_of_dict: + for key in dicto: + if key in ['node_id', 'slice_id', 'user_id', 'channel_id', 'reservation_id'] and isinstance(dicto[key], str): + dicto[key] = int(dicto[key]) + elif key in ['user_ids']: + user_ids2 = [] + for user_id in dicto['user_ids']: + user_ids2.append(int(user_id)) + dicto['user_ids'] = user_ids2 + return list_of_dict + + + ######################################## ########## registry oriented ######################################## @@ -70,7 +105,7 @@ class NitosDriver (Driver): nitos_record = self.sfa_fields_to_nitos_fields(type, hrn, sfa_record) if type == 'authority': - pointer = 1 + pointer = -1 elif type == 'slice': slices = self.shell.getSlices() @@ -81,7 +116,7 @@ class NitosDriver (Driver): break if not slice_id: - pointer = self.shell.addSlice({slice_name : nitos_record['name']}) + pointer = self.shell.addSlice({'slice_name' : nitos_record['name']}) else: pointer = slice_id @@ -93,22 +128,20 @@ class NitosDriver (Driver): user_id = user['user_id'] break if not user_id: - pointer = self.shell.addUser({username : nitos_record['name'], email : nitos_record['email']}) + pointer = self.shell.addUser({'username' : nitos_record['name'], 'email' : nitos_record['email']}) else: pointer = user_id - # What roles should this user have? # Add the user's key if pub_key: - self.shell.addUserKey({user_id : pointer,'key' : pub_key}) + self.shell.addUserKey({'user_id' : pointer,'key' : pub_key}) elif type == 'node': - login_base = PlXrn(xrn=sfa_record['authority'],type='node').pl_login_base() - nodes = self.shell.GetNodes([pl_record['hostname']]) + nodes = self.shell.GetNodes({}, []) # filter nodes for node in nodes: - if node['node_name'] == nitos_record['name']: + if node['hostname'] == nitos_record['name']: node_id = node['node_id'] break @@ -121,96 +154,59 @@ class NitosDriver (Driver): ########## def update (self, old_sfa_record, new_sfa_record, hrn, new_key): - """ + pointer = old_sfa_record['pointer'] type = old_sfa_record['type'] + new_nitos_record = self.sfa_fields_to_nitos_fields(type, hrn, new_sfa_record) # new_key implemented for users only if new_key and type not in [ 'user' ]: raise UnknownSfaType(type) - if (type == "authority"): - #self.shell.UpdateSite(pointer, new_sfa_record) - pass - - elif type == "slice": - nitos_record=self.sfa_fields_to_nitos_fields(type, hrn, new_sfa_record) - if 'name' in nitos_record: - nitos_record.pop('name') - self.shell.updateSlice(pointer, nitos_record) + if type == "slice": + if 'name' in new_sfa_record: + self.shell.updateSlice({'slice_id': pointer, 'fields': {'slice_name': new_sfa_record['name']}}) elif type == "user": - # SMBAKER: UpdatePerson only allows a limited set of fields to be - # updated. Ideally we should have a more generic way of doing - # this. I copied the field names from UpdatePerson.py... update_fields = {} - all_fields = new_sfa_record - for key in all_fields.keys(): - if key in ['first_name', 'last_name', 'title', 'email', - 'password', 'phone', 'url', 'bio', 'accepted_aup', - 'enabled']: - update_fields[key] = all_fields[key] - # when updating a user, we always get a 'email' field at this point - # this is because 'email' is a native field in the RegUser object... - if 'email' in update_fields and not update_fields['email']: - del update_fields['email'] - self.shell.UpdatePerson(pointer, update_fields) + if 'name' in new_sfa_record: + update_fields['username'] = new_sfa_record['name'] + if 'email' in new_sfa_record: + update_fields['email'] = new_sfa_record['email'] + + self.shell.updateUser({'user_id': pointer, 'fields': update_fields}) if new_key: - # must check this key against the previous one if it exists - persons = self.shell.getUsers([pointer], ['key_ids']) - person = persons[0] - keys = person['key_ids'] - keys = self.shell.GetKeys(person['key_ids']) - - # Delete all stale keys - key_exists = False - for key in keys: - if new_key != key['key']: - self.shell.DeleteKey(key['key_id']) - else: - key_exists = True - if not key_exists: - self.shell.AddPersonKey(pointer, {'key_type': 'ssh', 'key': new_key}) + # needs to be improved + self.shell.addUserKey({'user_id': pointer, 'key': new_key}) elif type == "node": - self.shell.UpdateNode(pointer, new_sfa_record) + self.shell.updateNode({'node_id': pointer, 'fields': new_sfa_record}) return True - """ - pass + ########## def remove (self, sfa_record): - """ + type=sfa_record['type'] pointer=sfa_record['pointer'] if type == 'user': - persons = self.shell.getUsers(pointer) - # only delete this person if he has site ids. if he doesnt, it probably means - # he was just removed from a site, not actually deleted - if persons and persons[0]['site_ids']: - self.shell.DeletePerson(pointer) + self.shell.deleteUser({'user_id': pointer}) elif type == 'slice': - if self.shell.GetSlices(pointer): - self.shell.DeleteSlice(pointer) + self.shell.deleteSlice({'slice_id': pointer}) elif type == 'node': - if self.shell.GetNodes(pointer): - self.shell.DeleteNode(pointer) - elif type == 'authority': - if self.shell.GetSites(pointer): - self.shell.DeleteSite(pointer) + self.shell.deleteNode({'node_id': pointer}) return True - """ - pass + ## # Convert SFA fields to NITOS fields for use when registering or updating - # registry record in the PLC database + # registry record in the NITOS Scheduler database # def sfa_fields_to_nitos_fields(self, type, hrn, sfa_record): @@ -218,136 +214,114 @@ class NitosDriver (Driver): nitos_record = {} if type == "slice": - nitos_record["name"] = hrn_to_nitos_slicename(hrn) + nitos_record["slice_name"] = hrn_to_nitos_slicename(hrn) elif type == "node": - if not "hostname" in nitos_record: - # fetch from sfa_record - if "hostname" not in sfa_record: - raise MissingSfaInfo("hostname") - nitos_record["name"] = sfa_record["hostname"] - elif type == "authority": - nitos_record["name"] = NitosXrn(xrn=hrn,type='authority').nitos_login_base() - if "name" not in sfa_record: - nitos_record["name"] = hrn + if "hostname" not in sfa_record: + raise MissingSfaInfo("hostname") + nitos_record["node_name"] = sfa_record["hostname"] return nitos_record #################### def fill_record_info(self, records): """ - Given a (list of) SFA record, fill in the PLC specific + Given a (list of) SFA record, fill in the NITOS specific and SFA specific fields in the record. """ if not isinstance(records, list): records = [records] - self.fill_record_pl_info(records) + self.fill_record_nitos_info(records) self.fill_record_hrns(records) self.fill_record_sfa_info(records) return records - def fill_record_pl_info(self, records): + def fill_record_nitos_info(self, records): """ - Fill in the planetlab specific fields of a SFA record. This - involves calling the appropriate PLC method to retrieve the + Fill in the nitos specific fields of a SFA record. This + involves calling the appropriate NITOS API method to retrieve the database record for the object. @param record: record to fill in field (in/out param) """ - """ + # get ids by type - node_ids, site_ids, slice_ids = [], [], [] - person_ids, key_ids = [], [] - type_map = {'node': node_ids, 'authority': site_ids, - 'slice': slice_ids, 'user': person_ids} + node_ids, slice_ids = [], [] + user_ids, key_ids = [], [] + type_map = {'node': node_ids, 'slice': slice_ids, 'user': user_ids} for record in records: for type in type_map: if type == record['type']: type_map[type].append(record['pointer']) - # get pl records - nodes, sites, slices, persons, keys = {}, {}, {}, {}, {} + # get nitos records + nodes, slices, users, keys = {}, {}, {}, {} if node_ids: - node_list = self.shell.GetNodes(node_ids) + all_nodes = self.convert_id(self.shell.getNodes({}, [])) + node_list = [node for node in all_nodes if node['node_id'] in node_ids] nodes = list_to_dict(node_list, 'node_id') - if site_ids: - site_list = self.shell.GetSites(site_ids) - sites = list_to_dict(site_list, 'site_id') if slice_ids: - slice_list = self.shell.GetSlices(slice_ids) + all_slices = self.convert_id(self.shell.getSlices({}, [])) + slice_list = [slice for slice in all_slices if slice['slice_id'] in slice_ids] slices = list_to_dict(slice_list, 'slice_id') - if person_ids: - person_list = self.shell.getUsers(person_ids) - persons = list_to_dict(person_list, 'person_id') - for person in persons: - key_ids.extend(persons[person]['key_ids']) + if user_ids: + all_users = self.convert_id(self.shell.getUsers()) + user_list = [user for user in all_users if user['user_id'] in user_ids] + users = list_to_dict(user_list, 'user_id') - pl_records = {'node': nodes, 'authority': sites, - 'slice': slices, 'user': persons} + nitos_records = {'node': nodes, 'slice': slices, 'user': users} - if key_ids: - key_list = self.shell.GetKeys(key_ids) - keys = list_to_dict(key_list, 'key_id') # fill record info for record in records: - # records with pointer==-1 do not have plc info. - # for example, the top level authority records which are - # authorities, but not PL "sites" if record['pointer'] == -1: continue - for type in pl_records: + for type in nitos_records: if record['type'] == type: - if record['pointer'] in pl_records[type]: - record.update(pl_records[type][record['pointer']]) + if record['pointer'] in nitos_records[type]: + record.update(nitos_records[type][record['pointer']]) break # fill in key info if record['type'] == 'user': - if 'key_ids' not in record: - logger.info("user record has no 'key_ids' - need to import from myplc ?") - else: - pubkeys = [keys[key_id]['key'] for key_id in record['key_ids'] if key_id in keys] - record['keys'] = pubkeys + if record['pointer'] in nitos_records['user']: + record['keys'] = nitos_records['user'][record['pointer']]['keys'] return records - """ - pass + + def fill_record_hrns(self, records): """ - convert pl ids to hrns - """ + convert nitos ids to hrns """ + # get ids - slice_ids, person_ids, site_ids, node_ids = [], [], [], [] + slice_ids, user_ids, node_ids = [], [], [] for record in records: - if 'site_id' in record: - site_ids.append(record['site_id']) - if 'site_ids' in record: - site_ids.extend(record['site_ids']) - if 'person_ids' in record: - person_ids.extend(record['person_ids']) + if 'user_ids' in record: + user_ids.extend(record['user_ids']) if 'slice_ids' in record: slice_ids.extend(record['slice_ids']) if 'node_ids' in record: node_ids.extend(record['node_ids']) - # get pl records - slices, persons, sites, nodes = {}, {}, {}, {} - if site_ids: - site_list = self.shell.GetSites(site_ids, ['site_id', 'login_base']) - sites = list_to_dict(site_list, 'site_id') - if person_ids: - person_list = self.shell.getUsers(person_ids, ['person_id', 'email']) - persons = list_to_dict(person_list, 'person_id') - if slice_ids: - slice_list = self.shell.GetSlices(slice_ids, ['slice_id', 'name']) - slices = list_to_dict(slice_list, 'slice_id') + # get nitos records + slices, users, nodes = {}, {}, {} if node_ids: - node_list = self.shell.GetNodes(node_ids, ['node_id', 'hostname']) + all_nodes = self.convert_id(self.shell.getNodes({}, [])) + node_list = [node for node in all_nodes if node['node_id'] in node_ids] nodes = list_to_dict(node_list, 'node_id') + if slice_ids: + all_slices = self.convert_id(self.shell.getSlices({}, [])) + slice_list = [slice for slice in all_slices if slice['slice_id'] in slice_ids] + slices = list_to_dict(slice_list, 'slice_id') + if user_ids: + all_users = self.convert_id(self.shell.getUsers()) + user_list = [user for user in all_users if user['user_id'] in user_ids] + users = list_to_dict(user_list, 'user_id') + # convert ids to hrns for record in records: @@ -355,22 +329,16 @@ class NitosDriver (Driver): type = record['type'] pointer = record['pointer'] auth_hrn = self.hrn - login_base = '' + testbed_name = self.testbedInfo['name'] if pointer == -1: continue - - if 'site_id' in record: - site = sites[record['site_id']] - login_base = site['login_base'] - record['site'] = ".".join([auth_hrn, login_base]) - if 'person_ids' in record: - emails = [persons[person_id]['email'] for person_id in record['person_ids'] \ - if person_id in persons] - usernames = [email.split('@')[0] for email in emails] - person_hrns = [".".join([auth_hrn, login_base, username]) for username in usernames] - record['persons'] = person_hrns + if 'user_ids' in record: + usernames = [users[user_id]['username'] for user_id in record['user_ids'] \ + if user_id in users] + user_hrns = [".".join([auth_hrn, testbed_name, username]) for username in usernames] + record['users'] = user_hrns if 'slice_ids' in record: - slicenames = [slices[slice_id]['name'] for slice_id in record['slice_ids'] \ + slicenames = [slices[slice_id]['slice_name'] for slice_id in record['slice_ids'] \ if slice_id in slices] slice_hrns = [slicename_to_hrn(auth_hrn, slicename) for slicename in slicenames] record['slices'] = slice_hrns @@ -379,11 +347,6 @@ class NitosDriver (Driver): if node_id in nodes] node_hrns = [hostname_to_hrn(auth_hrn, login_base, hostname) for hostname in hostnames] record['nodes'] = node_hrns - if 'site_ids' in record: - login_bases = [sites[site_id]['login_base'] for site_id in record['site_ids'] \ - if site_id in sites] - site_hrns = [".".join([auth_hrn, lbase]) for lbase in login_bases] - record['sites'] = site_hrns if 'expires' in record: date = utcparse(record['expires']) @@ -391,106 +354,50 @@ class NitosDriver (Driver): record['expires'] = datestring return records - """ - pass def fill_record_sfa_info(self, records): - """ + def startswith(prefix, values): return [value for value in values if value.startswith(prefix)] - # get person ids - person_ids = [] - site_ids = [] + # get user ids + user_ids = [] for record in records: - person_ids.extend(record.get("person_ids", [])) - site_ids.extend(record.get("site_ids", [])) - if 'site_id' in record: - site_ids.append(record['site_id']) - - # get all pis from the sites we've encountered - # and store them in a dictionary keyed on site_id - site_pis = {} - if site_ids: - pi_filter = {'|roles': ['pi'], '|site_ids': site_ids} - pi_list = self.shell.getUsers(pi_filter, ['person_id', 'site_ids']) - for pi in pi_list: - # we will need the pi's hrns also - person_ids.append(pi['person_id']) - - # we also need to keep track of the sites these pis - # belong to - for site_id in pi['site_ids']: - if site_id in site_pis: - site_pis[site_id].append(pi) - else: - site_pis[site_id] = [pi] - - # get sfa records for all records associated with these records. - # we'll replace pl ids (person_ids) with hrns from the sfa records - # we obtain + user_ids.extend(record.get("user_ids", [])) # get the registry records - person_list, persons = [], {} - person_list = dbsession.query (RegRecord).filter(RegRecord.pointer.in_(person_ids)) + user_list, users = [], {} + user_list = dbsession.query(RegRecord).filter(RegRecord.pointer.in_(user_ids)).all() # create a hrns keyed on the sfa record's pointer. # Its possible for multiple records to have the same pointer so # the dict's value will be a list of hrns. - persons = defaultdict(list) - for person in person_list: - persons[person.pointer].append(person) + users = defaultdict(list) + for user in user_list: + users[user.pointer].append(user) + + # get the nitos records + nitos_user_list, nitos_users = [], {} + nitos_all_users = self.convert_id(self.shell.getUsers()) + nitos_user_list = [user for user in nitos_all_users if user['user_id'] in user_ids] + nitos_users = list_to_dict(nitos_user_list, 'user_id') - # get the pl records - pl_person_list, pl_persons = [], {} - pl_person_list = self.shell.getUsers(person_ids, ['person_id', 'roles']) - pl_persons = list_to_dict(pl_person_list, 'person_id') # fill sfa info for record in records: - # skip records with no pl info (top level authorities) - #if record['pointer'] == -1: - # continue + if record['pointer'] == -1: + continue + sfa_info = {} type = record['type'] logger.info("fill_record_sfa_info - incoming record typed %s"%type) if (type == "slice"): # all slice users are researchers record['geni_urn'] = hrn_to_urn(record['hrn'], 'slice') - record['PI'] = [] record['researcher'] = [] - for person_id in record.get('person_ids', []): - hrns = [person.hrn for person in persons[person_id]] + for user_id in record.get('user_ids', []): + hrns = [user.hrn for user in users[user_id]] record['researcher'].extend(hrns) - - # pis at the slice's site - if 'site_id' in record and record['site_id'] in site_pis: - pl_pis = site_pis[record['site_id']] - pi_ids = [pi['person_id'] for pi in pl_pis] - for person_id in pi_ids: - hrns = [person.hrn for person in persons[person_id]] - record['PI'].extend(hrns) - record['geni_creator'] = record['PI'] - elif (type.startswith("authority")): - record['url'] = None - logger.info("fill_record_sfa_info - authority xherex") - if record['pointer'] != -1: - record['PI'] = [] - record['operator'] = [] - record['owner'] = [] - for pointer in record.get('person_ids', []): - if pointer not in persons or pointer not in pl_persons: - # this means there is not sfa or pl record for this user - continue - hrns = [person.hrn for person in persons[pointer]] - roles = pl_persons[pointer]['roles'] - if 'pi' in roles: - record['PI'].extend(hrns) - if 'tech' in roles: - record['operator'].extend(hrns) - if 'admin' in roles: - record['owner'].extend(hrns) - # xxx TODO: OrganizationName elif (type == "node"): sfa_info['dns'] = record.get("hostname", "") # xxx TODO: URI, LatLong, IP, DNS @@ -502,38 +409,26 @@ class NitosDriver (Driver): sfa_info['geni_certificate'] = record['gid'] # xxx TODO: PostalAddress, Phone record.update(sfa_info) - """ - pass #################### - # plcapi works by changes, compute what needs to be added/deleted def update_relation (self, subject_type, target_type, relation_name, subject_id, target_ids): - """ - # hard-wire the code for slice/user for now, could be smarter if needed + if subject_type =='slice' and target_type == 'user' and relation_name == 'researcher': - subject=self.shell.GetSlices (subject_id)[0] - current_target_ids = subject['person_ids'] + subject=self.shell.getSlices ({'slice_id': subject_id}, [])[0] + current_target_ids = subject['user_ids'] add_target_ids = list ( set (target_ids).difference(current_target_ids)) del_target_ids = list ( set (current_target_ids).difference(target_ids)) logger.debug ("subject_id = %s (type=%s)"%(subject_id,type(subject_id))) for target_id in add_target_ids: - self.shell.AddPersonToSlice (target_id,subject_id) + self.shell.addUserToSlice ({'user_id': target_id, 'slice_id': subject_id}) logger.debug ("add_target_id = %s (type=%s)"%(target_id,type(target_id))) for target_id in del_target_ids: logger.debug ("del_target_id = %s (type=%s)"%(target_id,type(target_id))) - self.shell.DeletePersonFromSlice (target_id, subject_id) - elif subject_type == 'authority' and target_type == 'user' and relation_name == 'pi': - # due to the plcapi limitations this means essentially adding pi role to all people in the list - # it's tricky to remove any pi role here, although it might be desirable - persons = self.shell.getUsers (target_ids) - for person in persons: - if 'pi' not in person['roles']: - self.shell.AddRoleToPerson('pi',person['person_id']) + self.shell.deleteUserFromSlice ({'user_id': target_id, 'slice_id': subject_id}) else: logger.info('unexpected relation %s to maintain, %s -> %s'%(relation_name,subject_type,target_type)) - """ - pass + ######################################## ########## aggregate oriented ######################################## @@ -566,10 +461,8 @@ class NitosDriver (Driver): # get data from db slices = self.shell.getSlices({}, []) - # get site name - #site_name = self.shell.getTestbedInfo()['site_name'] - site_name = "nitos" - slice_hrns = [slicename_to_hrn(self.hrn, site_name, slice['slice_name']) for slice in slices] + testbed_name = self.testbedInfo['name'] + slice_hrns = [slicename_to_hrn(self.hrn, testbed_name, slice['slice_name']) for slice in slices] slice_urns = [hrn_to_urn(slice_hrn, 'slice') for slice_hrn in slice_hrns] # cache the result @@ -637,66 +530,57 @@ class NitosDriver (Driver): raise SliverDoesNotExist("%s (used %s as slicename internally)" % (slice_hrn, slicename)) # report about the reserved nodes only - reserved_nodes = self.shell.getReservedNodes() - nodes = self.shell.getNodes() + reserved_nodes = self.shell.getReservedNodes({}, []) + nodes = self.shell.getNodes({}, []) - user_reserved_nodes = [] + slice_reserved_nodes = [] for r_node in reserved_nodes: if r_node['slice_id'] == slice['slice_id']: for node in nodes: - if node['id'] == r_node['node_id']: - user_reserved_nodes.append(node) + if node['node_id'] == r_node['node_id']: + slice_reserved_nodes.append(node) - if len(user_reserved_nodes) == 0: + if len(slice_reserved_nodes) == 0: raise SliverDoesNotExist("You have not allocated any slivers here") ##### continue from here # get login info user = {} - if slice['person_ids']: - persons = self.shell.GetPersons(slice['person_ids'], ['key_ids']) - key_ids = [key_id for person in persons for key_id in person['key_ids']] - person_keys = self.shell.GetKeys(key_ids) - keys = [key['key'] for key in person_keys] + keys = [] + if slice['user_id']: + users = self.shell.getUsers() + # filter users on slice['user_ids'] + for usr in users: + if usr['user_id'] in slice['user_id']: + keys.extend(usr['keys']) + user.update({'urn': slice_urn, - 'login': slice['name'], + 'login': slice['slice_name'], 'protocol': ['ssh'], 'port': ['22'], 'keys': keys}) - site_ids = [node['site_id'] for node in nodes] result = {} top_level_status = 'unknown' - if nodes: + if slice_reserved_nodes: top_level_status = 'ready' result['geni_urn'] = slice_urn - result['pl_login'] = slice['name'] - result['pl_expires'] = datetime_to_string(utcparse(slice['expires'])) - result['geni_expires'] = datetime_to_string(utcparse(slice['expires'])) + result['nitos_gateway_login'] = slice['slice_name'] + #result['pl_expires'] = datetime_to_string(utcparse(slice['expires'])) + #result['geni_expires'] = datetime_to_string(utcparse(slice['expires'])) resources = [] - for node in nodes: + for node in slice_reserved_nodes: res = {} - res['pl_hostname'] = node['hostname'] - res['pl_boot_state'] = node['boot_state'] - res['pl_last_contact'] = node['last_contact'] - res['geni_expires'] = datetime_to_string(utcparse(slice['expires'])) - if node['last_contact'] is not None: - - res['pl_last_contact'] = datetime_to_string(utcparse(node['last_contact'])) - sliver_id = Xrn(slice_urn, type='slice', id=node['node_id'], authority=self.hrn).urn + res['nitos_hostname'] = node['hostname'] + sliver_id = Xrn(slice_urn, type='slice', id=node['node_id']).urn res['geni_urn'] = sliver_id - if node['boot_state'] == 'boot': - res['geni_status'] = 'ready' - else: - res['geni_status'] = 'failed' - top_level_status = 'failed' - + res['geni_status'] = 'ready' res['geni_error'] = '' res['users'] = [user] @@ -711,74 +595,54 @@ class NitosDriver (Driver): aggregate = NitosAggregate(self) slices = NitosSlices(self) - peer = slices.get_peer(slice_hrn) sfa_peer = slices.get_sfa_peer(slice_hrn) slice_record=None if users: slice_record = users[0].get('slice_record', {}) # parse rspec - rspec = RSpec(rspec_string) - requested_attributes = rspec.version.get_slice_attributes() + rspec = RSpec(rspec_string, version='NITOS 1') - # ensure site record exists - site = slices.verify_site(slice_hrn, slice_record, peer, sfa_peer, options=options) # ensure slice record exists - slice = slices.verify_slice(slice_hrn, slice_record, peer, sfa_peer, options=options) - # ensure person records exists - persons = slices.verify_persons(slice_hrn, slice, users, peer, sfa_peer, options=options) - # ensure slice attributes exists - slices.verify_slice_attributes(slice, requested_attributes, options=options) + slice = slices.verify_slice(slice_hrn, slice_record, sfa_peer, options=options) + # ensure user records exists + #users = slices.verify_users(slice_hrn, slice, users, sfa_peer, options=options) # add/remove slice from nodes - requested_slivers = [] - for node in rspec.version.get_nodes_with_slivers(): - hostname = None - if node.get('component_name'): - hostname = node.get('component_name').strip() - elif node.get('component_id'): - hostname = xrn_to_hostname(node.get('component_id').strip()) - if hostname: - requested_slivers.append(hostname) - nodes = slices.verify_slice_nodes(slice, requested_slivers, peer) + #requested_slivers = [] + #for node in rspec.version.get_nodes_with_slivers(): + # hostname = None + # if node.get('component_name'): + # hostname = node.get('component_name').strip() + # elif node.get('component_id'): + # hostname = xrn_to_hostname(node.get('component_id').strip()) + # if hostname: + # requested_slivers.append(hostname) + #nodes = slices.verify_slice_nodes(slice, requested_slivers, peer) - # add/remove links links - slices.verify_slice_links(slice, rspec.version.get_link_requests(), nodes) + # add/remove channels + # add/remove leases - requested_leases = [] - kept_leases = [] - for lease in rspec.version.get_leases(): - requested_lease = {} - if not lease.get('lease_id'): - requested_lease['hostname'] = xrn_to_hostname(lease.get('component_id').strip()) - requested_lease['start_time'] = lease.get('start_time') - requested_lease['duration'] = lease.get('duration') - else: - kept_leases.append(int(lease['lease_id'])) - if requested_lease.get('hostname'): - requested_leases.append(requested_lease) + # a lease in Nitos RSpec case is a reservation of nodes and channels grouped by (slice,timeslot) + rspec_requested_nodes, rspec_requested_channels = rspec.version.get_leases() + print rspec_requested_nodes, rspec_requested_channels + + nodes = slices.verify_slice_leases_nodes(slice, rspec_requested_nodes) + channels = slices.verify_slice_leases_channels(slice, rspec_requested_channels) - leases = slices.verify_slice_leases(slice, requested_leases, kept_leases, peer) - return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version) def delete_sliver (self, slice_urn, slice_hrn, creds, options): slicename = hrn_to_nitos_slicename(slice_hrn) - slices = self.shell.GetSlices({'name': slicename}) + slices = self.shell.getSlices({'slice_name': slicename}) if not slices: return 1 slice = slices[0] - # determine if this is a peer slice - # xxx I wonder if this would not need to use PlSlices.get_peer instead - # in which case plc.peers could be deprecated as this here - # is the only/last call to this last method in plc.peers - peer = peers.get_peer(self, slice_hrn) try: - if peer: - self.shell.UnBindObjectFromPeer('slice', slice['slice_id'], peer) - self.shell.DeleteSliceFromNodes(slicename, slice['node_ids']) + pass + #self.shell.DeleteSliceFromNodes({'slice_name': slicename, slice['node_ids']}) finally: if peer: self.shell.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id']) @@ -786,7 +650,7 @@ class NitosDriver (Driver): def renew_sliver (self, slice_urn, slice_hrn, creds, expiration_time, options): slicename = hrn_to_nitos_slicename(slice_hrn) - slices = self.shell.GetSlices({'name': slicename}, ['slice_id']) + slices = self.shell.GetSlices({'slicename': slicename}, ['slice_id']) if not slices: raise RecordNotFound(slice_hrn) slice = slices[0] @@ -794,6 +658,7 @@ class NitosDriver (Driver): record = {'expires': int(datetime_to_epoch(requested_time))} try: self.shell.UpdateSlice(slice['slice_id'], record) + return True except: return False