bugfixes and cleanup

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

diff --git a/planetstack/openstack_observer/steps/sync_controller_networks.py b/planetstack/openstack_observer/steps/sync_controller_networks.py
index 43769a7..c90e4df 100644 (file)
--- a/planetstack/openstack_observer/steps/sync_controller_networks.py
+++ b/planetstack/openstack_observer/steps/sync_controller_networks.py
@@ -9,12 +9,13 @@ from core.models.network import *
 from core.models.slice import *
 from core.models.sliver import Sliver
 from util.logger import Logger, logging
+from observer.ansible import *
 
 logger = Logger(level=logging.INFO)
 
 class SyncControllerNetworks(OpenStackSyncStep):
     requested_interval = 0
-    provides=[Network, ControllerNetworks, Sliver]
+    provides=[Network, ControllerNetwork, Sliver]
 
     def alloc_subnet(self, uuid):
         a = 10
@@ -28,25 +29,28 @@ class SyncControllerNetworks(OpenStackSyncStep):
 
     def fetch_pending(self, deleted):
         if (deleted):
-            return ControllerNetworks.deleted_objects.all()
+            return ControllerNetwork.deleted_objects.all()
         else:
-            return ControllerNetworks.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
+            return ControllerNetwork.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
 
 
     def save_controller_network(self, controller_network):
             network_name = controller_network.network.name
             subnet_name = '%s-%d'%(network_name,controller_network.pk)
            cidr = self.alloc_subnet(controller_network.pk)
+           slice = controller_network.network.slices.all()[0] # XXX: FIXME!!
+
            network_fields = {'endpoint':controller_network.controller.auth_url,
-                       'admin_user':controller_network.network.slice.creator.email,
-                       'tenant_name':controller_network.network.slice.slicename,
-                       'admin_password':controller_network.controller.admin_password,
+                       'admin_user':slice.creator.email, # XXX: FIXME
+                       'tenant_name':slice.name, # XXX: FIXME
+                       'admin_password':slice.creator.remote_password,
                        'name':network_name,
                        'subnet_name':subnet_name,
+                       'ansible_tag':'%s-%s@%s'%(network_name,slice.slicename,controller_network.controller.name),
                        'cidr':cidr
                        }
 
-           res = run_template('sync_controller_networks.yaml', network_fields)
+           res = run_template('sync_controller_networks.yaml', network_fields, path = 'controller_networks')
 
            if (len(res)!=2):
                raise Exception('Could not sync network %s'%controller_network.network.name)
@@ -68,7 +72,6 @@ class SyncControllerNetworks(OpenStackSyncStep):
             logger.info("controller %r has no admin_user, skipping" % controller_network.controller)
             return
 
-        self.driver = self.driver.admin_driver(controller=controller_network.controller,tenant='admin')
         if controller_network.network.owner and controller_network.network.owner.creator:
             try:
                 # update manager context