refactor
diff --git a/planetstack/model_policies/model_policy_Slice.py b/planetstack/model_policies/model_policy_Slice.py
index af07e51..46ca9b8 100644
--- a/planetstack/model_policies/model_policy_Slice.py
+++ b/planetstack/model_policies/model_policy_Slice.py
@@ -1,22 +1,20 @@
def handle(slice):
- from core.models import ControllerSites,ControllerSlices,Controller,Network,NetworkSlice,NetworkTemplate
+ from core.models import Controller, ControllerSiteDeployments, ControllerSlices,Controller,Network,NetworkSlice,NetworkTemplate
from collections import defaultdict
- site_controllers = ControllerSites.objects.all()
+ ctrl_site_deployments = ControllerSiteDeployments.objects.all()
site_deploy_lookup = defaultdict(list)
- for site_controller in site_controllers:
- site_deploy_lookup[site_controller.site].append(site_controller.controller)
+ for ctrl_site_deployment in ctrl_site_deployments:
+ site_deploy_lookup[ctrl_site_deployment.site_deployment].append(ctrl_site_deployment)
slice_controllers = ControllerSlices.objects.all()
slice_deploy_lookup = defaultdict(list)
for slice_controller in slice_controllers:
- slice_deploy_lookup[slice_controller.slice].append(slice_controller.controller)
+ slice_deploy_lookup[slice_controller.slice].append(slice_controller)
- all_controllers = Controller.objects.all()
- # slices are added to all controllers for now
- expected_controllers = all_controllers
#expected_controllers = site_deploy_lookup[slice.site]
- for expected_controller in expected_controllers:
+ all_controllers = Controller.objects.all()
+ for expected_controller in controllers:
if slice not in slice_deploy_lookup or \
expected_controller not in slice_deploy_lookup[slice]:
sd = ControllerSlices(slice=slice, controller=expected_controller)
diff --git a/planetstack/model_policies/model_policy_User.py b/planetstack/model_policies/model_policy_User.py
index 593ba9d..703b28c 100644
--- a/planetstack/model_policies/model_policy_User.py
+++ b/planetstack/model_policies/model_policy_User.py
@@ -1,19 +1,17 @@
from core.models import *
def handle(user):
- from core.models import Controller,ControllerSites,ControllerUsers
+ from core.models import Controller, ControllerSiteDeployments, ControllerUsers
from collections import defaultdict
- controllers = Controller.objects.all()
- controller_sitements = ControllerSites.objects.all()
- controller_site_lookup = defaultdict(list)
- for controller_sitement in controller_sitements:
- controller_site_lookup[controller_sitement.site].append(controller_sitement.controller)
+ ctrl_site_deployments = ControllerSiteDeployments.objects.all()
+ controller_lookup = defaultdict(list)
+ for ctrl_site_deployment in ctrl_site_deployments:
+ controller_site_lookup[ctrl_site_deployment.site_deployment].append(ctrl_site_deployment)
controller_user_lookup = defaultdict(list)
- for controller_userment in ControllerUsers.objects.all():
- controller_user_lookup[controller_userment.user].append(controller_userment.controller)
+ for controller_user in ControllerUsers.objects.all():
+ controller_user_lookup[controller_user.user].append(controller_user.controller)
- all_controllers = Controller.objects.filter()
if user.is_admin:
# admins should have an account at all controllers
expected_controllers = controllers