Controller replaces Deployment

diff --git a/planetstack/openstack_observer/steps/sync_slivers.py b/planetstack/openstack_observer/steps/sync_slivers.py
index 8237896..6c1398f 100644 (file)
--- a/planetstack/openstack_observer/steps/sync_slivers.py
+++ b/planetstack/openstack_observer/steps/sync_slivers.py
@@ -4,8 +4,8 @@ from django.db.models import F, Q
 from planetstack.config import Config
 from observer.openstacksyncstep import OpenStackSyncStep
 from core.models.sliver import Sliver
-from core.models.slice import Slice, SlicePrivilege, SliceDeployments
-from core.models.network import Network, NetworkSlice, NetworkDeployments
+from core.models.slice import Slice, SlicePrivilege, ControllerSlices
+from core.models.network import Network, NetworkSlice, ControllerNetworks
 from util.logger import Logger, logging
 from observer.ansible import *
 
@@ -24,7 +24,7 @@ class SyncSlivers(OpenStackSyncStep):
         return userdata
 
     def sync_record(self, sliver):
-        logger.info("sync'ing sliver:%s slice:%s deployment:%s " % (sliver, sliver.slice.name, sliver.node.deployment))
+        logger.info("sync'ing sliver:%s slice:%s controller:%s " % (sliver, sliver.slice.name, sliver.node.site_controller))
 
         metadata_update = {}
        if (sliver.numberCores):
@@ -45,20 +45,20 @@ class SyncSlivers(OpenStackSyncStep):
 
        nics = []
        networks = [ns.network for ns in NetworkSlice.objects.filter(slice=sliver.slice)]   
-       network_deployments = NetworkDeployments.objects.filter(network__in=networks, 
-                                                               deployment=sliver.node.deployment)
+       controller_networks = ControllerNetworks.objects.filter(network__in=networks, 
+                                                               controller=sliver.node.site_controller.controller)
 
-       for network_deployment in network_deployments:
-           if network_deployment.network.template.visibility == 'private' and \
-              network_deployment.network.template.translation == 'none' and network_deployment.net_id: 
-               nics.append(network_deployment.net_id)
+       for controller_network in controller_networks:
+           if controller_network.network.template.visibility == 'private' and \
+              controller_network.network.template.translation == 'none' and controller_network.net_id: 
+               nics.append(controller_network.net_id)
 
        # now include network template
        network_templates = [network.template.sharedNetworkName for network in networks \
                             if network.template.sharedNetworkName]
 
-        #driver = self.driver.client_driver(caller=sliver.creator, tenant=sliver.slice.name, deployment=sliver.deploymentNetwork)
-        driver = self.driver.admin_driver(tenant='admin', deployment=sliver.deploymentNetwork)
+        #driver = self.driver.client_driver(caller=sliver.creator, tenant=sliver.slice.name, controller=sliver.controllerNetwork)
+        driver = self.driver.admin_driver(tenant='admin', controller=sliver.controllerNetwork)
        nets = driver.shell.quantum.list_networks()['networks']
        for net in nets:
            if net['name'] in network_templates: 
@@ -70,14 +70,14 @@ class SyncSlivers(OpenStackSyncStep):
                    nics.append(net['id'])
 
        # look up image id
-       deployment_driver = self.driver.admin_driver(deployment=sliver.deploymentNetwork.name)
+       controller_driver = self.driver.admin_driver(controller=sliver.controllerNetwork.name)
        image_id = None
-       images = deployment_driver.shell.glanceclient.images.list()
+       images = controller_driver.shell.glanceclient.images.list()
        for image in images:
            if image.name == sliver.image.name or not image_id:
                image_id = image.id
                
-       # look up key name at the deployment
+       # look up key name at the controller
        # create/fetch keypair
        keyname = None
        keyname = sliver.creator.email.lower().replace('@', 'AT').replace('.', '') +\
@@ -91,9 +91,9 @@ class SyncSlivers(OpenStackSyncStep):
            userData = sliver.userData
            
        sliver_name = '@'.join([sliver.slice.name,sliver.node.name])
-       tenant_fields = {'endpoint':sliver.node.deployment.auth_url,
-                    'admin_user': sliver.node.deployment.admin_user,
-                    'admin_password': sliver.node.deployment.admin_password,
+       tenant_fields = {'endpoint':sliver.node.controller.auth_url,
+                    'admin_user': sliver.node.controller.admin_user,
+                    'admin_password': sliver.node.controller.admin_password,
                     'admin_tenant': 'admin',
                     'tenant': sliver.slice.name,
                     'tenant_description': sliver.slice.description,
@@ -120,5 +120,5 @@ class SyncSlivers(OpenStackSyncStep):
         if sliver.instance_id:
             driver = self.driver.client_driver(caller=sliver.creator, 
                                                tenant=sliver.slice.name,
-                                               deployment=sliver.deploymentNetwork.name)
+                                               controller=sliver.controllerNetwork.name)
             driver.destroy_instance(sliver.instance_id)