Mitaka compatibility: must have network on vm creation

circle/circle/settings/base.py

@@ -616,3 +616,5 @@ DEFAULT_LEASE_SUSPEND_SECONDS = 3600
 DEFAULT_LEASE_DELETE_SECONDS = 7200
 DEFAULT_LEASE_DELETE_SECONDS = 7200
 
 
 SESSIONHOOK_SHARED_SECRET = "verysecretmuchsecure"
 SESSIONHOOK_SHARED_SECRET = "verysecretmuchsecure"
+
+IS_NET_OMISSION_SUPPORTED = False  # in mitaka you must specify network at vm creation

circle/dashboard/templates/dashboard/vm-plain-image-create.html

@@ -10,7 +10,9 @@
     {{ form.name|as_crispy_field }}
     {{ form.name|as_crispy_field }}
     {{ form.image|as_crispy_field }}
     {{ form.image|as_crispy_field }}
     {{ form.flavor|as_crispy_field }}
     {{ form.flavor|as_crispy_field }}
+    {% if IS_NET_OMISSION_SUPPORTED %}
     {{ form.internet_access|as_crispy_field }}
     {{ form.internet_access|as_crispy_field }}
+    {% endif %}
     <button class="btn btn-success btn-xs vm-create-start pull-right text-right" type="submit">
     <button class="btn btn-success btn-xs vm-create-start pull-right text-right" type="submit">
       <i class="fa fa-play"></i> {% trans "Start" %}
       <i class="fa fa-play"></i> {% trans "Start" %}
     </button>
     </button>

circle/dashboard/views/vm.py

@@ -1113,13 +1113,14 @@ class VmPlainImageCreate(LoginRequiredMixin, TemplateView):
         context = self.get_context_data(**kwargs)
         context = self.get_context_data(**kwargs)
         context.update({
         context.update({
             'form': VmFromPlainImageForm(request),
             'form': VmFromPlainImageForm(request),
+            'IS_NET_OMISSION_SUPPORTED': settings.IS_NET_OMISSION_SUPPORTED,
         })
         })
 
 
         return self.render_to_response(context)
         return self.render_to_response(context)
 
 
     def post(self, request, *args, **kwargs):
     def post(self, request, *args, **kwargs):
         server_created = None
         server_created = None
-        if request.POST.get("internet_access"):
+        if request.POST.get("internet_access") or not settings.IS_NET_OMISSION_SUPPORTED:
             default_public_routed_net_id = DefaultPublicRoutedNet.get_id(request)
             default_public_routed_net_id = DefaultPublicRoutedNet.get_id(request)
             server_created = openstack_api.nova.server_create(
             server_created = openstack_api.nova.server_create(
                 request,
                 request,
@@ -1198,12 +1199,25 @@ class VmCreate(LoginRequiredMixin, TemplateView):
         return self.render_to_response(context)
         return self.render_to_response(context)
 
 
     def __create_normal(self, request, template, *args, **kwargs):
     def __create_normal(self, request, template, *args, **kwargs):
+        # TODO: create networks, interfaces, disks of template
+        if settings.IS_NET_OMISSION_SUPPORTED:
             server_created = openstack_api.nova.server_create(
             server_created = openstack_api.nova.server_create(
                 request,
                 request,
                 template.name,
                 template.name,
                 template.image_id,
                 template.image_id,
                 template.flavor_id,
                 template.flavor_id,
             )
             )
+        else:
+            default_public_routed_net_id = DefaultPublicRoutedNet.get_id(request)
+            server_created = openstack_api.nova.server_create(
+                request,
+                template.name,
+                template.image_id,
+                template.flavor_id,
+                nics=({
+                    'net-id': default_public_routed_net_id,
+                },)
+            )
 
 
         from dashboard.templatetags.instance_tags import get_absolute_url
         from dashboard.templatetags.instance_tags import get_absolute_url
         messages.success(request, _("VM successfully created."))
         messages.success(request, _("VM successfully created."))