renaming

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

diff --git a/planetstack/openstack_observer/steps/sync_slice_deployments.py b/planetstack/openstack_observer/steps/sync_slice_deployments.py
index 2bc2082..4c358d7 100644 (file)
--- a/planetstack/openstack_observer/steps/sync_slice_deployments.py
+++ b/planetstack/openstack_observer/steps/sync_slice_deployments.py
@@ -5,23 +5,23 @@ from netaddr import IPAddress, IPNetwork
 from django.db.models import F, Q
 from planetstack.config import Config
 from observer.openstacksyncstep import OpenStackSyncStep
-from core.models.site import Deployment, SiteDeployment
-from core.models.slice import Slice, SliceDeployment
-from core.models.userdeployments import UserDeployment
+from core.models.site import Deployment, SiteDeployments
+from core.models.slice import Slice, SliceDeployments
+from core.models.userdeployments import UserDeployments
 from util.logger import Logger, logging
 from observer.ansible import *
 
 logger = Logger(level=logging.INFO)
 
-class SyncSliceDeployment(OpenStackSyncStep):
-    provides=[SliceDeployment]
+class SyncSliceDeployments(OpenStackSyncStep):
+    provides=[SliceDeployments]
     requested_interval=0
 
     def fetch_pending(self, deleted):
         if (deleted):
-            return SliceDeployment.deleted_objects.all()
+            return SliceDeployments.deleted_objects.all()
         else:
-            return SliceDeployment.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
+            return SliceDeployments.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
 
     def get_next_subnet(self, deployment=None):
         # limit ourself to 10.0.x.x for now
@@ -48,7 +48,7 @@ class SyncSliceDeployment(OpenStackSyncStep):
             logger.info("deployment %r has no admin_user, skipping" % slice_deployment.deployment)
             return
 
-       deployment_users = UserDeployment.objects.filter(user=slice_deployment.slice.creator,
+       deployment_users = UserDeployments.objects.filter(user=slice_deployment.slice.creator,
                                                              deployment=slice_deployment.deployment)            
        if not deployment_users:
            logger.info("slice createor %s has not accout at deployment %s" % (slice_deployment.slice.creator, slice_deployment.deployment.name))
@@ -65,7 +65,7 @@ class SyncSliceDeployment(OpenStackSyncStep):
                         'tenant': slice_deployment.slice.name,
                         'tenant_description': slice_deployment.slice.description,
                         'roles':roles,
-                        'name':deployment_user.email,
+                        'name':deployment_user.user.email,
                         'max_instances':max_instances}
 
        res = run_template('sync_slice_deployments.yaml', tenant_fields)