Renamed SliceDeployment back to SliceDeployments

[plstackapi.git] / planetstack / ec2_observer / steps / sync_sites.py

diff --git a/planetstack/ec2_observer/steps/sync_sites.py b/planetstack/ec2_observer/steps/sync_sites.py
index 5771aef..0c1c7cf 100644 (file)
--- a/planetstack/ec2_observer/steps/sync_sites.py
+++ b/planetstack/ec2_observer/steps/sync_sites.py
@@ -2,31 +2,40 @@ import os
 import base64
 from django.db.models import F, Q
 from planetstack.config import Config
-from observer.syncstep import SyncStep
-from core.models.site import Site
+from ec2_observer.syncstep import SyncStep
+from core.models.site import *
 from ec2_observer.awslib import *
+import pdb
 
 class SyncSites(SyncStep):
     provides=[Site]
     requested_interval=3600
 
-    def fetch_pending(self):
-               current_sites = Site.objects.all()
-               zones = aws_run('ec2 describe-availability-zones')
-               available_sites = [zone['ZoneName'] for zone in zones]
-
-               new_site_names = list(set(available_sites) - set(zones))
-
-               new_sites = []
-               for s in new_site_names:
-                       site = Site(name=s,
-                                               login_base=s,
-                                               site_url="www.amazon.com",
-                                               enabled=True,
-                                               is_public=True,
-                                               abbreviated_name=s)
-                       new_sites.append(site)
-               
+    def fetch_pending(self, deletion):
+        if (deletion):
+            return []
+
+        deployment = Deployment.objects.filter(Q(name="Amazon EC2"))[0]
+        current_site_deployments = SiteDeployments.objects.filter(Q(deployment=deployment))
+
+        zone_ret = aws_run('ec2 describe-availability-zones')
+        zones = zone_ret['AvailabilityZones']
+
+        available_sites = [zone['ZoneName'] for zone in zones]
+        site_names = [sd.site.name for sd in current_site_deployments]
+
+        new_site_names = list(set(available_sites) - set(site_names))
+
+        new_sites = []
+        for s in new_site_names:
+            site = Site(name=s,
+                        login_base=s,
+                        site_url="www.amazon.com",
+                        enabled=True,
+                        is_public=True,
+                        abbreviated_name=s)
+            new_sites.append(site)
+        
         return new_sites
 
     def sync_record(self, site):