X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fmodel_policies%2Fmodel_policy_Slice.py;h=ee34b14937f734831adf66790b06823b1202a025;hb=62a4c9b2fb67ab033574d9c0f4070081f1e3bb6e;hp=7523e3e08099693c21f3c48e2dc7416d84368b05;hpb=8a70eb925a6bcbba56ac4b0b02383c2bb6371d67;p=plstackapi.git

diff --git a/planetstack/model_policies/model_policy_Slice.py b/planetstack/model_policies/model_policy_Slice.py
index 7523e3e..ee34b14 100644
--- a/planetstack/model_policies/model_policy_Slice.py
+++ b/planetstack/model_policies/model_policy_Slice.py
@@ -1,13 +1,13 @@
 
 def handle(slice):
-	from core.models import SiteDeployment,SliceDeployment,Deployment,Network,NetworkSlice,NetworkTemplate
+	from core.models import SiteDeployments,SliceDeployments,Deployment,Network,NetworkSlice,NetworkTemplate
 	from collections import defaultdict
-	site_deployments = SiteDeployment.objects.all()
+	site_deployments = SiteDeployments.objects.all()
 	site_deploy_lookup = defaultdict(list)
 	for site_deployment in site_deployments:
 		site_deploy_lookup[site_deployment.site].append(site_deployment.deployment)
 	
-	slice_deployments = SliceDeployment.objects.all()
+	slice_deployments = SliceDeployments.objects.all()
 	slice_deploy_lookup = defaultdict(list)
 	for slice_deployment in slice_deployments:
 		slice_deploy_lookup[slice_deployment.slice].append(slice_deployment.deployment)
@@ -19,7 +19,7 @@ def handle(slice):
 	for expected_deployment in expected_deployments:
 		if slice not in slice_deploy_lookup or \
 		   expected_deployment not in slice_deploy_lookup[slice]:
-			sd = SliceDeployment(slice=slice, deployment=expected_deployment)
+			sd = SliceDeployments(slice=slice, deployment=expected_deployment)
 			sd.save()
 
 	# make sure slice has at least 1 public and 1 private networkd
@@ -35,13 +35,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(