X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack_observer%2Fsteps%2Fsync_controller_networks.py;h=cb82680a5c8766fed67aaa3b7b61daee963ed7c7;hb=300a8e18eb6c1839c2b6b9851030b6c6702ca14a;hp=3cff7c2891b13a4d302dad4037aa17546237bf3d;hpb=087a7d31bc0c760e40cdc12906ec49d0d2cb8ebb;p=plstackapi.git

diff --git a/planetstack/openstack_observer/steps/sync_controller_networks.py b/planetstack/openstack_observer/steps/sync_controller_networks.py
index 3cff7c2..cb82680 100644
--- a/planetstack/openstack_observer/steps/sync_controller_networks.py
+++ b/planetstack/openstack_observer/steps/sync_controller_networks.py
@@ -15,7 +15,7 @@ logger = Logger(level=logging.INFO)
 
 class SyncControllerNetworks(OpenStackSyncStep):
     requested_interval = 0
-    provides=[Network, ControllerNetworks, Sliver]
+    provides=[ControllerNetwork, Network]
 
     def alloc_subnet(self, uuid):
         a = 10
@@ -29,9 +29,9 @@ 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):
@@ -42,8 +42,8 @@ class SyncControllerNetworks(OpenStackSyncStep):
 
 	    network_fields = {'endpoint':controller_network.controller.auth_url,
 			'admin_user':slice.creator.email, # XXX: FIXME
-			'tenant_name':slice.slicename, # XXX: FIXME
-			'admin_password':controller_network.controller.admin_password,
+			'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),