X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack_observer%2Fsteps%2Fsync_networks.py;h=a4e95520bef9665b9c937413f65f93bf1db5eea4;hb=12fb1ef606b7c977ff447df435050b140083ec28;hp=552f03cf31e8062c6d7aa261c85dacea9b1ae777;hpb=a5593a23a625c033f5133df873c819daacb31e98;p=plstackapi.git

diff --git a/planetstack/openstack_observer/steps/sync_networks.py b/planetstack/openstack_observer/steps/sync_networks.py
index 552f03c..a4e9552 100644
--- a/planetstack/openstack_observer/steps/sync_networks.py
+++ b/planetstack/openstack_observer/steps/sync_networks.py
@@ -5,6 +5,7 @@ from planetstack.config import Config
 from observer.openstacksyncstep import OpenStackSyncStep
 from core.models.network import *
 from util.logger import Logger, logging
+from observer.steps.sync_controller_networks import *
 
 logger = Logger(level=logging.INFO)
 
@@ -12,21 +13,14 @@ class SyncNetworks(OpenStackSyncStep):
     provides=[Network]
     requested_interval = 0
 
-    def fetch_pending(self, deleted):
-        if (not deleted):
-            objs = Network.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
-        else:
-            objs = Network.deleted_objects.all()
-
     def sync_record(self, network):
         network.save()
 
     def delete_record(self, network):
-        network_deployment_deleter = NetworkDeploymentDeleter()
-        for network_deployment in NetworkDeployments.objects.filter(network=network):
+        controller_networks_deleter = SyncControllerNetworks().delete_record
+        for controller_network in ControllerNetworks.objects.filter(network=network):
             try:
-                network_deployment_deleter(network_deployment.id)    
-            except Exeption,e:
-                logger.log_exc("Failed to delete network deployment %s" % network_deployment)
+                controller_network_deleter(controller_network)    
+            except Exception,e:
+                logger.log_exc("Failed to delete controller network %s" % controller_network)
                 raise e
-        network.delete()