CORD-1010 Fix Controller, Image, Network, and User model_policies
Change-Id: I42f8771048090666acd9d75ca32b6081a72ce880
diff --git a/xos/synchronizer/model_policies/model_policy_Controller.py b/xos/synchronizer/model_policies/model_policy_Controller.py
index 2ff25d4..680f252 100644
--- a/xos/synchronizer/model_policies/model_policy_Controller.py
+++ b/xos/synchronizer/model_policies/model_policy_Controller.py
@@ -6,56 +6,61 @@
ctrls_by_site = defaultdict(list)
ctrl_sites = ControllerSite.objects.all()
for ctrl_site in ctrl_sites:
- ctrls_by_site[ctrl_site.site].append(ctrl_site.controller)
+ ctrls_by_site[ctrl_site.site.id].append(ctrl_site.controller.id)
+
sites = Site.objects.all()
for site in sites:
- if site not in ctrls_by_site or \
- controller not in ctrls_by_site[site]:
+ if site.id not in ctrls_by_site or controller.id not in ctrls_by_site[site.id]:
controller_site = ControllerSite(controller=controller, site=site)
controller_site.save()
+
# relations for all slices
ctrls_by_slice = defaultdict(list)
ctrl_slices = ControllerSlice.objects.all()
for ctrl_slice in ctrl_slices:
- ctrls_by_slice[ctrl_slice.slice].append(ctrl_slice.controller)
+ ctrls_by_slice[ctrl_slice.slice.id].append(ctrl_slice.controller.id)
+
slices = Slice.objects.all()
for slice in slices:
- if slice not in ctrls_by_slice or \
- controller not in ctrls_by_slice[slice]:
+ if slice.id not in ctrls_by_slice or controller.id not in ctrls_by_slice[slice.id]:
controller_slice = ControllerSlice(controller=controller, slice=slice)
controller_slice.save()
+
# relations for all users
ctrls_by_user = defaultdict(list)
ctrl_users = ControllerUser.objects.all()
for ctrl_user in ctrl_users:
- ctrls_by_user[ctrl_user.user].append(ctrl_user.controller)
+ ctrls_by_user[ctrl_user.user.id].append(ctrl_user.controller.id)
+
users = User.objects.all()
for user in users:
- if user not in ctrls_by_user or \
- controller not in ctrls_by_user[user]:
+ if user.id not in ctrls_by_user or controller.id not in ctrls_by_user[user.id]:
controller_user = ControllerUser(controller=controller, user=user)
controller_user.save()
+
# relations for all networks
ctrls_by_network = defaultdict(list)
ctrl_networks = ControllerNetwork.objects.all()
for ctrl_network in ctrl_networks:
- ctrls_by_network[ctrl_network.network].append(ctrl_network.controller)
+ ctrls_by_network[ctrl_network.network.id].append(ctrl_network.controller.id)
+
networks = Network.objects.all()
for network in networks:
- if network not in ctrls_by_network or \
- controller not in ctrls_by_network[network]:
+ if network.id not in ctrls_by_network or controller.id not in ctrls_by_network[network.id]:
controller_network = ControllerNetwork(controller=controller, network=network)
if network.subnet and network.subnet.strip():
controller_network.subnet = network.subnet.strip()
controller_network.save()
+
# relations for all images
ctrls_by_image = defaultdict(list)
ctrl_images = ControllerImages.objects.all()
for ctrl_image in ctrl_images:
- ctrls_by_image[ctrl_image.image].append(ctrl_image.controller)
+ ctrls_by_image[ctrl_image.image.id].append(ctrl_image.controller.id)
+
images = Image.objects.all()
for image in images:
- if image not in ctrls_by_image or \
- controller not in ctrls_by_image[image]:
+ if image.id not in ctrls_by_image or controller.id not in ctrls_by_image[image.id]:
controller_image = ControllerImages(controller=controller, image=image)
controller_image.save()
+