From: Sapan Bhatia Date: Wed, 3 Sep 2014 19:41:49 +0000 (-0400) Subject: Drop network model policy from Observer X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=79684afcfec1bc37e7229f67945a34b470b89476;hp=3a5ef2b669fa08a0d700636efc6f89ccf773ca4e;p=plstackapi.git Drop network model policy from Observer --- diff --git a/planetstack/openstack_observer/steps/sync_network_deployments.py b/planetstack/openstack_observer/steps/sync_network_deployments.py index 367440d..8eecb3b 100644 --- a/planetstack/openstack_observer/steps/sync_network_deployments.py +++ b/planetstack/openstack_observer/steps/sync_network_deployments.py @@ -20,25 +20,6 @@ class SyncNetworkDeployments(OpenStackSyncStep): if (deleted): return NetworkDeployments.deleted_objects.all() else: - # network deployments are not visible to users. We must ensure - # networks are deployed at all deploymets available to their slices. - slice_deployments = SliceDeployments.objects.all() - slice_deploy_lookup = defaultdict(list) - for slice_deployment in slice_deployments: - slice_deploy_lookup[slice_deployment.slice].append(slice_deployment.deployment) - - network_deployments = NetworkDeployments.objects.all() - network_deploy_lookup = defaultdict(list) - for network_deployment in network_deployments: - network_deploy_lookup[network_deployment.network].append(network_deployment.deployment) - - for network in Network.objects.filter(): - expected_deployments = slice_deploy_lookup[network.owner] - for expected_deployment in expected_deployments: - if network not in network_deploy_lookup or \ - expected_deployment not in network_deploy_lookup[network]: - nd = NetworkDeployments(network=network, deployment=expected_deployment) - nd.save() return NetworkDeployments.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None)) def get_next_subnet(self, deployment=None):