X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Frecord.py;h=11f46952935ad1d0a7457bee54a5992270b70013;hb=9277a03fd5b813e866746eae78b633d5f614a375;hp=b76e7ea10682ed0db1eec194930faef297c8632e;hpb=9a02d0d6875b127f03ea1abfb87fb3792480f77d;p=sfa.git diff --git a/sfa/util/record.py b/sfa/util/record.py index b76e7ea1..11f46952 100644 --- a/sfa/util/record.py +++ b/sfa/util/record.py @@ -1,5 +1,5 @@ ## -# Implements support for geni records +# Implements support for SFA records # # TODO: Use existing PLC database methods? or keep this separate? ## @@ -11,13 +11,13 @@ from types import StringTypes from sfa.trust.gid import * -import sfa.util.report -from sfa.util.rspec import * from sfa.util.parameter import * +from sfa.util.xrn import get_authority +from sfa.util.row import Row -class GeniRecord(dict): +class SfaRecord(Row): """ - The GeniRecord class implements a Geni Record. A GeniRecord is a tuple + The SfaRecord class implements an SFA Record. A SfaRecord is a tuple (Hrn, GID, Type, Info). Hrn specifies the Human Readable Name of the object @@ -35,17 +35,28 @@ class GeniRecord(dict): of different types. """ + table_name = 'sfa' + + primary_key = 'record_id' + ### the wsdl generator assumes this is named 'fields' + internal_fields = { + 'record_id': Parameter(int, 'An id that uniquely identifies this record', ro=True), + 'pointer': Parameter(int, 'An id that uniquely identifies this record in an external database ') + } + fields = { + 'authority': Parameter(str, "The authority for this record"), + 'peer_authority': Parameter(str, "The peer authority for this record"), 'hrn': Parameter(str, "Human readable name of object"), 'gid': Parameter(str, "GID of the object"), 'type': Parameter(str, "Record type"), - 'last_updated': Parameter(int, 'Date and time of last update'), - 'date_created': Parameter(int, 'Date and time this record was created'), + 'last_updated': Parameter(int, 'Date and time of last update', ro=True), + 'date_created': Parameter(int, 'Date and time this record was created', ro=True), } - + all_fields = dict(fields.items() + internal_fields.items()) ## - # Create a Geni Record + # Create an SFA Record # # @param name if !=None, assign the name of the record # @param gid if !=None, assign the gid of the record @@ -53,12 +64,13 @@ class GeniRecord(dict): # @param pointer is a pointer to a PLC record # @param dict if !=None, then fill in this record from the dictionary - def __init__(self, hrn=None, gid=None, type=None, pointer=None, dict=None, string=None): + def __init__(self, hrn=None, gid=None, type=None, pointer=None, peer_authority=None, dict=None, string=None): self.dirty = True self.hrn = None self.gid = None self.type = None self.pointer = None + self.set_peer_auth(peer_authority) if hrn: self.set_name(hrn) if gid: @@ -72,7 +84,10 @@ class GeniRecord(dict): if string: self.load_from_string(string) - + + def validate_last_updated(self, last_updated): + return time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime()) + def update(self, new_dict): if isinstance(new_dict, list): new_dict = new_dict[0] @@ -96,6 +111,7 @@ class GeniRecord(dict): Set the name of the record """ self.hrn = hrn + self['hrn'] = hrn self.dirty = True ## @@ -110,8 +126,10 @@ class GeniRecord(dict): if isinstance(gid, StringTypes): self.gid = gid + self['gid'] = gid else: self.gid = gid.save_to_string(save_parents=True) + self['gid'] = gid.save_to_string(save_parents=True) self.dirty = True ## @@ -124,6 +142,7 @@ class GeniRecord(dict): Set the type of the record """ self.type = type + self['type'] = type self.dirty = True ## @@ -136,6 +155,13 @@ class GeniRecord(dict): Set the pointer of the record """ self.pointer = pointer + self['pointer'] = pointer + self.dirty = True + + + def set_peer_auth(self, peer_authority): + self.peer_authority = peer_authority + self['peer_authority'] = peer_authority self.dirty = True ## @@ -181,17 +207,20 @@ class GeniRecord(dict): return GID(string=self.gid) ## - # Return a key that uniquely identifies this record among all records in - # Geni. This key is used to uniquely identify the record in the Geni - # database. + # Returns the value of a field - def get_key(self): - """ - Return a key that uniquely identifies this record among all records in - Geni. This key is used to uniquely identify the record in the Geni - database. - """ - return self.hrn + "#" + self.type + def get_field(self, fieldname, default=None): + # sometimes records act like classes, and sometimes they act like dicts + try: + return getattr(self, fieldname) + except AttributeError: + try: + return self[fieldname] + except KeyError: + if default != None: + return default + else: + raise ## # Returns a list of field names in this record. @@ -211,8 +240,8 @@ class GeniRecord(dict): """ Given a field name ("hrn", "gid", ...) return the value of that field. """ - if fieldname == "key": - val = self.get_key() + if fieldname == "authority": + val = get_authority(self['hrn']) else: try: val = getattr(self, fieldname) @@ -294,8 +323,8 @@ class GeniRecord(dict): record = RecordSpec() record.parseString(str) record_dict = record.toDict() - geni_dict = record_dict['record'] - self.load_from_dict(geni_dict) + sfa_dict = record_dict['record'] + self.load_from_dict(sfa_dict) ## # Dump the record to stdout @@ -316,7 +345,7 @@ class GeniRecord(dict): # self.get_gid_object().dump(8, dump_parents) #print " pointer:", self.pointer - order = GeniRecord.fields.keys() + order = SfaRecord.fields.keys() for key in self.keys(): if key not in order: order.append(key) @@ -333,30 +362,31 @@ class GeniRecord(dict): return dict(self) -class UserRecord(GeniRecord): +class UserRecord(SfaRecord): fields = { 'email': Parameter(str, 'email'), 'first_name': Parameter(str, 'First name'), 'last_name': Parameter(str, 'Last name'), 'phone': Parameter(str, 'Phone Number'), - 'key': Parameter(str, 'Public key'), + 'keys': Parameter(str, 'Public key'), 'slices': Parameter([str], 'List of slices this user belongs to'), } - fields.update(GeniRecord.fields) + fields.update(SfaRecord.fields) -class SliceRecord(GeniRecord): +class SliceRecord(SfaRecord): fields = { 'name': Parameter(str, 'Slice name'), 'url': Parameter(str, 'Slice url'), 'expires': Parameter(int, 'Date and time this slice exipres'), 'researcher': Parameter([str], 'List of users for this slice'), + 'PI': Parameter([str], 'List of PIs responsible for this slice'), 'description': Parameter([str], 'Description of this slice'), } - fields.update(GeniRecord.fields) + fields.update(SfaRecord.fields) -class NodeRecord(GeniRecord): +class NodeRecord(SfaRecord): fields = { 'hostname': Parameter(str, 'This nodes dns name'), 'node_type': Parameter(str, 'Type of node this is'), @@ -364,10 +394,10 @@ class NodeRecord(GeniRecord): 'latitude': Parameter(str, 'latitude'), 'longitude': Parameter(str, 'longitude'), } - fields.update(GeniRecord.fields) + fields.update(SfaRecord.fields) -class AuthorityRecord(GeniRecord): +class AuthorityRecord(SfaRecord): fields = { 'name': Parameter(str, 'Name'), 'login_base': Parameter(str, 'login base'), @@ -378,6 +408,6 @@ class AuthorityRecord(GeniRecord): 'researcher': Parameter([str], 'List of researchers'), 'PI': Parameter([str], 'List of Principal Investigators'), } - fields.update(GeniRecord.fields) + fields.update(SfaRecord.fields)