X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSites.py;h=4749f84f32a541bfcf842e74e82b106671e132e8;hb=454ed505788aacb55658479b06fa05a9d73cc74e;hp=00fc964779b9d3ba2fdd5cf22e1c8a39d5122165;hpb=bc48d5148c2d0b65f90e393184a213dc202ecc70;p=plcapi.git diff --git a/PLC/Sites.py b/PLC/Sites.py index 00fc964..4749f84 100644 --- a/PLC/Sites.py +++ b/PLC/Sites.py @@ -3,14 +3,14 @@ import string 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.Slices import Slice, Slices from PLC.PCUs import PCU, PCUs from PLC.Nodes import Node, Nodes -from PLC.NodeGroups import NodeGroup, NodeGroups from PLC.Addresses import Address, Addresses -import PLC.Persons +from PLC.Persons import Person, Persons class Site(Row): """ @@ -21,26 +21,41 @@ class Site(Row): table_name = 'sites' primary_key = 'site_id' + join_tables = ['person_site', 'site_address', 'peer_site'] fields = { 'site_id': Parameter(int, "Site identifier"), 'name': Parameter(str, "Full site name", max = 254), 'abbreviated_name': Parameter(str, "Abbreviated site name", max = 50), 'login_base': Parameter(str, "Site slice prefix", max = 20), 'is_public': Parameter(bool, "Publicly viewable site"), - 'latitude': Parameter(float, "Decimal latitude of the site", min = -90.0, max = 90.0, nullok = True), + 'enabled': Parameter(bool, "Has been enabled"), + 'latitude': Parameter(float, "Decimal latitude of the site", min = -90.0, max = 90.0, nullok = True), 'longitude': Parameter(float, "Decimal longitude of the site", min = -180.0, max = 180.0, nullok = True), 'url': Parameter(str, "URL of a page that describes the site", max = 254, nullok = True), 'date_created': Parameter(int, "Date and time when site entry was created, in seconds since UNIX epoch", ro = True), 'last_updated': Parameter(int, "Date and time when site entry was last updated, in seconds since UNIX epoch", ro = True), 'max_slices': Parameter(int, "Maximum number of slices that the site is able to create"), 'max_slivers': Parameter(int, "Maximum number of slivers that the site is able to create"), - 'person_ids': Parameter([int], "List of account identifiers", ro = True), - 'slice_ids': Parameter([int], "List of slice identifiers", ro = True), - 'address_ids': Parameter([int], "List of address identifiers", ro = True), - 'pcu_ids': Parameter([int], "List of PCU identifiers", ro = True), - 'node_ids': Parameter([int], "List of site node identifiers", ro = True), + 'person_ids': Parameter([int], "List of account identifiers"), + 'slice_ids': Parameter([int], "List of slice identifiers"), + 'address_ids': Parameter([int], "List of address identifiers"), + 'pcu_ids': Parameter([int], "List of PCU identifiers"), + 'node_ids': Parameter([int], "List of site node identifiers"), + 'peer_id': Parameter(int, "Peer to which this site belongs", nullok = True), + 'peer_site_id': Parameter(int, "Foreign site identifier at peer", nullok = True), + 'ext_consortium_id': Parameter(int, "external consortium id", nullok = True) } + # for Cache + class_key = 'login_base' + foreign_fields = ['abbreviated_name', 'name', 'is_public', 'latitude', 'longitude', + 'url', 'max_slices', 'max_slivers', + ] + # forget about these ones, they are read-only anyway + # handling them causes Cache to re-sync all over again + # 'last_updated', 'date_created' + foreign_xrefs = [] + def validate_name(self, name): if not len(name): raise PLCInvalidArgument, "Name must be specified" @@ -53,12 +68,12 @@ class Site(Row): if not len(login_base): raise PLCInvalidArgument, "Login base must be specified" - if not set(login_base).issubset(string.ascii_letters.lower()): - raise PLCInvalidArgument, "Login base must consist only of lowercase ASCII letters" + if not set(login_base).issubset(string.lowercase + string.digits): + raise PLCInvalidArgument, "Login base must consist only of lowercase ASCII letters or numbers" conflicts = Sites(self.api, [login_base]) - for site_id, site in conflicts.iteritems(): - if 'site_id' not in self or self['site_id'] != site_id: + for site in conflicts: + if 'site_id' not in self or self['site_id'] != site['site_id']: raise PLCInvalidArgument, "login_base already in use" return login_base @@ -77,101 +92,14 @@ class Site(Row): return longitude - def add_person(self, person, commit = True): - """ - Add person to existing site. - """ - - assert 'site_id' in self - assert isinstance(person, PLC.Persons.Person) - assert 'person_id' in person - - site_id = self['site_id'] - person_id = person['person_id'] - - if person_id not in self['person_ids']: - assert site_id not in person['site_ids'] - - self.api.db.do("INSERT INTO person_site (person_id, site_id)" \ - " VALUES(%(person_id)d, %(site_id)d)", - locals()) - - if commit: - self.api.db.commit() - - self['person_ids'].append(person_id) - person['site_ids'].append(site_id) - - def remove_person(self, person, commit = True): - """ - Remove person from existing site. - """ - - assert 'site_id' in self - assert isinstance(person, PLC.Persons.Person) - assert 'person_id' in person - - site_id = self['site_id'] - person_id = person['person_id'] - - if person_id in self['person_ids']: - assert site_id in person['site_ids'] - - self.api.db.do("DELETE FROM person_site" \ - " WHERE person_id = %(person_id)d" \ - " AND site_id = %(site_id)d", - locals()) - - if commit: - self.api.db.commit() - - self['person_ids'].remove(person_id) - person['site_ids'].remove(site_id) - - def add_address(self, address, commit = True): - """ - Add address to existing site. - """ - - assert 'site_id' in self - assert isinstance(address, Address) - assert 'address_id' in address - - site_id = self['site_id'] - address_id = address['address_id'] - - if address_id not in self['address_ids']: - self.api.db.do("INSERT INTO site_address (address_id, site_id)" \ - " VALUES(%(address_id)d, %(site_id)d)", - locals()) - - if commit: - self.api.db.commit() - - self['address_ids'].append(address_id) - - def remove_address(self, address, commit = True): - """ - Remove address from existing site. - """ - - assert 'site_id' in self - assert isinstance(address, Address) - assert 'address_id' in address - - site_id = self['site_id'] - address_id = address['address_id'] - - if address_id in self['address_ids']: - self.api.db.do("DELETE FROM site_address" \ - " WHERE address_id = %(address_id)d" \ - " AND site_id = %(site_id)d", - locals()) + validate_date_created = Row.validate_timestamp + validate_last_updated = Row.validate_timestamp - if commit: - self.api.db.commit() + add_person = Row.add_object(Person, 'person_site') + remove_person = Row.remove_object(Person, 'person_site') - self['address_ids'].remove(address_id) + add_address = Row.add_object(Address, 'site_address') + remove_address = Row.remove_object(Address, 'site_address') def delete(self, commit = True): """ @@ -182,13 +110,13 @@ class Site(Row): # Delete accounts of all people at the site who are not # members of at least one other non-deleted site. - persons = PLC.Persons.Persons(self.api, self['person_ids']) - for person_id, person in persons.iteritems(): + persons = Persons(self.api, self['person_ids']) + for person in persons: delete = True person_sites = Sites(self.api, person['site_ids']) - for person_site_id, person_site in person_sites.iteritems(): - if person_site_id != self['site_id']: + for person_site in person_sites: + if person_site['site_id'] != self['site_id']: delete = False break @@ -197,29 +125,28 @@ class Site(Row): # Delete all site addresses addresses = Addresses(self.api, self['address_ids']) - for address in addresses.values(): - address.delete(commit = False) + for address in addresses: + address.delete(commit = False) # Delete all site slices slices = Slices(self.api, self['slice_ids']) - for slice in slices.values(): - slice.delete(commit = False) + for slice in slices: + slice.delete(commit = False) # Delete all site PCUs pcus = PCUs(self.api, self['pcu_ids']) - for pcu in pcus.values(): - pcu.delete(commit = False) + for pcu in pcus: + pcu.delete(commit = False) # Delete all site nodes nodes = Nodes(self.api, self['node_ids']) - for node in nodes.values(): + for node in nodes: node.delete(commit = False) # Clean up miscellaneous join tables - for table in ['person_site']: - self.api.db.do("DELETE FROM %s" \ - " WHERE site_id = %d" % \ - (table, self['site_id']), self) + for table in self.join_tables: + self.api.db.do("DELETE FROM %s WHERE site_id = %d" % \ + (table, self['site_id'])) # Mark as deleted self['deleted'] = True @@ -228,36 +155,24 @@ class Site(Row): class Sites(Table): """ Representation of row(s) from the sites table in the - database. Specify fields to limit columns to just the specified - fields. + database. """ - def __init__(self, api, site_id_or_login_base_list = None): - self.api = api + def __init__(self, api, site_filter = None, columns = None): + Table.__init__(self, api, Site, columns) sql = "SELECT %s FROM view_sites WHERE deleted IS False" % \ - ", ".join(Site.fields) - - if site_id_or_login_base_list: - # Separate the list into integers and strings - site_ids = filter(lambda site_id: isinstance(site_id, (int, long)), - site_id_or_login_base_list) - login_bases = filter(lambda login_base: isinstance(login_base, StringTypes), - site_id_or_login_base_list) - sql += " AND (False" - if site_ids: - sql += " OR site_id IN (%s)" % ", ".join(map(str, site_ids)) - if login_bases: - sql += " OR login_base IN (%s)" % ", ".join(api.db.quote(login_bases)) - sql += ")" - - rows = self.api.db.selectall(sql) - - for row in rows: - self[row['site_id']] = site = Site(api, row) - for aggregate in ['person_ids', 'slice_ids', 'address_ids', - 'pcu_ids', 'node_ids']: - if not site.has_key(aggregate) or site[aggregate] is None: - site[aggregate] = [] - else: - site[aggregate] = map(int, site[aggregate].split(',')) + ", ".join(self.columns) + + if site_filter is not None: + if isinstance(site_filter, (list, tuple, set)): + # Separate the list into integers and strings + ints = filter(lambda x: isinstance(x, (int, long)), site_filter) + strs = filter(lambda x: isinstance(x, StringTypes), site_filter) + site_filter = Filter(Site.fields, {'site_id': ints, 'login_base': strs}) + sql += " AND (%s)" % site_filter.sql(api, "OR") + elif isinstance(site_filter, dict): + site_filter = Filter(Site.fields, site_filter) + sql += " AND (%s)" % site_filter.sql(api, "AND") + + self.selectall(sql)