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

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

diff --git a/plstackapi/core/api/slice_memberships.py b/planetstack/core/api/slice_memberships.py
similarity index 83%
rename from plstackapi/core/api/slice_memberships.py
rename to planetstack/core/api/slice_memberships.py
index 431552d..77d79bf 100644 (file)
--- a/plstackapi/core/api/slice_memberships.py
+++ b/planetstack/core/api/slice_memberships.py
@@ -1,11 +1,11 @@
 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 SliceMembership
-from plstackapi.core.api.users import _get_users
-from plstackapi.core.api.slices import _get_slices
-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 SliceMembership
+from core.api.users import _get_users
+from core.api.slices import _get_slices
+from core.api.roles import _get_roles
 
 def _get_slice_memberships(filter):
     if isinstance(filter, StringTypes) and filter.isdigit():
@@ -48,7 +48,7 @@ def delete_slice_membership(auth, filter={}):
     driver = OpenStackDriver(client = auth_check(auth))   
     slice_memberships = _get_slice_memberships(filter)
     for slice_membership in slice_memberships:
-        driver.delete_user_role(user_id=slice_membership.user.id,
+        driver.delete_user_role(kuser_id=slice_membership.user.id,
                                 tenant_id = slice_membership.slice.tenant_id,
                                 role_name = slice_membership.role.name) 
         slice_membership.delete()