commit f77f14015dc30dd02d53d9bcc6682879d513dea6
author Tony Mack <tmack@paris.CS.Princeton.EDU> Wed Apr 02 07:06:53 2014 -0400
committer Tony Mack <tmack@paris.CS.Princeton.EDU> Wed Apr 02 07:06:53 2014 -0400
tree 20277be628c268155dc30f94c76c56b39c856b6d
parent aa4a67bb7fee104c599f60e1ccad1bcdcb9cbaf8

fix bugs

planetstack/observer/steps/garbage_collector.py

diff --git a/planetstack/observer/steps/garbage_collector.py b/planetstack/observer/steps/garbage_collector.py
index 34ecd77..717f35c 100644
--- a/planetstack/observer/steps/garbage_collector.py
+++ b/planetstack/observer/steps/garbage_collector.py
@@ -88,7 +88,7 @@
 
     def gc_users(self):
         """
-        Remove users that no don't exist in openstack db if they have an 
+        Remove users that do not exist in openstack db if they have an 
         enacted time (enacted != None).
         """ 
         # get all users that where enacted != null. We can assume these users

planetstack/observer/steps/sync_site_privileges.py

diff --git a/planetstack/observer/steps/sync_site_privileges.py b/planetstack/observer/steps/sync_site_privileges.py
index cf838cf..b57ae43 100644
--- a/planetstack/observer/steps/sync_site_privileges.py
+++ b/planetstack/observer/steps/sync_site_privileges.py
@@ -25,7 +25,7 @@
             user_deployments = UserDeployments.objects.filter(deployment=site_deployment.deployment)
             if user_deployments:
                 kuser_id  = user_deployments[0].kuser_id
-                driver = self.driver.admin_driver(deployment=site_deployment.name)
+                driver = self.driver.admin_driver(deployment=site_deployment.deployment.name)
                 driver.add_user_role(kuser_id,
                                      site_deployment.tenant_id,
-                                     slice_memb.role.role)
+                                     site_priv.role.role)

planetstack/observer/steps/sync_slice_memberships.py

diff --git a/planetstack/observer/steps/sync_slice_memberships.py b/planetstack/observer/steps/sync_slice_memberships.py
index 6def794..08b7b6a 100644
--- a/planetstack/observer/steps/sync_slice_memberships.py
+++ b/planetstack/observer/steps/sync_slice_memberships.py
@@ -25,7 +25,7 @@
             user_deployments = UserDeployments.objects.filter(deployment=slice_deployment.deployment)
             if user_deployments:
                 kuser_id  = user_deployments[0].kuser_id
-                driver = self.driver.admin_driver(deployment=slice_deployment.name)
+                driver = self.driver.admin_driver(deployment=slice_deployment.deployment.name)
                 driver.add_user_role(kuser_id,
                                      slice_deployment.tenant_id,
                                      slice_memb.role.role)