fix bugs

[plstackapi.git] / planetstack / model_policies / model_policy_Slice.py

diff --git a/planetstack/model_policies/model_policy_Slice.py b/planetstack/model_policies/model_policy_Slice.py
index 7523e3e..0d83d68 100644 (file)
--- a/planetstack/model_policies/model_policy_Slice.py
+++ b/planetstack/model_policies/model_policy_Slice.py
@@ -1,25 +1,19 @@
 
 def handle(slice):
-       from core.models import SiteDeployment,SliceDeployment,Deployment,Network,NetworkSlice,NetworkTemplate
+       from core.models import Controller,ControllerSlices,Controller,Network,NetworkSlice,NetworkTemplate
        from collections import defaultdict
-       site_deployments = SiteDeployment.objects.all()
-       site_deploy_lookup = defaultdict(list)
-       for site_deployment in site_deployments:
-               site_deploy_lookup[site_deployment.site].append(site_deployment.deployment)
+       ctrl_site_deployments = SiteDeployments.objects.all()
        
-       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:
+        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 +29,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(