removing plural from model names. some cleanup

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

diff --git a/planetstack/openstack_observer/steps/sync_slivers.py b/planetstack/openstack_observer/steps/sync_slivers.py
index 6f61f53..8adb50c 100644 (file)
--- a/planetstack/openstack_observer/steps/sync_slivers.py
+++ b/planetstack/openstack_observer/steps/sync_slivers.py
@@ -4,11 +4,10 @@ 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, ControllerSlices
-from core.models.network import Network, NetworkSlice, ControllerNetworks
+from core.models.slice import Slice, SlicePrivilege, ControllerSlice
+from core.models.network import Network, NetworkSlice, ControllerNetwork
 from util.logger import Logger, logging
 from observer.ansible import *
-import pdb
 
 logger = Logger(level=logging.INFO)
 
@@ -46,7 +45,7 @@ class SyncSlivers(OpenStackSyncStep):
 
         nics = []
         networks = [ns.network for ns in NetworkSlice.objects.filter(slice=sliver.slice)]
-        controller_networks = ControllerNetworks.objects.filter(network__in=networks,
+        controller_networks = ControllerNetwork.objects.filter(network__in=networks,
                                                                 controller=sliver.node.site_deployment.controller)
 
         for controller_network in controller_networks:
@@ -55,8 +54,8 @@ class SyncSlivers(OpenStackSyncStep):
                 nics.append(controller_network.net_id)
 
         # now include network template
-        network_templates = [network.template.sharedNetworkName for network in networks \
-                             if network.template.sharedNetworkName]
+        network_templates = [network.template.shared_network_name for network in networks \
+                             if network.template.shared_network_name]
 
         #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)