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/ec2_observer/deleters/site_deleter.py

diff --git a/planetstack/ec2_observer/deleters/site_deleter.py b/planetstack/ec2_observer/deleters/site_deleter.py
index c97dee1..88a4008 100644
--- a/planetstack/ec2_observer/deleters/site_deleter.py
+++ b/planetstack/ec2_observer/deleters/site_deleter.py
@@ -1,4 +1,4 @@
-from core.models import Site, SiteDeployments
+from core.models import Site, SiteDeployment
 from observer.deleter import Deleter
 from observer.deleters.site_deployment_deleter import SiteDeploymentDeleter
 
@@ -7,7 +7,7 @@
     
     def call(self, pk):
         site = Site.objects.get(pk=pk)
-        site_deployments = SiteDeployments.objects.filter(site=site)
+        site_deployments = SiteDeployment.objects.filter(site=site)
         site_deployment_deleter = SiteDeploymentDeleter()
         for site_deployment in site_deployments:
             site_deployment_deleter(site_deployment.id)

planetstack/ec2_observer/deleters/site_deployment_deleter.py

diff --git a/planetstack/ec2_observer/deleters/site_deployment_deleter.py b/planetstack/ec2_observer/deleters/site_deployment_deleter.py
index fa97be2..db344cd 100644
--- a/planetstack/ec2_observer/deleters/site_deployment_deleter.py
+++ b/planetstack/ec2_observer/deleters/site_deployment_deleter.py
@@ -1,11 +1,11 @@
-from core.models import Site, SiteDeployments
+from core.models import Site, SiteDeployment
 from observer.deleter import Deleter
 
 class SiteDeploymentDeleter(Deleter):
-    model='SiteDeployments'
+    model='SiteDeployment'
 
     def call(self, pk):
-        site_deployment = SiteDeployments.objects.get(pk=pk)
+        site_deployment = SiteDeployment.objects.get(pk=pk)
         if site_deployment.tenant_id:
             driver = self.driver.admin_driver(deployment=site_deployment.deployment.name)
             driver.delete_tenant(site_deployment.tenant_id)