fix bugs

[plcapi.git] / PLC / Sites.py

diff --git a/PLC/Sites.py b/PLC/Sites.py
index 6147cd0..07cd634 100644 (file)
--- a/PLC/Sites.py
+++ b/PLC/Sites.py
@@ -9,9 +9,10 @@ from PLC.Storage.AlchemyObject import AlchemyObj
 from PLC.Slices import Slice, Slices
 from PLC.Persons import Person, Persons
 from PLC.SitePersons import SitePerson, SitePersons
-from PLC.Addresses import Address, Addresses
+from PLC.SiteAddresses import SiteAddress, SiteAddress
 from PLC.PCUs import PCU, PCUs
 from PLC.Nodes import Node, Nodes
+from PLC.Roles import Role, Roles
 from PLC.SiteTags import SiteTag, SiteTags
 
 class Site(AlchemyObj):
@@ -55,17 +56,21 @@ class Site(AlchemyObj):
         last_updated = datetime.now()
         return last_updated
 
-    def add_person(self, person_filter, role=None):
+    def add_person(self, person_filter, role_name=None):
         assert 'site_id' in self
         assert 'tenant_id' in self
-        if not role:
-            role = 'user'
+        if not role_name:
+            role_name = 'user'
+        roles = Roles(self.api, role_name)
+        if not roles:
+            raise PLCInvalidArgument, "No such role %s" % role_name
+        role = roles[0]
         tenant = self.api.client_shell.keystone.tenants.find(id=self['tenant_id']) 
         persons = Persons(self.api, person_filter)
         for person in persons:
             keystone_user = self.api.client_shell.keystone.users.find(id=person['keystone_id'])
-            tenant.add_user(keystone_user, role)  
-            site_person = SitePerson(self.api, {'site_id': self['id'], 
+            tenant.add_user(keystone_user, role.object)  
+            site_person = SitePerson(self.api, {'site_id': self['site_id'], 
                                                 'person_id': person['person_id']}) 
             site_person.sync()
 
@@ -75,11 +80,15 @@ class Site(AlchemyObj):
         assert 'tenant_id' in self
         if not role:
             role = 'user'
+        roles = Roles(self.api, role_name)
+        if not roles:
+            raise PLCInvalidArgument, "No such role %s" % role_name
+        role = roles[0]
         tenant = self.api.client_shell.keystone.tenants.find(id=self['tenant_id'])
         persons = Persons(self.api, person_filter)
         for person in persons:
             keystone_user = self.api.client_shell.keystone.users.find(id=person['keystone_id'])
-            tenant.remove_user(keystone_user, role)
+            tenant.remove_user(keystone_user, role.object)
             site_persons = SitePersons(self.api, {'site_id': self['id'],
                                                 'person_id': person['person_id']})
             for site_person in site_persons:
@@ -91,19 +100,21 @@ class Site(AlchemyObj):
         Add or update the site.
         """
         assert 'login_base' in self
-        # sync the nova record and the plc record
         AlchemyObj.sync(self, commit=commit, validate=validate)     
+        # filter out fields that are not supported in keystone
         nova_fields = ['enabled', 'description']
         nova_can_update = lambda (field, value): field in nova_fields
         nova_site = dict(filter(nova_can_update, self.items()))
         nova_site['tenant_name'] = self['login_base']
         if 'site_id' not in self:
+            # check if keystone record exsits
             tenants = self.api.client_shell.keystone.tenants.findall(name=self['login_base'])
             if not tenants:
                 self.object = self.api.client_shell.keystone.tenants.create(**nova_site)
             else:
                 self.object = tenants[0]
             self['tenant_id'] = self.object.id
+            # sync the plc record
             AlchemyObj.insert(self, dict(self)) 
         else:
             self.object = self.api.client_shell.keystone.tenants.update(self['tenant_id'], **nova_site)
@@ -147,35 +158,36 @@ class Sites(list):
         elif isinstance(site_filter, dict):
             sites = Site().select(filter=site_filter)
         elif isinstance(site_filter, (list, tuple, set)):
-            sites = Site().select() 
-            sites = [site for site in sites if site.id in site_filter]
+            ints = filter(lambda x: isinstance(x, (int, long)), site_filter)
+            strs = filter(lambda x: isinstance(x, StringTypes), site_filter)
+            site_filter = {'site_id': ints, 'login_base': strs}
+            sites = Site().select(filter=site_filter)
         else:
             raise PLCInvalidArgument, "Wrong site filter %s" % site_filter         
 
+
         for site in sites:
             site = Site(self.api, object = site)
             if not columns or 'person_ids' in columns:
-                site_persons = SitePerson().select(filter={'site_id': site.id})
+                site_persons = SitePerson().select(filter={'site_id': site['site_id']})
                 site['person_ids'] = [rec.person_id for rec in site_persons]
 
             if not columns or 'slice_ids' in columns:
-                site_slices = Slice().select(filter={'site_id': site.id})
+                site_slices = Slice().select(filter={'site_id': site['site_id']})
                 site['slice_ids'] = [rec.person_id for rec in site_slices]
 
             if not columns or 'puc_ids' in columns:
-                site_pcus = PCU().select(filter={'site_id': site.id})
+                site_pcus = PCU().select(filter={'site_id': site['site_id']})
                 site['pcu_ids'] = [rec.id for rec in site_pcus]
-
             if not columns or 'node_ids' in columns:
-                site_nodes = Node().select(filter={'site_id': site.id})
+                site_nodes = Node().select(filter={'site_id': site['site_id']})
                 site['node_ids'] = [rec.id for rec in site_nodes]
-
             if not columns or 'address_ids' in columns:
-                site_addresses = Address().select(filter={'site_id': site.id})
+                site_addresses = SiteAddress().select(filter={'site_id': site['site_id']})
                 site['address_ids'] = [rec.id for rec in site_addresses]
 
             if not columns or 'site_tag_ids' in columns:
-                site_tags = SiteTag().select(filter={'site_id': site.id})
+                site_tags = SiteTag().select(filter={'site_id': site['site_id']})
                 site['site_tag_ids'] = [rec.id for rec in site_tags]
 
             self.append(site)