Controller replaces Deployment
diff --git a/planetstack/openstack_observer/steps/sync_slice_memberships.py b/planetstack/openstack_observer/steps/sync_slice_memberships.py
index b1cd223..600f012 100644
--- a/planetstack/openstack_observer/steps/sync_slice_memberships.py
+++ b/planetstack/openstack_observer/steps/sync_slice_memberships.py
@@ -4,7 +4,7 @@
from planetstack.config import Config
from observer.openstacksyncstep import OpenStackSyncStep
from core.models.slice import *
-from core.models.userdeployments import UserDeployments
+from core.models.controllerusers import ControllerUsers
from util.logger import Logger, logging
logger = Logger(level=logging.INFO)
@@ -20,17 +20,17 @@
return SlicePrivilege.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
def sync_record(self, slice_memb):
- # sync slice memberships at all slice deployments
+ # sync slice memberships at all slice controllers
logger.info("syncing slice privilege: %s %s" % (slice_memb.slice.name, slice_memb.user.email))
- slice_deployments = SliceDeployments.objects.filter(slice=slice_memb.slice)
- for slice_deployment in slice_deployments:
- if not slice_deployment.tenant_id:
+ slice_controllers = ControllerSlices.objects.filter(slice=slice_memb.slice)
+ for slice_controller in slice_controllers:
+ if not slice_controller.tenant_id:
continue
- user_deployments = UserDeployments.objects.filter(deployment=slice_deployment.deployment,
+ controller_users = ControllerUsers.objects.filter(controller=slice_controller.controller,
user=slice_memb.user)
- if user_deployments:
- kuser_id = user_deployments[0].kuser_id
- driver = self.driver.admin_driver(deployment=slice_deployment.deployment.name)
+ if controller_users:
+ kuser_id = controller_users[0].kuser_id
+ driver = self.driver.admin_driver(controller=slice_controller.controller.name)
driver.add_user_role(kuser_id,
- slice_deployment.tenant_id,
+ slice_controller.tenant_id,
slice_memb.role.role)