Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

[plstackapi.git] / planetstack / openstack_observer / steps / sync_sites.py

diff --git a/planetstack/openstack_observer/steps/sync_sites.py b/planetstack/openstack_observer/steps/sync_sites.py
index a30160c..ea7df7e 100644 (file)
--- a/planetstack/openstack_observer/steps/sync_sites.py
+++ b/planetstack/openstack_observer/steps/sync_sites.py
@@ -3,7 +3,8 @@ import base64
 from django.db.models import F, Q
 from planetstack.config import Config
 from observer.openstacksyncstep import OpenStackSyncStep
-from core.models.site import Site
+from core.models.site import Site, SiteDeployments, SiteDeployments 
+from observer.steps.sync_controller_site_deployments import *
 
 class SyncSites(OpenStackSyncStep):
     provides=[Site]
@@ -13,8 +14,12 @@ class SyncSites(OpenStackSyncStep):
         site.save()
 
     def delete_record(self, site):
+        # delete associated controllers site deployments
         site_deployments = SiteDeployments.objects.filter(site=site)
-        site_deployment_deleter = SiteDeploymentDeleter()
+        site_deploy_deleter = SyncControllerSiteDeployments().delete_record
         for site_deployment in site_deployments:
-            site_deployment_deleter(site_deployment.id)
-        site.delete()
+            site_deployment_deleter(site_deployment)
+
+         
+
+