X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSlices.py;h=88c0b579076148c7a30777acfaa5d8797fcaaca7;hb=2e7ca3e3c39ff42321458ba3bb3400939c35b454;hp=fe728631b71b0b5a09ebdd5bff4254e3381d97fc;hpb=f6f0164afcbada9498622842964024f6fb3e5dfa;p=plcapi.git diff --git a/PLC/Slices.py b/PLC/Slices.py index fe72863..88c0b57 100644 --- a/PLC/Slices.py +++ b/PLC/Slices.py @@ -4,11 +4,12 @@ import re from PLC.Faults import * 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 -import PLC.Persons +from PLC.SliceInstantiations import SliceInstantiation, SliceInstantiations +from PLC.Nodes import Node +from PLC.Persons import Person, Persons class Slice(Row): """ @@ -20,13 +21,14 @@ 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"), 'name': Parameter(str, "Slice name", max = 32), 'instantiation': Parameter(str, "Slice instantiation state"), - 'url': Parameter(str, "URL further describing this slice", max = 254), - 'description': Parameter(str, "Slice description", max = 2048), + 'url': Parameter(str, "URL further describing this slice", max = 254, nullok = True), + 'description': Parameter(str, "Slice description", max = 2048, nullok = True), 'max_nodes': Parameter(int, "Maximum number of nodes that can be assigned to this slice"), 'creator_person_id': Parameter(int, "Identifier of the account that created this slice"), 'created': Parameter(int, "Date and time when slice was created, in seconds since UNIX epoch", ro = True), @@ -34,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 @@ -42,144 +58,44 @@ 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" conflicts = Slices(self.api, [name]) - for slice_id, slice in conflicts.iteritems(): - if 'slice_id' not in self or self['slice_id'] != slice_id: - raise PLCInvalidArgument, "Slice name already in use" + for slice in conflicts: + if 'slice_id' not in self or self['slice_id'] != slice['slice_id']: + raise PLCInvalidArgument, "Slice name already in use, %s"%name return name def validate_instantiation(self, instantiation): - instantiations = SliceInstantiations(self.api) + instantiations = [row['instantiation'] for row in SliceInstantiations(self.api)] if instantiation not in instantiations: raise PLCInvalidArgument, "No such instantiation state" 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 validate_creator_person_id(self, person_id): - persons = PLC.Persons.Persons(self.api, [person_id]) - if not persons: - raise PLCInvalidArgument, "Invalid creator" - - return person_id - - 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'] + 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("INSERT INTO slice_person (person_id, slice_id)" \ - " VALUES(%(person_id)d, %(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['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, commit = True): - """ - Add node to existing slice. - """ - - assert 'slice_id' in self - assert isinstance(node, Node) - 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, commit = True): - """ - Remove node from existing slice. - """ - - assert 'slice_id' in self - assert isinstance(node, Node) - 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'] - - self.api.db.do("DELETE FROM slice_node" \ - " WHERE node_id = %(node_id)d" \ - " AND slice_id = %(slice_id)d", - locals()) - - if commit: - self.api.db.commit() - - 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): """ @@ -188,7 +104,7 @@ class Slice(Row): # Before a new slice is added, delete expired slices if 'slice_id' not in self: - expired = Slices(self.api, expires = -int(time.time())).values() + expired = Slices(self.api, expires = -int(time.time())) for slice in expired: slice.delete(commit) @@ -202,10 +118,9 @@ 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['is_deleted'] = True @@ -217,38 +132,36 @@ class Slices(Table): database. """ - def __init__(self, api, slice_id_or_name_list = None, expires = int(time.time())): - self.api = api + 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 is_deleted IS False" % \ - ", ".join(Slice.fields) + ", ".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" - - if slice_id_or_name_list: - # Separate the list into integers and strings - slice_ids = filter(lambda slice_id: isinstance(slice_id, (int, long)), - slice_id_or_name_list) - names = filter(lambda name: isinstance(name, StringTypes), - slice_id_or_name_list) - sql += " AND (False" - if slice_ids: - sql += " OR slice_id IN (%s)" % ", ".join(map(str, slice_ids)) - if names: - sql += " OR name IN (%s)" % ", ".join(api.db.quote(names)) - sql += ")" - - rows = self.api.db.selectall(sql, locals()) - - for row in rows: - self[row['slice_id']] = slice = Slice(api, row) - for aggregate in 'node_ids', 'person_ids', 'slice_attribute_ids': - if not slice.has_key(aggregate) or slice[aggregate] is None: - slice[aggregate] = [] - else: - slice[aggregate] = map(int, slice[aggregate].split(',')) + sql += " AND expires < %d" % expires + + if slice_filter is not None: + if isinstance(slice_filter, (list, tuple, set)): + # Separate the list into integers and strings + ints = filter(lambda x: isinstance(x, (int, long)), slice_filter) + strs = filter(lambda x: isinstance(x, StringTypes), slice_filter) + slice_filter = Filter(Slice.fields, {'slice_id': ints, 'name': strs}) + sql += " AND (%s)" % slice_filter.sql(api, "OR") + elif isinstance(slice_filter, dict): + slice_filter = Filter(Slice.fields, slice_filter) + sql += " AND (%s)" % slice_filter.sql(api, "AND") + elif isinstance (slice_filter, StringTypes): + slice_filter = Filter(Slice.fields, {'name':[slice_filter]}) + sql += " AND (%s)" % slice_filter.sql(api, "AND") + elif isinstance (slice_filter, int): + slice_filter = Filter(Slice.fields, {'slice_id':[slice_filter]}) + sql += " AND (%s)" % slice_filter.sql(api, "AND") + else: + raise PLCInvalidArgument, "Wrong slice filter %r"%slice_filter + + self.selectall(sql)