Merge pick up, tweaked role/site/plcore_base or os_manager path when OpenStack not...

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

diff --git a/plstackapi/core/api/users.py b/planetstack/core/api/users.py
similarity index 84%
rename from plstackapi/core/api/users.py
rename to planetstack/core/api/users.py
index c190562..08e851c 100644 (file)
--- a/plstackapi/core/api/users.py
+++ b/planetstack/core/api/users.py
@@ -1,18 +1,18 @@
 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
+from openstack.manager import OpenStackManager    
+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 
@@ -24,7 +24,7 @@ def add_user(auth, fields):
 
     sites = _get_sites(fields.get('site')) 
     if sites: fields['site'] = sites[0]     
-    user = PLUser(**fields)
+    user = User(**fields)
     user.os_manager = OpenStackManager(auth=auth, caller = user)
     user.save()
     return user
@@ -34,7 +34,7 @@ def update_user(auth, id, **fields):
                         password=auth.get('password'))
     auth['tenant'] = user.site.login_base
 
-    users = PLUser.objects.filter(id=id)
+    users = User.objects.filter(id=id)
     if not users:
         return
 
@@ -47,8 +47,6 @@ def update_user(auth, id, **fields):
         nova_fields['password'] = fields['password']
     if 'enabled' in fields:
         nova_fields['enabled'] = fields['enabled']
-
-    
     sites = _get_sites(fields.get('site'))
     if sites: fields['site'] = sites[0]
     user.os_manager = OpenStackManager(auth=auth, caller = user)