X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSlices.py;h=d8962c45b8ff59f0d05256e2d58c7acfade2f9fc;hb=454ed505788aacb55658479b06fa05a9d73cc74e;hp=82bcad583d9ecf5a9b8a3d208e56026980882f97;hpb=b768e36acb9b91eab4b0772b3a511379485e206e;p=plcapi.git diff --git a/PLC/Slices.py b/PLC/Slices.py index 82bcad5..d8962c4 100644 --- a/PLC/Slices.py +++ b/PLC/Slices.py @@ -7,10 +7,9 @@ from PLC.Parameter import Parameter from PLC.Filter import Filter from PLC.Debug import profile from PLC.Table import Row, Table -from PLC.SliceInstantiations import SliceInstantiations -from PLC.Nodes import Node, Nodes -from PLC.ForeignNodes import ForeignNode, ForeignNodes -import PLC.Persons +from PLC.SliceInstantiations import SliceInstantiation, SliceInstantiations +from PLC.Nodes import Node +from PLC.Persons import Person, Persons class Slice(Row): """ @@ -22,6 +21,7 @@ class Slice(Row): table_name = 'slices' primary_key = 'slice_id' + join_tables = ['slice_node', 'slice_person', 'slice_attribute', 'peer_slice', 'node_slice_whitelist'] fields = { 'slice_id': Parameter(int, "Slice identifier"), 'site_id': Parameter(int, "Identifier of the site to which this slice belongs"), @@ -36,7 +36,21 @@ class Slice(Row): 'node_ids': Parameter([int], "List of nodes in this slice", ro = True), 'person_ids': Parameter([int], "List of accounts that can use this slice", ro = True), 'slice_attribute_ids': Parameter([int], "List of slice attributes", ro = True), + 'peer_id': Parameter(int, "Peer to which this slice belongs", nullok = True), + 'peer_slice_id': Parameter(int, "Foreign slice identifier at peer", nullok = True), } + # for Cache + class_key = 'name' + foreign_fields = ['instantiation', 'url', 'description', 'max_nodes', 'expires'] + foreign_xrefs = [ + {'field': 'node_ids' , 'class': 'Node', 'table': 'slice_node' }, + {'field': 'person_ids', 'class': 'Person', 'table': 'slice_person'}, + {'field': 'creator_person_id', 'class': 'Person', 'table': 'unused-on-direct-refs'}, + {'field': 'site_id', 'class': 'Site', 'table': 'unused-on-direct-refs'}, + ] + # forget about this one, it is read-only anyway + # handling it causes Cache to re-sync all over again + # 'created' def validate_name(self, name): # N.B.: Responsibility of the caller to ensure that login_base @@ -44,10 +58,10 @@ class Slice(Row): # desired. # 1. Lowercase. - # 2. Begins with login_base (only letters). + # 2. Begins with login_base (letters or numbers). # 3. Then single underscore after login_base. # 4. Then letters, numbers, or underscores. - good_name = r'^[a-z]+_[a-z0-9_]+$' + good_name = r'^[a-z0-9]+_[a-zA-Z0-9_]+$' if not name or \ not re.match(good_name, name): raise PLCInvalidArgument, "Invalid slice name" @@ -55,7 +69,7 @@ class Slice(Row): conflicts = Slices(self.api, [name]) for slice in conflicts: if 'slice_id' not in self or self['slice_id'] != slice['slice_id']: - raise PLCInvalidArgument, "Slice name already in use" + raise PLCInvalidArgument, "Slice name already in use, %s"%name return name @@ -66,121 +80,22 @@ class Slice(Row): return instantiation + validate_created = Row.validate_timestamp + def validate_expires(self, expires): # N.B.: Responsibility of the caller to ensure that expires is # not too far into the future. - if expires < time.time(): - raise PLCInvalidArgument, "Expiration date must be in the future" - - return time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(expires)) - - def add_person(self, person, commit = True): - """ - Add person to existing slice. - """ - - assert 'slice_id' in self - assert isinstance(person, PLC.Persons.Person) - assert 'person_id' in person - - slice_id = self['slice_id'] - person_id = person['person_id'] - - if person_id not in self['person_ids']: - assert slice_id not in person['slice_ids'] - - self.api.db.do("INSERT INTO slice_person (person_id, slice_id)" \ - " VALUES(%(person_id)d, %(slice_id)d)", - locals()) - - if commit: - self.api.db.commit() - - self['person_ids'].append(person_id) - person['slice_ids'].append(slice_id) - - def remove_person(self, person, commit = True): - """ - Remove person from existing slice. - """ - - assert 'slice_id' in self - assert isinstance(person, PLC.Persons.Person) - assert 'person_id' in person - - slice_id = self['slice_id'] - person_id = person['person_id'] - - if person_id in self['person_ids']: - assert slice_id in person['slice_ids'] - - self.api.db.do("DELETE FROM slice_person" \ - " WHERE person_id = %(person_id)d" \ - " AND slice_id = %(slice_id)d", - locals()) - - if commit: - self.api.db.commit() - - self['person_ids'].remove(person_id) - person['slice_ids'].remove(slice_id) - - def add_node(self, node, is_foreign_node = False, commit = True): - """ - Add node to existing slice. - """ - - assert 'slice_id' in self - if not is_foreign_node: - assert isinstance(node, Node) - else: - assert isinstance(node, ForeignNode) - assert 'node_id' in node - - slice_id = self['slice_id'] - node_id = node['node_id'] - - if node_id not in self['node_ids']: - assert slice_id not in node['slice_ids'] - - self.api.db.do("INSERT INTO slice_node (node_id, slice_id)" \ - " VALUES(%(node_id)d, %(slice_id)d)", - locals()) - - if commit: - self.api.db.commit() - - self['node_ids'].append(node_id) - node['slice_ids'].append(slice_id) - - def remove_node(self, node, is_foreign_node = False, commit = True): - """ - Remove node from existing slice. - """ - - assert 'slice_id' in self - if not is_foreign_node: - assert isinstance(node, Node) - else: - assert isinstance(node, ForeignNode) - assert 'node_id' in node - - slice_id = self['slice_id'] - node_id = node['node_id'] - - if node_id in self['node_ids']: - assert slice_id in node['slice_ids'] + check_future = not ('is_deleted' in self and self['is_deleted']) + return Row.validate_timestamp(self, expires, check_future = check_future) - self.api.db.do("DELETE FROM slice_node" \ - " WHERE node_id = %(node_id)d" \ - " AND slice_id = %(slice_id)d", - locals()) + add_person = Row.add_object(Person, 'slice_person') + remove_person = Row.remove_object(Person, 'slice_person') - if commit: - self.api.db.commit() + add_node = Row.add_object(Node, 'slice_node') + remove_node = Row.remove_object(Node, 'slice_node') - self['node_ids'].remove(node_id) - node['slice_ids'].remove(slice_id) + add_to_node_whitelist = Row.add_object(Node, 'node_slice_whitelist') + delete_from_node_whitelist = Row.remove_object(Node, 'node_slice_whitelist') def sync(self, commit = True): """ @@ -203,13 +118,12 @@ class Slice(Row): assert 'slice_id' in self # Clean up miscellaneous join tables - for table in ['slice_node', 'slice_person', 'slice_attribute']: - self.api.db.do("DELETE FROM %s" \ - " WHERE slice_id = %d" % \ - (table, self['slice_id']), self) + for table in self.join_tables: + self.api.db.do("DELETE FROM %s WHERE slice_id = %d" % \ + (table, self['slice_id'])) # Mark as deleted - self['deleted'] = True + self['is_deleted'] = True self.sync(commit) class Slices(Table): @@ -221,15 +135,15 @@ class Slices(Table): def __init__(self, api, slice_filter = None, columns = None, expires = int(time.time())): Table.__init__(self, api, Slice, columns) - sql = "SELECT %s FROM view_slices WHERE deleted IS False" % \ + sql = "SELECT %s FROM view_slices WHERE is_deleted IS False" % \ ", ".join(self.columns) if expires is not None: if expires >= 0: - sql += " AND expires > %(expires)d" + sql += " AND expires > %d" % expires else: expires = -expires - sql += " AND expires < %(expires)d" + sql += " AND expires < %d" % expires if slice_filter is not None: if isinstance(slice_filter, (list, tuple, set)): @@ -242,4 +156,4 @@ class Slices(Table): slice_filter = Filter(Slice.fields, slice_filter) sql += " AND (%s)" % slice_filter.sql(api, "AND") - self.selectall(sql, locals()) + self.selectall(sql)