X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fstorage%2Fmodel.py;h=7c749773f49e4bc11101324db7a221d289365070;hb=4a2337e7f70cef81a8de37829aa63fc941c4b96e;hp=163380953da152cec872e4c61b6353650bca9428;hpb=cdc7dd0cbb5e3e428bc9111f3cf476cbe15a4530;p=sfa.git
diff --git a/sfa/storage/model.py b/sfa/storage/model.py
index 16338095..7c749773 100644
--- a/sfa/storage/model.py
+++ b/sfa/storage/model.py
@@ -1,7 +1,8 @@
from types import StringTypes
from datetime import datetime
-from sqlalchemy import Integer, String, DateTime
+from sqlalchemy import or_, and_
+from sqlalchemy import Column, Integer, String, DateTime
from sqlalchemy import Table, Column, MetaData, join, ForeignKey
from sqlalchemy.orm import relationship, backref
from sqlalchemy.orm import column_property
@@ -142,12 +143,12 @@ class RegRecord (Base,AlchemyObj):
else: return GID(string=self.gid)
def just_created (self):
- now=datetime.now()
+ now=datetime.utcnow()
self.date_created=now
self.last_updated=now
def just_updated (self):
- now=datetime.now()
+ now=datetime.utcnow()
self.last_updated=now
#################### cross-relations tables
@@ -190,9 +191,7 @@ class RegAuthority (RegRecord):
def __repr__ (self):
return RegRecord.__repr__(self).replace("Record","Authority")
- def update_pis (self, pi_hrns):
- # don't ruin the import of that file in a client world
- from sfa.storage.alchemy import dbsession
+ def update_pis (self, pi_hrns, dbsession):
# strip that in case we have words
pi_hrns = [ x.strip() for x in pi_hrns ]
request = dbsession.query (RegUser).filter(RegUser.hrn.in_(pi_hrns))
@@ -220,9 +219,7 @@ class RegSlice (RegRecord):
def __repr__ (self):
return RegRecord.__repr__(self).replace("Record","Slice")
- def update_researchers (self, researcher_hrns):
- # don't ruin the import of that file in a client world
- from sfa.storage.alchemy import dbsession
+ def update_researchers (self, researcher_hrns, dbsession):
# strip that in case we have words
researcher_hrns = [ x.strip() for x in researcher_hrns ]
request = dbsession.query (RegUser).filter(RegUser.hrn.in_(researcher_hrns))
@@ -231,9 +228,12 @@ class RegSlice (RegRecord):
self.reg_researchers = researchers
# when dealing with credentials, we need to retrieve the PIs attached to a slice
+ # WARNING: with the move to passing dbsessions around, we face a glitch here because this
+ # helper function is called from the trust/ area that
def get_pis (self):
- # don't ruin the import of that file in a client world
- from sfa.storage.alchemy import dbsession
+ from sqlalchemy.orm import sessionmaker
+ Session=sessionmaker()
+ dbsession=Session.object_session(self)
from sfa.util.xrn import get_authority
authority_hrn = get_authority(self.hrn)
auth_record = dbsession.query(RegAuthority).filter_by(hrn=authority_hrn).first()
@@ -311,6 +311,87 @@ class RegKey (Base):
result += ">"
return result
+class SliverAllocation(Base,AlchemyObj):
+ __tablename__ = 'sliver_allocation'
+ 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):
+ if 'sliver_id' in kwds:
+ self.sliver_id = kwds['sliver_id']
+ if 'client_id' in kwds:
+ 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']
+
+ def __repr__(self):
+ result = "