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

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

diff --git a/plstackapi/core/api/site_privileges.py b/planetstack/core/api/site_privileges.py
similarity index 80%
rename from plstackapi/core/api/site_privileges.py
rename to planetstack/core/api/site_privileges.py
index ac56dd1..85a8a83 100644 (file)
--- a/plstackapi/core/api/site_privileges.py
+++ b/planetstack/core/api/site_privileges.py
@@ -1,12 +1,12 @@
 from types import StringTypes
 import re
-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 SitePrivilege
-from plstackapi.core.api.users import _get_users
-from plstackapi.core.api.sites import _get_sites
-from plstackapi.core.api.roles import _get_roles
+from openstack.client import OpenStackClient
+from openstack.driver import OpenStackDriver
+from core.api.auth import auth_check
+from core.models import SitePrivilege
+from core.api.users import _get_users
+from core.api.sites import _get_sites
+from core.api.roles import _get_roles
 
 
 def _get_site_privileges(filter):
@@ -35,7 +35,7 @@ def add_site_privilege(auth, fields):
     site_privilege = SitePrivilege(**fields)
 
     # update nova role
-    driver.add_user_role(site_privilege.user.user_id, 
+    driver.add_user_role(site_privilege.user.kuser_id, 
                          site_privilege.site.tenant_id, 
                          site_privilege.role.name)
     
@@ -49,7 +49,7 @@ def delete_site_privilege(auth, filter={}):
     driver = OpenStackDriver(client = auth_check(auth))   
     site_privileges = _get_site_privileges(filter)
     for site_privilege in site_privileges:
-        driver.delete_user_role(user_id=site_privilege.user.id,
+        driver.delete_user_role(kuser_id=site_privilege.user.id,
                                 tenant_id = site_privilege.site.tenant_id,
                                 role_name = site_privilege.role.name) 
         site_privilege.delete()