X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fstorage%2Fmodel.py;h=b0950429d604c37768d3a2c96a9579a1457fda62;hb=1cc8e9613cab8b5b22478de369f259e591c54e6d;hp=153529751a2e3c2f7ccd7c7390f90cec9a0b6a27;hpb=ab323f56e4e20f8b210572274b09136c15050904;p=sfa.git

diff --git a/sfa/storage/model.py b/sfa/storage/model.py
index 15352975..b0950429 100644
--- a/sfa/storage/model.py
+++ b/sfa/storage/model.py
@@ -317,6 +317,7 @@ class SliverAllocation(Base,AlchemyObj):
     sliver_id           = Column(String, primary_key=True)
     client_id           = Column(String)
     component_id        = Column(String)
+    slice_urn           = Column(String)
     allocation_state    = Column(String)
 
     def __init__(self, **kwds):
@@ -326,6 +327,8 @@ class SliverAllocation(Base,AlchemyObj):
             self.client_id = kwds['client_id']
         if 'component_id' in kwds:
             self.component_id = kwds['component_id']
+        if 'slice_urn' in kwds:
+            self.slice_urn = kwds['slice_urn']
         if 'allocation_state' in kwds:
             self.allocation_state = kwds['allocation_state']
 
@@ -389,6 +392,7 @@ class SliverAllocation(Base,AlchemyObj):
             record.sliver_id = self.sliver_id
             record.client_id  = self.client_id
             record.component_id  = self.component_id
+            record.slice_urn  = self.slice_urn
             record.allocation_state = self.allocation_state
         dbsession.commit()    
         
@@ -443,3 +447,35 @@ def make_record_xml (xml):
     logger.info("load from xml, keys=%s"%xml_dict.keys())
     return make_record_dict (xml_dict)
 
+####################
+# augment local records with data from builtin relationships
+# expose related objects as a list of hrns
+# we pick names that clearly won't conflict with the ones used in the old approach,
+# were the relationships data came from the testbed side
+# for each type, a dict of the form {<field-name-exposed-in-record>:<alchemy_accessor_name>}
+# so after that, an 'authority' record will e.g. have a 'reg-pis' field with the hrns of its pi-users
+augment_map={'authority': {'reg-pis':'reg_pis',},
+             'slice': {'reg-researchers':'reg_researchers',},
+             'user': {'reg-pi-authorities':'reg_authorities_as_pi',
+                      'reg-slices':'reg_slices_as_researcher',},
+             }
+
+def augment_with_sfa_builtins (local_record):
+    # don't ruin the import of that file in a client world
+    from sfa.util.xrn import Xrn
+    # add a 'urn' field
+    setattr(local_record,'reg-urn',Xrn(xrn=local_record.hrn,type=local_record.type).urn)
+    # users have keys and this is needed to synthesize 'users' sent over to CreateSliver
+    if local_record.type=='user':
+        user_keys = [ key.key for key in local_record.reg_keys ]
+        setattr(local_record, 'reg-keys', user_keys)
+    # search in map according to record type
+    type_map=augment_map.get(local_record.type,{})
+    # use type-dep. map to do the job
+    for (field_name,attribute) in type_map.items():
+        # get related objects
+        related_records = getattr(local_record,attribute,[])
+        hrns = [ r.hrn for r in related_records ]
+        setattr (local_record, field_name, hrns)
+    
+