From d63c0a8163c29fabce5de77ff1bca340baab7404 Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Wed, 10 Oct 2018 15:50:59 +0300
Subject: [PATCH] activate default cache which is in settings for vm creation.

---
 create/templates/create_instance.html | 9 ++++++---
 create/views.py                       | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/create/templates/create_instance.html b/create/templates/create_instance.html
index 8b741f2..897cccd 100644
--- a/create/templates/create_instance.html
+++ b/create/templates/create_instance.html
@@ -89,7 +89,8 @@
                                 <div class="col-sm-6">
                                     <select id="cache_mode" name="cache_mode" class="form-control">
                                         {% for mode, name in cache_modes %}
-                                            <option value="{{ mode }}">{% trans name %}</option>
+                                            <option value="{{ mode }}" {% ifequal mode default_cache %}selected {% endifequal %}>
+                                                {% trans name %}</option>
                                         {% endfor %}
                                     </select>
                                 </div>
@@ -222,7 +223,8 @@
                                     <div class="col-sm-6">
                                         <select id="cache_mode" name="cache_mode" class="form-control">
                                             {% for mode, name in cache_modes %}
-                                                <option value="{{ mode }}">{% trans name %}</option>
+                                                <option value="{{ mode }}" {% ifequal mode default_cache %}selected {% endifequal %}>
+                                                {% trans name %}</option>
                                             {% endfor %}
                                         </select>
                                     </div>
@@ -386,7 +388,8 @@
                                                                 <div class="col-sm-6">
                                                                     <select id="cache_mode" name="cache_mode" class="form-control">
                                                                         {% for mode, name in cache_modes %}
-                                                                            <option value="{{ mode }}">{% trans name %}</option>
+                                                                            <option value="{{ mode }}" {% ifequal mode default_cache %}selected {% endifequal %}>
+                                                                            {% trans name %}</option>
                                                                         {% endfor %}
                                                                     </select>
                                                                 </div>
diff --git a/create/views.py b/create/views.py
index d188c37..c69d980 100644
--- a/create/views.py
+++ b/create/views.py
@@ -11,6 +11,7 @@ from vrtManager.create import wvmCreate
 from vrtManager import util
 from libvirt import libvirtError
 from webvirtcloud.settings import QEMU_CONSOLE_LISTEN_ADDRESSES
+from webvirtcloud.settings import INSTANCE_VOLUME_DEFAULT_CACHE
 from django.contrib import messages
 
 @login_required
@@ -43,6 +44,7 @@ def create_instance(request, compute_id):
         instances = conn.get_instances()
         videos = conn.get_video()
         cache_modes = sorted(conn.get_cache_modes().items())
+        default_cache = INSTANCE_VOLUME_DEFAULT_CACHE
         listener_addr = QEMU_CONSOLE_LISTEN_ADDRESSES
         mac_auto = util.randomMAC()
         get_images = sorted(conn.get_storages_images())