commit 6042aaf8bb8b83302faa0ebca092d2cf41bb75bf
author Tony Mack <tmack@paris.CS.Princeton.EDU> Mon Apr 07 19:45:46 2014 -0400
committer Tony Mack <tmack@paris.CS.Princeton.EDU> Mon Apr 07 19:49:13 2014 -0400
tree 9368a3e182dd2255f6d354ccbc4cb1c6057b665b
parent e9b086972beb75f6fb34bbefba6c4881749b9726

Add slices to all deployments for now. Set starting subnet address.

planetstack/observer/steps/sync_slice_deployments.py

diff --git a/planetstack/observer/steps/sync_slice_deployments.py b/planetstack/observer/steps/sync_slice_deployments.py
index 9751a08..2254e7b 100644
--- a/planetstack/observer/steps/sync_slice_deployments.py
+++ b/planetstack/observer/steps/sync_slice_deployments.py
@@ -29,8 +29,11 @@
         for slice_deployment in slice_deployments:
             slice_deploy_lookup[slice_deployment.slice].append(slice_deployment.deployment)
         
+        all_deployments = Deployment.objects.filter() 
         for slice in Slice.objects.all():
-            expected_deployments = site_deploy_lookup[slice.site]
+            # slices are added to all deployments for now
+            expected_deployments = all_deployments
+            #expected_deployments = site_deploy_lookup[slice.site]
             for expected_deployment in expected_deployments:
                 if slice not in slice_deploy_lookup or \
                    expected_deployment not in slice_deploy_lookup[slice]:
@@ -48,6 +51,10 @@
         ints = [int(IPNetwork(subnet['cidr']).ip) for subnet in subnets \
                 if valid_subnet(subnet['cidr'])]
         ints.sort()
+        if ints:
+            last_ip = IPAddress(ints[-1])
+        else:
+            last_ip = IPAddress('10.0.0.1')
         last_ip = IPAddress(ints[-1])
         last_network = IPNetwork(str(last_ip) + "/24")
         next_network = IPNetwork(str(IPAddress(last_network) + last_network.size) + "/24")