from sfa.trust.certificate import Certificate, Keypair, convert_public_key
from sfa.trust.gid import create_uuid
-from sfa.storage.persistentobjs import RegRecord
+from sfa.storage.model import make_record, RegRecord, RegUser
from sfa.storage.alchemy import dbsession
class RegistryManager:
# get record info
record=dbsession.query(RegRecord).filter_by(type=type,hrn=hrn).first()
if not record:
- raise RecordNotFound(hrn)
+ raise RecordNotFound("hrn=%s, type=%s"%(hrn,type))
# verify_cancreate_credential requires that the member lists
# (researchers, pis, etc) be filled in
return new_cred.save_to_string(save_parents=True)
- def Resolve(self, api, xrns, intype=None, full=True):
+ def Resolve(self, api, xrns, type=None, full=True):
if not isinstance(xrns, types.ListType):
xrns = [xrns]
# try to infer type if not set and we get a single input
- if not intype:
- intype = Xrn(xrns).get_type()
+ if not type:
+ type = Xrn(xrns).get_type()
hrns = [urn_to_hrn(xrn)[0] for xrn in xrns]
# load all known registry names into a prefix tree and attempt to find
credential = api.getCredential()
interface = api.registries[registry_hrn]
server_proxy = api.server_proxy(interface, credential)
- peer_records = server_proxy.Resolve(xrns, credential,intype)
+ peer_records = server_proxy.Resolve(xrns, credential,type)
# 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
local_hrns = list ( set(hrns).difference([record['hrn'] for record in records]) )
#
local_records = dbsession.query(RegRecord).filter(RegRecord.hrn.in_(local_hrns))
- if intype:
- local_records = local_records.filter_by(type=intype)
+ if type:
+ local_records = local_records.filter_by(type=type)
local_records=local_records.all()
+ logger.info("Resolve: local_records=%s (type=%s)"%(local_records,type))
local_dicts = [ record.__dict__ for record in local_records ]
if full:
# in full mode we get as much info as we can, which involves contacting the
# testbed for getting implementation details about the record
- for record in local_dicts: logger.info("resolve augment %s"%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
+ # 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
# 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( [ dict(record) for record in local_records ] )
records.extend( [ record.todict() for record in local_records ] )
if not records:
raise RecordNotFound(str(hrns))
interface = api.registries[registry_hrn]
server_proxy = api.server_proxy(interface, credential)
record_list = server_proxy.List(xrn, credential)
+ # same as above, no need to process what comes from through xmlrpc
# pass foreign records as-is
record_dicts = record_list
raise ExistingRecord(hrn)
assert ('type' in record_dict)
- record = RegRecord("undefined")
- record.set_from_dict(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)
gid = auth_info.get_gid_object()
record.gid=gid.save_to_string(save_parents=True)
+ # post-process / cleanup for relation ships
+ if isinstance (record, RegUser):
+ record.normalize_xml()
+
# update testbed-specific data if needed
pointer = self.driver.register (record.__dict__, hrn, pub_key)
def Update(self, api, record_dict):
assert ('type' in record_dict)
- new_record=RegRecord(type="unknown")
- new_record.set_from_dict(record_dict)
+ new_record=RegRecord(dict=record_dict)
type = new_record.type
hrn = new_record.hrn
# make sure the record exists
record = dbsession.query(RegRecord).filter_by(type=type,hrn=hrn).first()
if not record:
- raise RecordNotFound(hrn)
+ raise RecordNotFound("hrn=%s, type=%s"%(hrn,type))
record.just_updated()
# validate the type
- # xxx might be simpler to just try to commit as this is a constraint in the db
if type not in ['authority', 'slice', 'node', 'user']:
raise UnknownSfaType(type)
raise RecordNotFound(msg)
type = record.type
+ if type not in ['slice', 'user', 'node', 'authority'] :
+ raise UnknownSfaType(type)
+
credential = api.getCredential()
registries = api.registries
logger.warning("driver.remove failed")
# delete from sfa db
- del record
+ dbsession.delete(record)
dbsession.commit()
return 1
- # This is a PLC-specific thing...
+ # 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
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