adopted as reference

[plcapi.git] / PLC / Sites.py

diff --git a/PLC/Sites.py b/PLC/Sites.py
index 05f480e..84afa16 100644 (file)
--- a/PLC/Sites.py
+++ b/PLC/Sites.py
@@ -40,8 +40,22 @@ class Site(Row):
         '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 at which this slice was created", nullok = True),
         }
 
+    # for Cache
+    class_key = 'login_base'
+    foreign_fields = ['abbreviated_name', 'name', 'is_public', 'latitude', 'longitude',
+                     'url', 'date_created', 'last_updated', 'max_slices', 'max_slivers',
+                     ]
+    foreign_xrefs = {
+#'person_ids',
+#'slice_ids',
+#'node_ids',
+#'address_ids',
+#'pcu_ids',
+}
+
     def validate_name(self, name):
         if not len(name):
             raise PLCInvalidArgument, "Name must be specified"
@@ -58,8 +72,8 @@ class Site(Row):
             raise PLCInvalidArgument, "Login base must consist only of lowercase ASCII letters"
 
         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
@@ -184,12 +198,12 @@ 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():
+        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
 
@@ -198,22 +212,22 @@ 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
@@ -232,14 +246,14 @@ class Sites(Table):
     database.
     """
 
-    def __init__(self, api, site_filter = None):
-        Table.__init__(self, api, Site)
+    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)
+              ", ".join(self.columns)
 
         if site_filter is not None:
-            if isinstance(site_filter, list):
+            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)