X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fmodel_policies%2Fmodel_policy_Slice.py;h=c6a74a854693dd7dfb70edba7a847b11802c9f67;hb=0b21a6d8dd7278dcf1d6a6d0ecd16e15fca3724b;hp=7523e3e08099693c21f3c48e2dc7416d84368b05;hpb=f4612de67d2f00fe21b3a4b161034259fdf8ab4d;p=plstackapi.git

diff --git a/planetstack/model_policies/model_policy_Slice.py b/planetstack/model_policies/model_policy_Slice.py
index 7523e3e..c6a74a8 100644
--- a/planetstack/model_policies/model_policy_Slice.py
+++ b/planetstack/model_policies/model_policy_Slice.py
@@ -1,25 +1,23 @@
 
 def handle(slice):
-	from core.models import SiteDeployment,SliceDeployment,Deployment,Network,NetworkSlice,NetworkTemplate
+	from core.models import Controller, ControllerSiteDeployments, ControllerSlices,Controller,Network,NetworkSlice,NetworkTemplate
 	from collections import defaultdict
-	site_deployments = SiteDeployment.objects.all()
+	ctrl_site_deployments = ControllerSiteDeployments.objects.all()
 	site_deploy_lookup = defaultdict(list)
-	for site_deployment in site_deployments:
-		site_deploy_lookup[site_deployment.site].append(site_deployment.deployment)
+	for ctrl_site_deployment in ctrl_site_deployments:
+		site_deploy_lookup[ctrl_site_deployment.site_deployment].append(ctrl_site_deployment)
 	
-	slice_deployments = SliceDeployment.objects.all()
+	slice_controllers = ControllerSlices.objects.all()
 	slice_deploy_lookup = defaultdict(list)
-	for slice_deployment in slice_deployments:
-		slice_deploy_lookup[slice_deployment.slice].append(slice_deployment.deployment)
+	for slice_controller in slice_controllers:
+		slice_deploy_lookup[slice_controller.slice].append(slice_controller)
 	
-	all_deployments = Deployment.objects.all() 
-	# 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:
+	#expected_controllers = site_deploy_lookup[slice.site]
+        all_controllers = Controller.objects.all() 
+	for expected_controller in all_controllers:
 		if slice not in slice_deploy_lookup or \
-		   expected_deployment not in slice_deploy_lookup[slice]:
-			sd = SliceDeployment(slice=slice, deployment=expected_deployment)
+		   expected_controller not in slice_deploy_lookup[slice]:
+			sd = ControllerSlices(slice=slice, controller=expected_controller)
 			sd.save()
 
 	# make sure slice has at least 1 public and 1 private networkd
@@ -35,13 +33,13 @@ def handle(slice):
 			private_net = network
 	if not public_nets:
                 # ensure there is at least one public network, and default it to dedicated
-		dedicated_public_net = Network(
-          	    name = slice.name+'-public',
-             	    template = NetworkTemplate.objects.get(name='Public dedicated IPv4'),
+		nat_net = Network(
+          	    name = slice.name+'-nat',
+             	    template = NetworkTemplate.objects.get(name='Public shared IPv4'),
           	    owner = slice
       		    )
-		dedicated_public_net.save()
-                public_nets.append(dedicated_public_net)
+		nat_net.save()
+                public_nets.append(nat_net)
 
 	if not private_net:
         	private_net = Network(