X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fregistry_manager.py;h=f6f55edab33d14d8bca632e49b96969bfcae3f8b;hb=6872209af2d5ec927820f2b333b8d3b112260957;hp=7b9ebc57b25f7dc1f8052d13b5abbbc7a560daba;hpb=87746d32bee6d2a4e67f7bebd074727eced8dc30;p=sfa.git diff --git a/sfa/managers/registry_manager.py b/sfa/managers/registry_manager.py index 7b9ebc57..f6f55eda 100644 --- a/sfa/managers/registry_manager.py +++ b/sfa/managers/registry_manager.py @@ -1,5 +1,4 @@ import types -import time # for get_key_from_incoming_ip import tempfile import os @@ -7,33 +6,41 @@ import commands from sfa.util.faults import RecordNotFound, AccountNotEnabled, PermissionError, MissingAuthority, \ UnknownSfaType, ExistingRecord, NonExistingRecord +from sfa.util.sfatime import utcparse, datetime_to_epoch from sfa.util.prefixTree import prefixTree -from sfa.util.record import SfaRecord -from sfa.util.table import SfaTable -from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn, urn_to_hrn -from sfa.util.plxrn import hrn_to_pl_login_base +from sfa.util.xrn import Xrn, get_authority, hrn_to_urn, urn_to_hrn from sfa.util.version import version_core +from sfa.util.sfalogging import logger from sfa.trust.gid import GID from sfa.trust.credential import Credential from sfa.trust.certificate import Certificate, Keypair, convert_public_key from sfa.trust.gid import create_uuid +from sfa.storage.model import make_record, RegRecord, RegAuthority, RegUser, RegSlice, RegKey, \ + augment_with_sfa_builtins +from sfa.storage.alchemy import dbsession +### the types that we need to exclude from sqlobjects before being able to dump +# them on the xmlrpc wire +from sqlalchemy.orm.collections import InstrumentedList + class RegistryManager: - def __init__ (self): pass + def __init__ (self, config): pass # The GENI GetVersion call - def GetVersion(self, api): - peers = dict ( [ (hrn,interface._ServerProxy__host) for (hrn,interface) in api.registries.iteritems() + def GetVersion(self, api, options): + peers = dict ( [ (hrn,interface.get_url()) for (hrn,interface) in api.registries.iteritems() if hrn != api.hrn]) xrn=Xrn(api.hrn) return version_core({'interface':'registry', + 'sfa': 2, + 'geni_api': 2, 'hrn':xrn.get_hrn(), 'urn':xrn.get_urn(), 'peers':peers}) - def GetCredential(self, api, xrn, type, is_self=False): + def GetCredential(self, api, xrn, type, caller_xrn=None): # convert xrn to hrn if type: hrn = urn_to_hrn(xrn)[0] @@ -44,37 +51,36 @@ class RegistryManager: auth_hrn = api.auth.get_authority(hrn) if not auth_hrn or hrn == api.config.SFA_INTERFACE_HRN: auth_hrn = hrn - # get record info auth_info = api.auth.get_auth_info(auth_hrn) - table = SfaTable() - records = table.findObjects({'type': type, 'hrn': hrn}) - if not records: - raise RecordNotFound(hrn) - record = records[0] - - # verify_cancreate_credential requires that the member lists - # (researchers, pis, etc) be filled in - api.driver.fill_record_info(record, api.aggregates) - if record['type']=='user': - if not record['enabled']: - raise AccountNotEnabled(": PlanetLab account %s is not enabled. Please contact your site PI" %(record['email'])) - + # get record info + record=dbsession.query(RegRecord).filter_by(type=type,hrn=hrn).first() + if not record: + raise RecordNotFound("hrn=%s, type=%s"%(hrn,type)) + # get the callers gid - # if this is a self cred the record's gid is the caller's gid - if is_self: + # if caller_xrn is not specified assume the caller is the record + # object itself. + if not caller_xrn: caller_hrn = hrn caller_gid = record.get_gid_object() else: - caller_gid = api.auth.client_cred.get_gid_caller() - caller_hrn = caller_gid.get_hrn() - + caller_hrn, caller_type = urn_to_hrn(caller_xrn) + if caller_type: + caller_record = dbsession.query(RegRecord).filter_by(hrn=caller_hrn,type=caller_type).first() + else: + caller_record = dbsession.query(RegRecord).filter_by(hrn=caller_hrn).first() + if not caller_record: + raise RecordNotFound("Unable to associated caller (hrn=%s, type=%s) with credential for (hrn: %s, type: %s)"%(caller_hrn, caller_type, hrn, type)) + caller_gid = GID(string=caller_record.gid) + object_hrn = record.get_gid_object().get_hrn() + # call the builtin authorization/credential generation engine rights = api.auth.determine_user_rights(caller_hrn, record) # make sure caller has rights to this object if rights.is_empty(): - raise PermissionError(caller_hrn + " has no rights to " + record['name']) - - object_gid = GID(string=record['gid']) + raise PermissionError("%s has no rights to %s (%s)" % \ + (caller_hrn, object_hrn, xrn)) + object_gid = GID(string=record.gid) new_cred = Credential(subject = object_gid.get_subject()) new_cred.set_gid_caller(caller_gid) new_cred.set_gid_object(object_gid) @@ -82,8 +88,10 @@ class RegistryManager: #new_cred.set_pubkey(object_gid.get_pubkey()) new_cred.set_privileges(rights) new_cred.get_privileges().delegate_all_privileges(True) - if 'expires' in record: - new_cred.set_expiration(int(record['expires'])) + if hasattr(record,'expires'): + date = utcparse(record.expires) + expires = datetime_to_epoch(date) + new_cred.set_expiration(int(expires)) auth_kind = "authority,ma,sa" # Parent not necessary, verify with certs #new_cred.set_parent(api.auth.hierarchy.get_auth_cred(auth_hrn, kind=auth_kind)) @@ -93,17 +101,20 @@ class RegistryManager: return new_cred.save_to_string(save_parents=True) - def Resolve(self, api, xrns, type=None, full=True): + # the default for full, which means 'dig into the testbed as well', should be false + def Resolve(self, api, xrns, type=None, details=False): - # load all known registry names into a prefix tree and attempt to find - # the longest matching prefix if not isinstance(xrns, types.ListType): + # try to infer type if not set and we get a single input if not type: type = Xrn(xrns).get_type() xrns = [xrns] hrns = [urn_to_hrn(xrn)[0] for xrn in xrns] - # create a dict where key is a registry hrn and its value is a - # hrns at that registry (determined by the known prefix tree). + + # load all known registry names into a prefix tree and attempt to find + # the longest matching prefix + # create a dict where key is a registry hrn and its value is a list + # of hrns at that registry (determined by the known prefix tree). xrn_dict = {} registries = api.registries tree = prefixTree() @@ -129,33 +140,58 @@ class RegistryManager: credential = api.getCredential() interface = api.registries[registry_hrn] server_proxy = api.server_proxy(interface, credential) + # should propagate the details flag but that's not supported in the xmlrpc interface yet + #peer_records = server_proxy.Resolve(xrns, credential,type, details=details) peer_records = server_proxy.Resolve(xrns, credential) - records.extend([SfaRecord(dict=record).as_dict() for record in peer_records]) + # pass foreign records as-is + # previous code used to read + # records.extend([SfaRecord(dict=record).as_dict() for record in peer_records]) + # not sure why the records coming through xmlrpc had to be processed at all + records.extend(peer_records) # try resolving the remaining unfound records at the local registry - remaining_hrns = set(hrns).difference([record['hrn'] for record in records]) - # convert set to list - remaining_hrns = [hrn for hrn in remaining_hrns] - table = SfaTable() - local_records = table.findObjects({'hrn': remaining_hrns}) - if full: - api.driver.fill_record_info(local_records, api.aggregates) + local_hrns = list ( set(hrns).difference([record['hrn'] for record in records]) ) + # + local_records = dbsession.query(RegRecord).filter(RegRecord.hrn.in_(local_hrns)) + if type: + local_records = local_records.filter_by(type=type) + local_records=local_records.all() + + for local_record in local_records: + augment_with_sfa_builtins (local_record) + + logger.info("Resolve, (details=%s,type=%s) local_records=%s "%(details,type,local_records)) + local_dicts = [ record.__dict__ for record in local_records ] - # convert local record objects to dicts - records.extend([dict(record) for record in local_records]) + if details: + # in details mode we get as much info as we can, which involves contacting the + # testbed for getting implementation details about the record + self.driver.augment_records_with_testbed_info(local_dicts) + # also we fill the 'url' field for known authorities + # used to be in the driver code, sounds like a poorman thing though + def solve_neighbour_url (record): + if not record.type.startswith('authority'): return + hrn=record.hrn + for neighbour_dict in [ api.aggregates, api.registries ]: + if hrn in neighbour_dict: + record.url=neighbour_dict[hrn].get_url() + return + for record in local_records: solve_neighbour_url (record) + # convert local record objects to dicts for xmlrpc + # xxx somehow here calling dict(record) issues a weird error + # however record.todict() seems to work fine + # records.extend( [ dict(record) for record in local_records ] ) + records.extend( [ record.todict(exclude_types=[InstrumentedList]) for record in local_records ] ) + if not records: raise RecordNotFound(str(hrns)) - if type: - records = filter(lambda rec: rec['type'] in [type], records) - return records - def List(self, api, xrn, origin_hrn=None): - hrn, type = urn_to_hrn(xrn) + def List (self, api, xrn, origin_hrn=None, options={}): # load all know registry names into a prefix tree and attempt to find # the longest matching prefix - records = [] + hrn, type = urn_to_hrn(xrn) registries = api.registries registry_hrns = registries.keys() tree = prefixTree() @@ -167,23 +203,36 @@ class RegistryManager: raise MissingAuthority(xrn) # if the best match (longest matching hrn) is not the local registry, # forward the request - records = [] + record_dicts = [] if registry_hrn != api.hrn: credential = api.getCredential() interface = api.registries[registry_hrn] server_proxy = api.server_proxy(interface, credential) - record_list = server_proxy.List(xrn, credential) - records = [SfaRecord(dict=record).as_dict() for record in record_list] + record_list = server_proxy.List(xrn, credential, options) + # same as above, no need to process what comes from through xmlrpc + # pass foreign records as-is + record_dicts = record_list # if we still have not found the record yet, try the local registry - if not records: + if not record_dicts: + recursive = False + if ('recursive' in options and options['recursive']): + recursive = True + elif hrn.endswith('*'): + hrn = hrn[:-1] + recursive = True + if not api.auth.hierarchy.auth_exists(hrn): raise MissingAuthority(hrn) + if recursive: + records = dbsession.query(RegRecord).filter(RegRecord.hrn.startswith(hrn)) + else: + records = dbsession.query(RegRecord).filter_by(authority=hrn) + # so that sfi list can show more than plain names... + for record in records: augment_with_sfa_builtins (record) + record_dicts=[ record.todict(exclude_types=[InstrumentedList]) for record in records ] - table = SfaTable() - records = table.find({'authority': hrn}) - - return records + return record_dicts def CreateGid(self, api, xrn, cert): @@ -197,216 +246,186 @@ class RegistryManager: pkey = certificate.get_pubkey() gid = api.auth.hierarchy.create_gid(xrn, create_uuid(), pkey) return gid.save_to_string(save_parents=True) + + #################### + # utility for handling relationships among the SFA objects + + # subject_record describes the subject of the relationships + # ref_record contains the target values for the various relationships we need to manage + # (to begin with, this is just the slice x person (researcher) and authority x person (pi) relationships) + def update_driver_relations (self, subject_obj, ref_obj): + type=subject_obj.type + #for (k,v) in subject_obj.__dict__.items(): print k,'=',v + if type=='slice' and hasattr(ref_obj,'researcher'): + self.update_driver_relation(subject_obj, ref_obj.researcher, 'user', 'researcher') + elif type=='authority' and hasattr(ref_obj,'pi'): + self.update_driver_relation(subject_obj,ref_obj.pi, 'user', 'pi') - def Register(self, api, record): + # field_key is the name of one field in the record, typically 'researcher' for a 'slice' record + # hrns is the list of hrns that should be linked to the subject from now on + # target_type would be e.g. 'user' in the 'slice' x 'researcher' example + def update_driver_relation (self, record_obj, hrns, target_type, relation_name): + # locate the linked objects in our db + subject_type=record_obj.type + subject_id=record_obj.pointer + # get the 'pointer' field of all matching records + link_id_tuples = dbsession.query(RegRecord.pointer).filter_by(type=target_type).filter(RegRecord.hrn.in_(hrns)).all() + # sqlalchemy returns named tuples for columns + link_ids = [ tuple.pointer for tuple in link_id_tuples ] + self.driver.update_relation (subject_type, target_type, relation_name, subject_id, link_ids) + + def Register(self, api, record_dict): - hrn, type = record['hrn'], record['type'] + hrn, type = record_dict['hrn'], record_dict['type'] urn = hrn_to_urn(hrn,type) # validate the type if type not in ['authority', 'slice', 'node', 'user']: raise UnknownSfaType(type) - # check if record already exists - table = SfaTable() - existing_records = table.find({'type': type, 'hrn': hrn}) + # check if record_dict already exists + existing_records = dbsession.query(RegRecord).filter_by(type=type,hrn=hrn).all() if existing_records: raise ExistingRecord(hrn) - record = SfaRecord(dict = record) - record['authority'] = get_authority(record['hrn']) - type = record['type'] - hrn = record['hrn'] - auth_info = api.auth.get_auth_info(record['authority']) + assert ('type' in record_dict) + # returns the right type of RegRecord according to type in record + record = make_record(dict=record_dict) + record.just_created() + record.authority = get_authority(record.hrn) + auth_info = api.auth.get_auth_info(record.authority) pub_key = None # make sure record has a gid - if 'gid' not in record: + if not record.gid: uuid = create_uuid() pkey = Keypair(create=True) - if 'key' in record and record['key']: + if getattr(record,'keys',None): + pub_key=record.keys # use only first key in record - if isinstance(record['key'], types.ListType): - pub_key = record['key'][0] - else: - pub_key = record['key'] + if isinstance(record.keys, types.ListType): + pub_key = record.keys[0] pkey = convert_public_key(pub_key) gid_object = api.auth.hierarchy.create_gid(urn, uuid, pkey) gid = gid_object.save_to_string(save_parents=True) - record['gid'] = gid - record.set_gid(gid) + record.gid = gid - if type in ["authority"]: + if isinstance (record, RegAuthority): # update the tree if not api.auth.hierarchy.auth_exists(hrn): api.auth.hierarchy.create_auth(hrn_to_urn(hrn,'authority')) # get the GID from the newly created authority + auth_info = api.auth.get_auth_info(hrn) gid = auth_info.get_gid_object() - record.set_gid(gid.save_to_string(save_parents=True)) - pl_record = api.driver.sfa_fields_to_pl_fields(type, hrn, record) - sites = api.driver.GetSites([pl_record['login_base']]) - if not sites: - pointer = api.driver.AddSite(pl_record) - else: - pointer = sites[0]['site_id'] - - record.set_pointer(pointer) - record['pointer'] = pointer - - elif (type == "slice"): - acceptable_fields=['url', 'instantiation', 'name', 'description'] - pl_record = api.driver.sfa_fields_to_pl_fields(type, hrn, record) - for key in pl_record.keys(): - if key not in acceptable_fields: - pl_record.pop(key) - slices = api.driver.GetSlices([pl_record['name']]) - if not slices: - pointer = api.driver.AddSlice(pl_record) - else: - pointer = slices[0]['slice_id'] - record.set_pointer(pointer) - record['pointer'] = pointer - - elif (type == "user"): - persons = api.driver.GetPersons([record['email']]) - if not persons: - pointer = api.driver.AddPerson(dict(record)) - else: - pointer = persons[0]['person_id'] - - if 'enabled' in record and record['enabled']: - api.driver.UpdatePerson(pointer, {'enabled': record['enabled']}) - # add this persons to the site only if he is being added for the first - # time by sfa and doesont already exist in plc - if not persons or not persons[0]['site_ids']: - login_base = get_leaf(record['authority']) - api.driver.AddPersonToSite(pointer, login_base) - - # What roles should this user have? - api.driver.AddRoleToPerson('user', pointer) - # Add the user's key - if pub_key: - api.driver.AddPersonKey(pointer, {'key_type' : 'ssh', 'key' : pub_key}) - - elif (type == "node"): - pl_record = api.driver.sfa_fields_to_pl_fields(type, hrn, record) - login_base = hrn_to_pl_login_base(record['authority']) - nodes = api.driver.GetNodes([pl_record['hostname']]) - if not nodes: - pointer = api.driver.AddNode(login_base, pl_record) - else: - pointer = nodes[0]['node_id'] - - record['pointer'] = pointer - record.set_pointer(pointer) - record_id = table.insert(record) - record['record_id'] = record_id + record.gid=gid.save_to_string(save_parents=True) + + # locate objects for relationships + pi_hrns = getattr(record,'pi',None) + if pi_hrns is not None: record.update_pis (pi_hrns) + + elif isinstance (record, RegSlice): + researcher_hrns = getattr(record,'researcher',None) + if researcher_hrns is not None: record.update_researchers (researcher_hrns) + + elif isinstance (record, RegUser): + # create RegKey objects for incoming keys + if hasattr(record,'keys'): + logger.debug ("creating %d keys for user %s"%(len(record.keys),record.hrn)) + record.reg_keys = [ RegKey (key) for key in record.keys ] + + # update testbed-specific data if needed + pointer = self.driver.register (record.__dict__, hrn, pub_key) + + record.pointer=pointer + dbsession.add(record) + dbsession.commit() # update membership for researchers, pis, owners, operators - api.driver.update_membership(None, record) - + self.update_driver_relations (record, record) + return record.get_gid_object().save_to_string(save_parents=True) def Update(self, api, record_dict): - new_record = SfaRecord(dict = record_dict) - type = new_record['type'] - hrn = new_record['hrn'] - urn = hrn_to_urn(hrn,type) - table = SfaTable() + assert ('type' in record_dict) + new_record=make_record(dict=record_dict) + (type,hrn) = (new_record.type, new_record.hrn) + # make sure the record exists - records = table.findObjects({'type': type, 'hrn': hrn}) - if not records: - raise RecordNotFound(hrn) - record = records[0] - record['last_updated'] = time.gmtime() - - # Update_membership needs the membership lists in the existing record - # filled in, so it can see if members were added or removed - api.driver.fill_record_info(record, api.aggregates) + record = dbsession.query(RegRecord).filter_by(type=type,hrn=hrn).first() + if not record: + raise RecordNotFound("hrn=%s, type=%s"%(hrn,type)) + record.just_updated() # Use the pointer from the existing record, not the one that the user # gave us. This prevents the user from inserting a forged pointer - pointer = record['pointer'] + pointer = record.pointer + + # is there a change in keys ? + new_key=None + if type=='user': + if getattr(new_key,'keys',None): + new_key=new_record.keys + if isinstance (new_key,types.ListType): + new_key=new_key[0] + + # take new_key into account + if new_key: + # update the openssl key and gid + pkey = convert_public_key(new_key) + uuid = create_uuid() + urn = hrn_to_urn(hrn,type) + gid_object = api.auth.hierarchy.create_gid(urn, uuid, pkey) + gid = gid_object.save_to_string(save_parents=True) + record.gid = gid + dsession.commit() + + # xxx should do side effects from new_record to record + # not too sure how to do that + # not too big a deal with planetlab as the driver is authoritative, but... + + # update native relations + if isinstance (record, RegSlice): + researcher_hrns = getattr(new_record,'researcher',None) + if researcher_hrns is not None: record.update_researchers (researcher_hrns) + dbsession.commit() + + elif isinstance (record, RegAuthority): + pi_hrns = getattr(new_record,'pi',None) + if pi_hrns is not None: record.update_pis (pi_hrns) + dbsession.commit() + # update the PLC information that was specified with the record - - if (type == "authority"): - api.driver.UpdateSite(pointer, new_record) - - elif type == "slice": - pl_record=api.driver.sfa_fields_to_pl_fields(type, hrn, new_record) - if 'name' in pl_record: - pl_record.pop('name') - api.driver.UpdateSlice(pointer, pl_record) - - 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_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] - api.driver.UpdatePerson(pointer, update_fields) - - if 'key' in new_record and new_record['key']: - # must check this key against the previous one if it exists - persons = api.driver.GetPersons([pointer], ['key_ids']) - person = persons[0] - keys = person['key_ids'] - keys = api.driver.GetKeys(person['key_ids']) - key_exists = False - if isinstance(new_record['key'], types.ListType): - new_key = new_record['key'][0] - else: - new_key = new_record['key'] - - # Delete all stale keys - for key in keys: - if new_record['key'] != key['key']: - api.driver.DeleteKey(key['key_id']) - else: - key_exists = True - if not key_exists: - api.driver.AddPersonKey(pointer, {'key_type': 'ssh', 'key': new_key}) - - # update the openssl key and gid - pkey = convert_public_key(new_key) - uuid = create_uuid() - gid_object = api.auth.hierarchy.create_gid(urn, uuid, pkey) - gid = gid_object.save_to_string(save_parents=True) - record['gid'] = gid - record = SfaRecord(dict=record) - table.update(record) - - elif type == "node": - api.driver.UpdateNode(pointer, new_record) - - else: - raise UnknownSfaType(type) + # xxx oddly enough, without this useless statement, + # record.__dict__ as received by the driver seems to be off + # anyway the driver should receive an object + # (and then extract __dict__ itself if needed) + print "DO NOT REMOVE ME before driver.update, record=%s"%record + if not self.driver.update (record.__dict__, new_record.__dict__, hrn, new_key): + logger.warning("driver.update failed") # update membership for researchers, pis, owners, operators - api.driver.update_membership(record, new_record) + self.update_driver_relations (record, new_record) return 1 # expecting an Xrn instance def Remove(self, api, xrn, origin_hrn=None): - - table = SfaTable() - filter = {'hrn': xrn.get_hrn()} hrn=xrn.get_hrn() type=xrn.get_type() + request=dbsession.query(RegRecord).filter_by(hrn=hrn) if type and type not in ['all', '*']: - filter['type'] = type - - records = table.find(filter) - if not records: raise RecordNotFound(hrn) - record = records[0] - type = record['type'] + request=request.filter_by(type=type) + record = request.first() + if not record: + msg="Could not find hrn %s"%hrn + if type: msg += " type=%s"%type + raise RecordNotFound(msg) + + type = record.type + if type not in ['slice', 'user', 'node', 'authority'] : + raise UnknownSfaType(type) + credential = api.getCredential() registries = api.registries @@ -419,58 +438,46 @@ class RegistryManager: result=registries[registry].remove_peer_object(credential, record, origin_hrn) except: pass - if type == "user": - persons = api.driver.GetPersons(record['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']: - api.driver.DeletePerson(record['pointer']) - elif type == "slice": - if api.driver.GetSlices(record['pointer']): - api.driver.DeleteSlice(record['pointer']) - elif type == "node": - if api.driver.GetNodes(record['pointer']): - api.driver.DeleteNode(record['pointer']) - elif type == "authority": - if api.driver.GetSites(record['pointer']): - api.driver.DeleteSite(record['pointer']) - else: - raise UnknownSfaType(type) - - table.remove(record) + + # call testbed callback first + # IIUC this is done on the local testbed TOO because of the refreshpeer link + if not self.driver.remove(record.__dict__): + logger.warning("driver.remove failed") + + # delete from sfa db + dbsession.delete(record) + dbsession.commit() return 1 + # This is a PLC-specific thing, won't work with other platforms def get_key_from_incoming_ip (self, api): # verify that the callers's ip address exist in the db and is an interface # for a node in the db (ip, port) = api.remote_addr - interfaces = api.driver.GetInterfaces({'ip': ip}, ['node_id']) + interfaces = self.driver.shell.GetInterfaces({'ip': ip}, ['node_id']) if not interfaces: raise NonExistingRecord("no such ip %(ip)s" % locals()) - nodes = api.driver.GetNodes([interfaces[0]['node_id']], ['node_id', 'hostname']) + nodes = self.driver.shell.GetNodes([interfaces[0]['node_id']], ['node_id', 'hostname']) if not nodes: raise NonExistingRecord("no such node using ip %(ip)s" % locals()) node = nodes[0] # look up the sfa record - table = SfaTable() - records = table.findObjects({'type': 'node', 'pointer': node['node_id']}) - if not records: - raise RecordNotFound("pointer:" + str(node['node_id'])) - record = records[0] + record=dbsession.query(RegRecord).filter_by(type='node',pointer=node['node_id']).first() + if not record: + raise RecordNotFound("node with pointer %s"%node['node_id']) # generate a new keypair and gid uuid = create_uuid() pkey = Keypair(create=True) - urn = hrn_to_urn(record['hrn'], record['type']) + urn = hrn_to_urn(record.hrn, record.type) gid_object = api.auth.hierarchy.create_gid(urn, uuid, pkey) gid = gid_object.save_to_string(save_parents=True) - record['gid'] = gid - record.set_gid(gid) + record.gid = gid # update the record - table.update(record) + dbsession.commit() # attempt the scp the key # and gid onto the node