commit 99f94c9e4416c813a8bbb0761dab9c455e9e08bc
author Sapan Bhatia <gwsapan@gmail.com> Wed Nov 29 14:30:19 2017 -0500
committer Sapan Bhatia <sapan@opennetworking.org> Wed Nov 29 23:52:24 2017 +0000
tree 1c1f1ac06c9bd06da7e76590ee5af7045450ac88
parent c8a596cb232889fe8794f2c0f662cc0103d1de00

CORD-2317: Fix a race condition involving lazy_blocked

Change-Id: I8ab359e3729cda94a03569e3c6d9e288ffa001a1
(cherry picked from commit 2bb904519fc1a716a2372b32941aa5ef69d1403b)

xos/synchronizer/model_policies/model_policy_Network.py

diff --git a/xos/synchronizer/model_policies/model_policy_Network.py b/xos/synchronizer/model_policies/model_policy_Network.py
index a4a19b5..24ec0dd 100644
--- a/xos/synchronizer/model_policies/model_policy_Network.py
+++ b/xos/synchronizer/model_policies/model_policy_Network.py
@@ -25,14 +25,6 @@
         return self.handle_update(network)
 
     def handle_update(self, network):
-        # if (not network.owner.policed) or (network.owner.policed<network.owner.updated):
-        #    raise Exception("Cannot apply network policies until slice policies have completed")
-
-        #expected_controllers = []
-        #for slice_controller in ControllerSlice.objects.all():
-        #    if slice_controller.slice.id == network.owner.id:
-        #        expected_controllers.append(slice_controller.controller)
-
         # For simplicity, let's assume that a network gets deployed on all controllers.
         expected_controllers =  Controller.objects.all()
 
@@ -45,17 +37,7 @@
 
         for expected_controller in expected_controllers:
             if expected_controller.id not in existing_controller_ids:
-                lazy_blocked=True
-
-                # check and see if some instance already exists
-                for networkslice in network.networkslices.all():
-                    found = False
-                    for instance in networkslice.slice.instances.all():
-                       if instance.node.site_deployment.controller.id == expected_controller.id:
-                           found = True
-                    if found:
-                       self.logger.info("MODEL_POLICY: network %s setting lazy_blocked to false because instance on controller already exists" % network)
-                       lazy_blocked=False
+                lazy_blocked=False
 
                 nd = ControllerNetwork(network=network, controller=expected_controller, lazy_blocked=lazy_blocked)
                 self.logger.info("MODEL POLICY: network %s create ControllerNetwork %s lazy_blocked %s" % (network, nd, lazy_blocked))