update restapi to use OpenStackManager instead of OpenStackDriver

[plstackapi.git] / plstackapi / core / api / users.py

diff --git a/plstackapi/core/api/users.py b/plstackapi/core/api/users.py
index d543782..c190562 100644 (file)
--- a/plstackapi/core/api/users.py
+++ b/plstackapi/core/api/users.py
@@ -1,38 +1,40 @@
-from plstackapi.openstack.client import OpenStackClient
-from plstackapi.openstack.driver import OpenStackDriver
-from plstackapi.core.api.auth import auth_check
-from plstackapi.core.models import User, Site
+from types import StringTypes
+from django.contrib.auth import authenticate
+from plstackapi.openstack.manager import OpenStackManager    
+from plstackapi.core.models import PLUser, Site
 from plstackapi.core.api.sites import _get_sites
 
 def _get_users(filter):
+    if isinstance(filter, StringTypes) and filter.isdigit():
+        filter = int(filter)
     if isinstance(filter, int):
-        users = User.objects.filter(id=filter)
+        users = PLUser.objects.filter(id=filter)
     elif isinstance(filter, StringTypes):
-        users = User.objects.filter(role_type=filter)
-    elif isinstance(filer, dict):
-        users = User.objects.filter(**filter)
+        users = PLUser.objects.filter(email=filter)
+    elif isinstance(filter, dict):
+        users = PLUser.objects.filter(**filter)
     else:
         users = []
     return users 
 
 def add_user(auth, fields):
-    driver = OpenStackDriver(client = auth_check(auth))
+    user = authenticate(username=auth.get('username'),
+                        password=auth.get('password'))
+    auth['tenant'] = user.site.login_base
+
     sites = _get_sites(fields.get('site')) 
     if sites: fields['site'] = sites[0]     
-    user = User(**fields)
-    nova_fields = {'name': user.email[:user.email.find('@')],
-                   'email': user.email, 
-                   'password': fields.get('password'),
-                   'enabled': user.enabled}    
-    nova_user = driver.create_user(**nova_fields)
-    #driver.add_user_user(user.id, user.site.tenant_id, 'user')
-    user.user_id=nova_user.id
+    user = PLUser(**fields)
+    user.os_manager = OpenStackManager(auth=auth, caller = user)
     user.save()
     return user
 
 def update_user(auth, id, **fields):
-    driver = OpenStackDriver(client = auth_check(auth))
-    users = User.objects.filter(id=id)
+    user = authenticate(username=auth.get('username'),
+                        password=auth.get('password'))
+    auth['tenant'] = user.site.login_base
+
+    users = PLUser.objects.filter(id=id)
     if not users:
         return
 
@@ -45,22 +47,29 @@ def update_user(auth, id, **fields):
         nova_fields['password'] = fields['password']
     if 'enabled' in fields:
         nova_fields['enabled'] = fields['enabled']
-    driver.update_user(user.user_id, **nova_fields)
+
+    
     sites = _get_sites(fields.get('site'))
     if sites: fields['site'] = sites[0]
-    user.update(**fields)
+    user.os_manager = OpenStackManager(auth=auth, caller = user)
+    for (k,v) in fields.items():
+        setattr(user, k, v)    
+    user.save()
     return user 
 
 def delete_user(auth, filter={}):
-    driver = OpenStackDriver(client = auth_check(auth))   
+    user = authenticate(username=auth.get('username'),
+                        password=auth.get('password'))
+    auth['tenant'] = user.site.login_base
     users = _get_users(filter)
     for user in users:
-        driver.delete_user(id=user.user_id) 
+        user.os_manager = OpenStackManager(auth=auth, caller = user) 
         user.delete()
     return 1
 
 def get_users(auth, filter={}):
-    client = auth_check(auth)
+    user = authenticate(username=auth.get('username'),
+                        password=auth.get('password'))
     users = _get_users(filter)
     return users