commit 75bae457b3ff5b97b3c6e33a59a6bbbad9b6a821
author Scott Baker <smbaker@gmail.com> Mon Mar 27 20:10:58 2017 -0700
committer Scott Baker <smbaker@gmail.com> Tue Mar 28 00:03:07 2017 -0700
tree 437ef161b4b7b7b4a2a0107feb9a8051682a07f3
parent 8c5428486dbc6744d405de832c237006d4242c6a

CORD-1010 update ca certificates for openstack sync, remove sysctl tag support

Change-Id: Idd696966d9bc39c1f9984b0f6ac3a3a85371e952

xos/synchronizer/model_policies/model_policy_Image.py

diff --git a/xos/synchronizer/model_policies/model_policy_Image.py b/xos/synchronizer/model_policies/model_policy_Image.py
index 6d6982e..7e1a6f3 100644
--- a/xos/synchronizer/model_policies/model_policy_Image.py
+++ b/xos/synchronizer/model_policies/model_policy_Image.py
@@ -5,7 +5,7 @@
         # container images do not get instantiated
         return
 
-    controller_images = ControllerImages.objects.filter(image=image)
+    controller_images = ControllerImages.objects.filter(image_id=image.id)
     existing_controllers = [cs.controller for cs in controller_images] 
     
     all_controllers = Controller.objects.all() 

xos/synchronizer/model_policies/model_policy_Slice.py

diff --git a/xos/synchronizer/model_policies/model_policy_Slice.py b/xos/synchronizer/model_policies/model_policy_Slice.py
index 953d2c9..68aa596 100644
--- a/xos/synchronizer/model_policies/model_policy_Slice.py
+++ b/xos/synchronizer/model_policies/model_policy_Slice.py
@@ -20,13 +20,14 @@
     # slice = Slice.get(slice_id)
 
     controller_slices = ControllerSlice.objects.filter(slice_id=slice.id)
-    existing_controllers = [cs.controller for cs in controller_slices] 
-        
+    existing_controllers = [cs.controller for cs in controller_slices]
+    existing_controllers_ids = [x.id for x in existing_controllers]
+
     print "MODEL POLICY: slice existing_controllers=", existing_controllers
 
     all_controllers = Controller.objects.all()
     for controller in all_controllers:
-        if controller not in existing_controllers:
+        if controller.id not in existing_controllers_ids:
             print "MODEL POLICY: slice adding controller", controller
             sd = ControllerSlice(slice=slice, controller=controller)
             sd.save()