commit 3d872e574d5faf42fb95a92b7e46413c08dbe1ac
author Sapan Bhatia <sapanb@cs.princeton.edu> Tue Nov 11 21:41:12 2014 -0500
committer Sapan Bhatia <sapanb@cs.princeton.edu> Tue Nov 11 21:41:12 2014 -0500
tree 5673c4c31400b8ea7a43c267d0d330f1a3c9328b
parent d2d5dd807407ee03b6788f0f42871d0ffd0ef8fc

Renamed SiteDeployments->SiteDeployment

planetstack/openstack_observer/steps/sync_site_deployments.py

diff --git a/planetstack/openstack_observer/steps/sync_site_deployments.py b/planetstack/openstack_observer/steps/sync_site_deployments.py
index b5e9f9a..27b8648 100644
--- a/planetstack/openstack_observer/steps/sync_site_deployments.py
+++ b/planetstack/openstack_observer/steps/sync_site_deployments.py
@@ -6,9 +6,9 @@
 from core.models.site import *
 from observer.ansible import *
 
-class SyncSiteDeployments(OpenStackSyncStep):
+class SyncSiteDeployment(OpenStackSyncStep):
     requested_interval=0
-    provides=[SiteDeployments, Site]
+    provides=[SiteDeployment, Site]
 
     def sync_record(self, site_deployment):
 

planetstack/openstack_observer/steps/sync_site_privileges.py

diff --git a/planetstack/openstack_observer/steps/sync_site_privileges.py b/planetstack/openstack_observer/steps/sync_site_privileges.py
index d07b279..db2c012 100644
--- a/planetstack/openstack_observer/steps/sync_site_privileges.py
+++ b/planetstack/openstack_observer/steps/sync_site_privileges.py
@@ -3,7 +3,7 @@
 from django.db.models import F, Q
 from planetstack.config import Config
 from observer.openstacksyncstep import OpenStackSyncStep
-from core.models import User, UserDeployments, SitePrivilege, SiteDeployments   
+from core.models import User, UserDeployment, SitePrivilege, SiteDeployment   
 
 class SyncSitePrivileges(OpenStackSyncStep):
     requested_interval=0

planetstack/openstack_observer/steps/sync_sites.py

diff --git a/planetstack/openstack_observer/steps/sync_sites.py b/planetstack/openstack_observer/steps/sync_sites.py
index c560a6a..4672878 100644
--- a/planetstack/openstack_observer/steps/sync_sites.py
+++ b/planetstack/openstack_observer/steps/sync_sites.py
@@ -14,7 +14,7 @@
         site.save()
 
     def delete_record(self, site):
-        site_deployments = SiteDeployments.objects.filter(site=site)
-        site_deployment_deleter = SyncSiteDeployments().delete_record
+        site_deployments = SiteDeployment.objects.filter(site=site)
+        site_deployment_deleter = SyncSiteDeployment().delete_record
         for site_deployment in site_deployments:
             site_deployment_deleter(site_deployment)

planetstack/openstack_observer/steps/sync_user_deployments.py

diff --git a/planetstack/openstack_observer/steps/sync_user_deployments.py b/planetstack/openstack_observer/steps/sync_user_deployments.py
index f7e41a0..6a87cbf 100644
--- a/planetstack/openstack_observer/steps/sync_user_deployments.py
+++ b/planetstack/openstack_observer/steps/sync_user_deployments.py
@@ -39,7 +39,7 @@
 	roles = []
 	# setup user deployment home site roles  
         if user_deployment.user.site:
-            site_deployments = SiteDeployments.objects.filter(site=user_deployment.user.site,
+            site_deployments = SiteDeployment.objects.filter(site=user_deployment.user.site,
                                                               deployment=user_deployment.deployment)
             if site_deployments:
                 # need the correct tenant id for site at the deployment