From 2bb8aa0ac55c3ffd85232525130a547baa8dc215 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Wed, 3 Sep 2014 15:43:04 -0400 Subject: [PATCH] Drop Slice policy code from Observer --- .../steps/sync_slice_deployments.py | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/planetstack/openstack_observer/steps/sync_slice_deployments.py b/planetstack/openstack_observer/steps/sync_slice_deployments.py index 24b7459..fff2e04 100644 --- a/planetstack/openstack_observer/steps/sync_slice_deployments.py +++ b/planetstack/openstack_observer/steps/sync_slice_deployments.py @@ -20,30 +20,6 @@ class SyncSliceDeployments(OpenStackSyncStep): if (deleted): return SliceDeployments.deleted_objects.all() else: - # slice deployments are not visible to users. We must ensure - # slices are deployed at all deploymets available to their site. - site_deployments = SiteDeployments.objects.all() - site_deploy_lookup = defaultdict(list) - for site_deployment in site_deployments: - site_deploy_lookup[site_deployment.site].append(site_deployment.deployment) - - 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) - - all_deployments = Deployment.objects.all() - for slice in Slice.objects.all(): - # slices are added to all deployments for now - expected_deployments = all_deployments - #expected_deployments = site_deploy_lookup[slice.site] - for expected_deployment in expected_deployments: - if slice not in slice_deploy_lookup or \ - expected_deployment not in slice_deploy_lookup[slice]: - sd = SliceDeployments(slice=slice, deployment=expected_deployment) - sd.save() - - # now we can return all slice deployments that need to be enacted return SliceDeployments.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None)) def get_next_subnet(self, deployment=None): -- 2.43.0