Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

[plstackapi.git] / planetstack / observer / steps / sync_users.py

diff --git a/planetstack/observer/steps/sync_users.py b/planetstack/observer/steps/sync_users.py
index 3f509ef..71f9c0f 100644 (file)
--- a/planetstack/observer/steps/sync_users.py
+++ b/planetstack/observer/steps/sync_users.py
@@ -1,35 +1,20 @@
 import os
 import base64
+import hashlib
+from django.db.models import F, Q
 from planetstack.config import Config
 from observer.openstacksyncstep import OpenStackSyncStep
-from core.models.user import User
+from core.models.user import User, UserDeployments
 
 class SyncUsers(OpenStackSyncStep):
-       provides=[User]
-       requested_interval=0
-       def sync_record(self, user):
-               name = user.email[:user.email.find('@')]
-               user_fields = {'name': name,
-                                          'email': user.email,
-                                          'password': hashlib.md5(user.password).hexdigest()[:6],
-                                          'enabled': True}
-               if not user.kuser_id:
-                       keystone_user = self.driver.create_user(**user_fields)
-                       user.kuser_id = keystone_user.id
-               else:
-                       self.driver.update_user(user.kuser_id, user_fields)             
+    provides=[User]
+    requested_interval=0
 
-               if user.site:
-                       self.driver.add_user_role(user.kuser_id, user.site.tenant_id, 'user')
-                       if user.is_admin:
-                               self.driver.add_user_role(user.kuser_id, user.site.tenant_id, 'admin')
-                       else:
-                               # may have admin role so attempt to remove it
-                               self.driver.delete_user_role(user.kuser_id, user.site.tenant_id, 'admin')
+    def fetch_pending(self):
+        return User.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
 
-               if user.public_key:
-                       self.init_caller(user, user.site.login_base)
-                       self.save_key(user.public_key, user.keyname)
-                       self.init_admin()
-
-               user.save()
+    def sync_record(self, user):
+        for user_deployment in UserDeployments.objects.filter(user=user):
+            # bump the 'updated' field so user account are updated across 
+            # deployments.
+            user_deployment.save()