Refactor to /opt/planetstack, final tweaks to make sure planetstack can run in non...

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

diff --git a/plstackapi/core/api/users.py b/planetstack/core/api/users.py
similarity index 74%
rename from plstackapi/core/api/users.py
rename to planetstack/core/api/users.py
index 5b89389..3b157ac 100644 (file)
--- a/plstackapi/core/api/users.py
+++ b/planetstack/core/api/users.py
@@ -1,19 +1,19 @@
 from types import StringTypes
-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 PLUser, Site
-from plstackapi.core.api.sites import _get_sites
+from openstack.client import OpenStackClient
+from openstack.driver import OpenStackDriver
+from core.api.auth import auth_check
+from core.models import User, Site
+from 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 = PLUser.objects.filter(id=filter)
+        users = User.objects.filter(id=filter)
     elif isinstance(filter, StringTypes):
-        users = PLUser.objects.filter(email=filter)
+        users = User.objects.filter(email=filter)
     elif isinstance(filter, dict):
-        users = PLUser.objects.filter(**filter)
+        users = User.objects.filter(**filter)
     else:
         users = []
     return users 
@@ -22,20 +22,20 @@ def add_user(auth, fields):
     driver = OpenStackDriver(client = auth_check(auth))
     sites = _get_sites(fields.get('site')) 
     if sites: fields['site'] = sites[0]     
-    user = PLUser(**fields)
+    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.kuser_id=nova_user.id
     user.save()
     return user
 
 def update_user(auth, id, **fields):
     driver = OpenStackDriver(client = auth_check(auth))
-    users = PLUser.objects.filter(id=id)
+    users = User.objects.filter(id=id)
     if not users:
         return
 
@@ -48,7 +48,7 @@ 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)
+    driver.update_user(user.kuser_id, **nova_fields)
     sites = _get_sites(fields.get('site'))
     if sites: fields['site'] = sites[0]
     user.update(**fields)
@@ -58,7 +58,7 @@ def delete_user(auth, filter={}):
     driver = OpenStackDriver(client = auth_check(auth))   
     users = _get_users(filter)
     for user in users:
-        driver.delete_user(id=user.user_id) 
+        driver.delete_user(id=user.kuser_id) 
         user.delete()
     return 1