From 1b3fd9d05e0a71f94a17864c2a2be39794a30a26 Mon Sep 17 00:00:00 2001
From: Real-Gecko <alexandrbezenkov@gmail.com>
Date: Wed, 14 Oct 2020 18:27:57 +0600
Subject: [PATCH 1/6] replaced ugettext_lazy with gettext_lazy

---
 accounts/forms.py                             |  2 +-
 accounts/models.py                            |  2 +-
 admin/forms.py                                |  4 ++--
 admin/views.py                                |  2 +-
 .../migrations/0002_auto_20200527_1603.py     |  3 ++-
 .../migrations/0004_auto_20200716_0637.py     |  4 ++--
 appsettings/models.py                         |  3 ++-
 appsettings/views.py                          | 21 +++++++++----------
 computes/forms.py                             |  2 +-
 computes/models.py                            |  2 +-
 computes/validators.py                        |  2 +-
 instances/forms.py                            |  2 +-
 instances/models.py                           |  2 +-
 instances/utils.py                            |  2 +-
 instances/views.py                            |  6 +++---
 interfaces/forms.py                           |  2 +-
 logs/models.py                                |  2 +-
 networks/forms.py                             |  2 +-
 networks/views.py                             |  6 +++---
 nwfilters/views.py                            |  2 +-
 storages/forms.py                             |  2 +-
 storages/views.py                             |  2 +-
 webvirtcloud/middleware.py                    |  2 +-
 23 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/accounts/forms.py b/accounts/forms.py
index e3bcd42..12d754d 100644
--- a/accounts/forms.py
+++ b/accounts/forms.py
@@ -1,7 +1,7 @@
 from appsettings.settings import app_settings
 from django.contrib.auth import get_user_model
 from django.forms import ModelForm, ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .models import UserInstance, UserSSHKey
 from .utils import validate_ssh_key
diff --git a/accounts/models.py b/accounts/models.py
index 15e0ddf..1fcc880 100644
--- a/accounts/models.py
+++ b/accounts/models.py
@@ -1,7 +1,7 @@
 from django.contrib.auth.models import User
 from django.core.validators import MinValueValidator
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from instances.models import Instance
 
 
diff --git a/admin/forms.py b/admin/forms.py
index c045edc..1a4a226 100644
--- a/admin/forms.py
+++ b/admin/forms.py
@@ -3,7 +3,7 @@ from django.contrib.auth.models import Group, User
 from django.contrib.auth.forms import ReadOnlyPasswordHashField
 from django.urls import reverse_lazy
 from django.utils.text import format_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from accounts.models import UserAttributes
 
@@ -78,7 +78,7 @@ class UserForm(forms.ModelForm):
                 label=_("Password"),
                 help_text=format_lazy(_("""Raw passwords are not stored, so there is no way to see
                 this user's password, but you can change the password using <a href='{}'>this form</a>."""),
-                reverse_lazy('admin:user_update_password', 
+                reverse_lazy('admin:user_update_password',
                 args=[self.instance.id,]))
             )
             self.fields['Password'] = password
diff --git a/admin/views.py b/admin/views.py
index bcadc0b..df2e354 100644
--- a/admin/views.py
+++ b/admin/views.py
@@ -5,7 +5,7 @@ from django.contrib.auth.forms import AdminPasswordChangeForm
 from django.contrib.auth.models import Group, User
 from django.core.paginator import Paginator
 from django.shortcuts import get_object_or_404, redirect, render
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from accounts.models import UserAttributes, UserInstance, Instance
 from appsettings.settings import app_settings
diff --git a/appsettings/migrations/0002_auto_20200527_1603.py b/appsettings/migrations/0002_auto_20200527_1603.py
index 2d698f7..f064c47 100644
--- a/appsettings/migrations/0002_auto_20200527_1603.py
+++ b/appsettings/migrations/0002_auto_20200527_1603.py
@@ -1,7 +1,8 @@
 # Generated by Django 2.2.12 on 2020-05-23 12:05
 
 from django.db import migrations
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
+
 
 def add_default_settings(apps, schema_editor):
     setting = apps.get_model("appsettings", "AppSettings")
diff --git a/appsettings/migrations/0004_auto_20200716_0637.py b/appsettings/migrations/0004_auto_20200716_0637.py
index 5feffa3..5593e83 100644
--- a/appsettings/migrations/0004_auto_20200716_0637.py
+++ b/appsettings/migrations/0004_auto_20200716_0637.py
@@ -1,7 +1,7 @@
 # Generated by Django 2.2.13 on 2020-07-16 06:37
 
 from django.db import migrations
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 def add_default_settings(apps, schema_editor):
@@ -22,7 +22,7 @@ def del_default_settings(apps, schema_editor):
     setting.objects.using(db_alias).filter(key="CONSOLE_VIEW_ONLY").delete()
     setting.objects.using(db_alias).filter(key="CONSOLE_RESIZE_SESSION").delete()
     setting.objects.using(db_alias).filter(key="CONSOLE_CLIP_VIEWPORT").delete()
-    
+
 
 class Migration(migrations.Migration):
 
diff --git a/appsettings/models.py b/appsettings/models.py
index 0d78231..a45827f 100644
--- a/appsettings/models.py
+++ b/appsettings/models.py
@@ -1,5 +1,6 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
+
 
 class AppSettings(models.Model):
 
diff --git a/appsettings/views.py b/appsettings/views.py
index 0b95cf8..07c6511 100644
--- a/appsettings/views.py
+++ b/appsettings/views.py
@@ -4,7 +4,7 @@ import os
 from django.shortcuts import render
 from django.http import HttpResponseRedirect
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
 
@@ -27,11 +27,11 @@ def appsettings(request):
         themes_list = os.listdir(sass_dir.value + "/wvc-theme")
     except FileNotFoundError as err:
         error_messages.append(err)
-        addlogmsg(request.user.username, "", err)   
+        addlogmsg(request.user.username, "", err)
 
     # Bootstrap settings related with filesystems, because of that they are excluded from other settings
     appsettings = AppSettings.objects.exclude(description__startswith="Bootstrap").order_by("name")
-    
+
 
     if request.method == 'POST':
         if 'SASS_DIR' in request.POST:
@@ -44,23 +44,23 @@ def appsettings(request):
             except Exception as err:
                 msg = err
                 error_messages.append(msg)
-            
+
             addlogmsg(request.user.username, "", msg)
             return HttpResponseRedirect(request.get_full_path())
 
         if 'BOOTSTRAP_THEME' in request.POST:
             theme = request.POST.get("BOOTSTRAP_THEME", "")
             scss_var = f"@import '{sass_dir.value}/wvc-theme/{theme}/variables';"
-            scss_bootswatch = f"@import '{sass_dir.value}/wvc-theme/{theme}/bootswatch';"       
+            scss_bootswatch = f"@import '{sass_dir.value}/wvc-theme/{theme}/bootswatch';"
             scss_boot = f"@import '{sass_dir.value}/bootstrap-overrides.scss';"
 
-            try:              
+            try:
                 with open(sass_dir.value + "/wvc-main.scss", "w") as main:
                     main.write(scss_var + "\n" + scss_boot + "\n" + scss_bootswatch + "\n")
-                
+
                 css_compressed = sass.compile(string=scss_var + "\n"+ scss_boot + "\n" + scss_bootswatch, output_style='compressed')
                 with open("static/css/" + main_css, "w") as css:
-                    css.write(css_compressed)    
+                    css.write(css_compressed)
 
                 bootstrap_theme.value = theme
                 bootstrap_theme.save()
@@ -70,7 +70,7 @@ def appsettings(request):
             except Exception as err:
                 msg = err
                 error_messages.append(msg)
-            
+
             addlogmsg(request.user.username, "", msg)
             return HttpResponseRedirect(request.get_full_path())
 
@@ -85,9 +85,8 @@ def appsettings(request):
                 except Exception as err:
                     msg = err
                     error_messages.append(msg)
-                
+
                 addlogmsg(request.user.username, "", msg)
                 return HttpResponseRedirect(request.get_full_path())
 
     return render(request, 'appsettings.html', locals())
-
diff --git a/computes/forms.py b/computes/forms.py
index 5006766..e77be30 100644
--- a/computes/forms.py
+++ b/computes/forms.py
@@ -1,6 +1,6 @@
 import re
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from computes.models import Compute
 from vrtManager.connection import CONN_TCP, CONN_SSH, CONN_TLS, CONN_SOCKET
 from .validators import validate_hostname
diff --git a/computes/models.py b/computes/models.py
index 56cb22b..b1c3cd1 100644
--- a/computes/models.py
+++ b/computes/models.py
@@ -1,6 +1,6 @@
 from django.db.models import CharField, IntegerField, Model
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from libvirt import virConnect
 
 from vrtManager.connection import connection_manager
diff --git a/computes/validators.py b/computes/validators.py
index 67f7c40..e58dfea 100644
--- a/computes/validators.py
+++ b/computes/validators.py
@@ -1,6 +1,6 @@
 from django.core.exceptions import ValidationError
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 import re
 
 have_symbol = re.compile('[^a-zA-Z0-9._-]+')
diff --git a/instances/forms.py b/instances/forms.py
index 633ecd2..85b7584 100644
--- a/instances/forms.py
+++ b/instances/forms.py
@@ -1,7 +1,7 @@
 import re
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from appsettings.models import AppSettings
 from webvirtcloud.settings import QEMU_CONSOLE_LISTEN_ADDRESSES, QEMU_KEYMAPS
diff --git a/instances/models.py b/instances/models.py
index 563a5e1..ef95154 100644
--- a/instances/models.py
+++ b/instances/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from libvirt import VIR_DOMAIN_XML_SECURE
 
 from computes.models import Compute
diff --git a/instances/utils.py b/instances/utils.py
index c1497a8..e6be97d 100644
--- a/instances/utils.py
+++ b/instances/utils.py
@@ -5,7 +5,7 @@ from collections import OrderedDict
 
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from accounts.models import UserInstance
 from appsettings.settings import app_settings
diff --git a/instances/views.py b/instances/views.py
index 6f6c4d7..871a1cb 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -18,7 +18,7 @@ from django.contrib.auth.models import User
 from django.http import Http404, HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from libvirt import (VIR_DOMAIN_UNDEFINE_KEEP_NVRAM, VIR_DOMAIN_UNDEFINE_NVRAM, libvirtError)
 from logs.views import addlogmsg
 from vrtManager import util
@@ -973,7 +973,7 @@ def set_qos(request, pk):
         messages.success(
             request,
             _("%(qos_dir)s QoS is set. Network XML is changed. \
-                Stop and start network to activate new config.") % {'qos_dir': qos_dir.capitalize()})
+                Stop and start network to activate new config."                                                               ) % {'qos_dir': qos_dir.capitalize()})
 
     return redirect(request.META.get('HTTP_REFERER') + '#network')
 
@@ -991,7 +991,7 @@ def unset_qos(request, pk):
         messages.success(
             request,
             _("%(qos_dir)s QoS is deleted. Network XML is changed. \
-                Stop and start network to activate new config.") % {'qos_dir': qos_dir.capitalize()})
+                Stop and start network to activate new config."                                                               ) % {'qos_dir': qos_dir.capitalize()})
     return redirect(request.META.get('HTTP_REFERER') + '#network')
 
 
diff --git a/interfaces/forms.py b/interfaces/forms.py
index 8767f5c..4490d0b 100644
--- a/interfaces/forms.py
+++ b/interfaces/forms.py
@@ -1,6 +1,6 @@
 import re
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AddInterface(forms.Form):
diff --git a/logs/models.py b/logs/models.py
index 8302030..d45c056 100644
--- a/logs/models.py
+++ b/logs/models.py
@@ -1,5 +1,5 @@
 from django.db.models import Model, CharField, DateTimeField
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class Logs(Model):
diff --git a/networks/forms.py b/networks/forms.py
index 82d71a0..6b9189f 100644
--- a/networks/forms.py
+++ b/networks/forms.py
@@ -1,6 +1,6 @@
 import re
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AddNetPool(forms.Form):
diff --git a/networks/views.py b/networks/views.py
index 9072636..917cb6f 100644
--- a/networks/views.py
+++ b/networks/views.py
@@ -2,7 +2,7 @@ from django.contrib import messages
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from libvirt import libvirtError
 
 from admin.decorators import superuser_only
@@ -212,7 +212,7 @@ def network(request, compute_id, pool):
                 conn.set_qos(qos_dir, average, peak, burst)
                 if conn.is_active():
                     messages.success(
-                        request, 
+                        request,
                         _(f"{qos_dir.capitalize()} QoS is set. Network XML is changed.") +
                         _("Stop and start network to activate new config"))
                 else:
@@ -226,7 +226,7 @@ def network(request, compute_id, pool):
 
             if conn.is_active():
                 messages.success(
-                    request, 
+                    request,
                     _(f"{qos_dir.capitalize()} QoS is deleted. Network XML is changed. ") +
                     _("Stop and start network to activate new config."))
             else:
diff --git a/nwfilters/views.py b/nwfilters/views.py
index 982a9b5..6fdef30 100644
--- a/nwfilters/views.py
+++ b/nwfilters/views.py
@@ -1,7 +1,7 @@
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from libvirt import libvirtError
 
 from admin.decorators import superuser_only
diff --git a/storages/forms.py b/storages/forms.py
index eea9bb4..f2fd89b 100644
--- a/storages/forms.py
+++ b/storages/forms.py
@@ -1,6 +1,6 @@
 import re
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AddStgPool(forms.Form):
diff --git a/storages/views.py b/storages/views.py
index 9f3f0fe..2d70be2 100644
--- a/storages/views.py
+++ b/storages/views.py
@@ -4,7 +4,7 @@ from django.contrib import messages
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from libvirt import libvirtError
 
 from admin.decorators import superuser_only
diff --git a/webvirtcloud/middleware.py b/webvirtcloud/middleware.py
index 5ca2940..6759ff1 100644
--- a/webvirtcloud/middleware.py
+++ b/webvirtcloud/middleware.py
@@ -1,6 +1,6 @@
 from django.contrib import messages
 from django.shortcuts import render
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from libvirt import libvirtError
 
 

From 0f66187e80559b051e2336a2fe8abb434bca7b89 Mon Sep 17 00:00:00 2001
From: Real-Gecko <alexandrbezenkov@gmail.com>
Date: Thu, 15 Oct 2020 11:58:42 +0600
Subject: [PATCH 2/6] More instances tests

---
 conf/test-vm.xml   |   1 -
 instances/apps.py  |  13 +-
 instances/forms.py |   2 -
 instances/tests.py | 951 +++++++++++++++++++++++++++++++++++----------
 instances/urls.py  |   2 +-
 instances/utils.py | 151 +------
 instances/views.py |  39 +-
 7 files changed, 769 insertions(+), 390 deletions(-)

diff --git a/conf/test-vm.xml b/conf/test-vm.xml
index c407266..d14f25f 100644
--- a/conf/test-vm.xml
+++ b/conf/test-vm.xml
@@ -1,7 +1,6 @@
 <domain type="kvm">
     <name>test-vm</name>
     <uuid>1bd3c1f2-dd12-4b8d-a298-dff387cb9f93</uuid>
-    <description>None</description>
     <memory unit="KiB">131072</memory>
     <currentMemory unit="KiB">131072</currentMemory>
     <vcpu placement="static">1</vcpu>
diff --git a/instances/apps.py b/instances/apps.py
index 4c5563d..12b11f9 100644
--- a/instances/apps.py
+++ b/instances/apps.py
@@ -6,9 +6,7 @@ def migrate_can_clone_instances(sender, **kwargs):
     '''
     Migrate can clone instances user attribute to permission
     '''
-    from django.conf import settings
-    from django.contrib.auth.models import User, Permission
-    from accounts.models import UserAttributes
+    from django.contrib.auth.models import Permission, User
 
     plan = kwargs['plan']
     for migration, rolled_back in plan:
@@ -22,22 +20,23 @@ def migrate_can_clone_instances(sender, **kwargs):
                         user.user_permissions.add(permission)
             break
 
+
 def apply_passwordless_console(sender, **kwargs):
     '''
     Apply new passwordless_console permission for all users
     '''
-    from django.conf import settings
-    from django.contrib.auth.models import User, Permission
+    from django.contrib.auth.models import Permission, User
 
     print('\033[92mApplying permission passwordless_console for all users\033[0m')
     users = User.objects.all()
     permission = Permission.objects.get(codename='passwordless_console')
     for user in users:
-            user.user_permissions.add(permission)
+        user.user_permissions.add(permission)
+
 
 class InstancesConfig(AppConfig):
     name = 'instances'
-    verbose_name = 'instances'
+    verbose_name = 'Instances'
 
     def ready(self):
         post_migrate.connect(migrate_can_clone_instances, sender=self)
diff --git a/instances/forms.py b/instances/forms.py
index 85b7584..77433ba 100644
--- a/instances/forms.py
+++ b/instances/forms.py
@@ -61,6 +61,4 @@ class NewVMForm(forms.Form):
         have_symbol = re.match('^[a-zA-Z0-9._-]+$', name)
         if not have_symbol:
             raise forms.ValidationError(_('The name of the virtual machine must not contain any special characters'))
-        elif len(name) > 64:
-            raise forms.ValidationError(_('The name of the virtual machine must not exceed 20 characters'))
         return name
diff --git a/instances/tests.py b/instances/tests.py
index 3dac112..5c70322 100644
--- a/instances/tests.py
+++ b/instances/tests.py
@@ -1,65 +1,138 @@
-import tempfile
+import re
 
+from accounts.models import UserAttributes, UserInstance, UserSSHKey
+from appsettings.models import AppSettings
+from computes.models import Compute
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import Permission
+from django.http.response import Http404
 from django.shortcuts import reverse
 from django.test import TestCase
+from libvirt import VIR_DOMAIN_UNDEFINE_NVRAM
+from vrtManager.create import wvmCreate
+from vrtManager.util import randomUUID
 
-from computes.models import Compute
+from instances.views import instance
 
-from .models import Instance
+from .models import Flavor, Instance
+from .utils import refr
 
 
 class InstancesTestCase(TestCase):
-    def setUp(self):
-        self.client.login(username='admin', password='admin')
-        Compute(
-            name='local',
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # Add users for testing purposes
+        User = get_user_model()
+        cls.admin_user = User.objects.get(pk=1)
+        cls.test_user = User.objects.create(username='test-user')
+        UserAttributes.objects.create(
+            user=cls.test_user,
+            max_instances=1,
+            max_cpus=1,
+            max_memory=128,
+            max_disk_size=1,
+        )
+        permission = Permission.objects.get(codename='clone_instances')
+        cls.test_user.user_permissions.add(permission)
+
+        # Add localhost compute
+        cls.compute = Compute(
+            name='test-compute',
             hostname='localhost',
             login='',
             password='',
             details='local',
             type=4,
-        ).save()
+        )
+        cls.compute.save()
+
+        cls.connection = wvmCreate(
+            cls.compute.hostname,
+            cls.compute.login,
+            cls.compute.password,
+            cls.compute.type,
+        )
+
+        # Add disks for testing
+        cls.connection.create_volume(
+            'default',
+            'test-volume',
+            1,
+            'qcow2',
+            False,
+            0,
+            0,
+        )
+        # XML for testing vm
+        with open('conf/test-vm.xml', 'r') as f:
+            cls.xml = f.read()
+
+        # Create testing vm from XML
+        cls.connection._defineXML(cls.xml)
+        refr(cls.compute)
+        cls.instance: Instance = Instance.objects.get(pk=1)
+
+    @classmethod
+    def tearDownClass(cls):
+        # Destroy testing vm
+        cls.instance.proxy.delete_all_disks()
+        cls.instance.proxy.delete(VIR_DOMAIN_UNDEFINE_NVRAM)
+        super().tearDownClass()
+
+    def setUp(self):
+        self.client.login(username='admin', password='admin')
+        self.rsa_key = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC6OOdbfv27QVnSC6sKxGaHb6YFc+3gxCkyVR3cTSXE/n5BEGf8aOgBpepULWa1RZfxYHY14PlKULDygdXSdrrR2kNSwoKz/Oo4d+3EE92L7ocl1+djZbptzgWgtw1OseLwbFik+iKlIdqPsH+IUQvX7yV545ZQtAP8Qj1R+uCqkw== test@test'
 
     def test_index(self):
         response = self.client.get(reverse('instances:index'))
-        # with open('index.html', 'wb') as f:
-        #     f.write(response.content)
+        self.assertEqual(response.status_code, 200)
+
+        self.client.force_login(self.test_user)
+        response = self.client.get(reverse('instances:index'))
         self.assertEqual(response.status_code, 200)
 
     def test_create_select_type(self):
         response = self.client.get(reverse('instances:create_instance_select_type', args=[1]))
         self.assertEqual(response.status_code, 200)
 
-    def test_instance(self):
-        compute = Compute.objects.get(pk=1)
+    def test_instance_page(self):
+        response = self.client.get(reverse('instances:instance', args=[self.instance.id]))
+        self.assertEqual(response.status_code, 200)
 
-        # create volume
-        response = self.client.post(
-            reverse('create_volume', args=[compute.id, 'default']),
-            {
-                'name': 'test',
-                'format': 'qcow2',
-                'size': '1',
-                'meta_prealloc': False,
-            },
-        )
-        self.assertRedirects(response, reverse('storage', args=[compute.id, 'default']))
+        self.client.force_login(self.test_user)
+        response = self.client.get(reverse('instances:instance', args=[self.instance.id]))
+        self.assertRaises(Http404)
 
-        # create instance
-        response = self.client.get(reverse('instances:create_instance', args=[compute.id, 'x86_64', 'q35']))
+    # def test_create_volume(self):
+    #     response = self.client.post(
+    #         reverse('create_volume', args=[self.compute.id, 'default']),
+    #         {
+    #             'name': 'test',
+    #             'format': 'qcow2',
+    #             'size': '1',
+    #             'meta_prealloc': False,
+    #         },
+    #     )
+    #     self.assertRedirects(response, reverse('storage', args=[self.compute.id, 'default']))
+
+    def test_create_destroy_instance(self):
+        # Create
+        response = self.client.get(reverse('instances:create_instance', args=[self.compute.id, 'x86_64', 'q35']))
         self.assertEqual(response.status_code, 200)
 
         response = self.client.post(
-            reverse('instances:create_instance', args=[compute.id, 'x86_64', 'q35']),
+            reverse('instances:create_instance', args=[self.compute.id, 'x86_64', 'q35']),
             {
                 'name': 'test',
                 'firmware': 'BIOS',
                 'vcpu': 1,
                 'vcpu_mode': 'host-model',
-                'memory': 512,
+                'memory': 128,
                 'device0': 'disk',
                 'bus0': 'virtio',
-                'images': 'test.qcow2',
+                'images': 'test-volume.qcow2',
                 'storage-control': 'default',
                 'image-control': 'test.qcow2',
                 'networks': 'default',
@@ -77,87 +150,200 @@ class InstancesTestCase(TestCase):
         )
         self.assertEqual(response.status_code, 302)
 
-        instance: Instance = Instance.objects.get(pk=1)
-        self.assertEqual(instance.name, 'test')
+        instance_qs: Instance = Instance.objects.filter(name='test')
+        self.assertEqual(len(instance_qs), 1)
 
-        # get instance page
-        response = self.client.get(reverse('instances:instance', args=[instance.id]))
+        instance = instance_qs[0]
+
+        # Destroy
+        response = self.client.get(reverse('instances:destroy', args=[instance.id]))
         self.assertEqual(response.status_code, 200)
 
-        # resize cpu
-        self.assertEqual(instance.vcpu, 1)
-        self.assertEqual(instance.cur_vcpu, 1)
+        response = self.client.post(
+            reverse('instances:destroy', args=[instance.id]),
+            {},  # do not destroy disk image
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertRedirects(response, reverse('instances:index'))
 
-        response = self.client.post(reverse('instances:resizevm_cpu', args=[instance.id]), {'vcpu': 4, 'cur_vcpu': 2})
-        self.assertRedirects(response, reverse('instances:instance', args=[instance.id]) + '#resize')
+    def test_create_from_xml(self):
+        uuid = randomUUID()
+        xml = self.xml.replace('test-vm', 'test-vm-xml')
+        xml = re.sub('\s?<uuid>.*?</uuid>', f'<uuid>{uuid}</uuid>', xml)
+        response = self.client.post(
+            reverse('instances:create_instance_select_type', args=[self.compute.id]),
+            {
+                'create_xml': True,
+                'dom_xml': xml,
+            },
+        )
+        self.assertEqual(response.status_code, 302)
 
-        # reset cached properties
-        del instance.vcpu
-        del instance.cur_vcpu
-        self.assertEqual(instance.vcpu, 4)
-        self.assertEqual(instance.cur_vcpu, 2)
+        xml_instance_qs: Instance = Instance.objects.filter(name='test-vm-xml')
+        self.assertEqual(len(xml_instance_qs), 1)
 
-        # resize memory
-        self.assertEqual(instance.memory, 512)
-        self.assertEqual(instance.cur_memory, 512)
+        xml_instance = xml_instance_qs[0]
 
-        response = self.client.post(reverse('instances:resize_memory', args=[instance.id]), {
-            'memory': 2048,
-            'cur_memory': 1024
-        })
-        self.assertRedirects(response, reverse('instances:instance', args=[instance.id]) + '#resize')
-
-        del instance.memory
-        del instance.cur_memory
-        self.assertEqual(instance.memory, 2048)
-        self.assertEqual(instance.cur_memory, 1024)
-
-        # resize disk
-        self.assertEqual(instance.disks[0]['size'], 1024**3)
-
-        response = self.client.post(reverse('instances:resize_disk', args=[instance.id]), {
-            'disk_size_vda': '2',
-        })
-        self.assertRedirects(response, reverse('instances:instance', args=[instance.id]) + '#resize')
-
-        del instance.disks
-        self.assertEqual(instance.disks[0]['size'], 2 * 1024**3)
-
-        # add new volume
-        self.assertEqual(len(instance.disks), 1)
+        # destroy started instance to maximize coverage
+        xml_instance.proxy.start()
 
         response = self.client.post(
-            reverse('instances:add_new_vol', args=[instance.id]),
+            reverse('instances:destroy', args=[xml_instance.id]),
+            {},  # do not delete disk image
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertRedirects(response, reverse('instances:index'))
+
+    def test_resize_cpu(self):
+        self.assertEqual(self.instance.vcpu, 1)
+        self.assertEqual(self.instance.cur_vcpu, 1)
+
+        response = self.client.post(reverse('instances:resizevm_cpu', args=[self.instance.id]), {
+            'vcpu': 4,
+            'cur_vcpu': 2,
+        })
+        self.assertRedirects(response, reverse('instances:instance', args=[self.instance.id]) + '#resize')
+
+        # reset cached properties
+        del self.instance.vcpu
+        del self.instance.cur_vcpu
+
+        self.assertEqual(self.instance.vcpu, 4)
+        self.assertEqual(self.instance.cur_vcpu, 2)
+
+    def test_resize_cpu_with_quota(self):
+        # test for non admin user with quotas
+        vcpu = self.instance.vcpu
+        cur_vcpu = self.instance.cur_vcpu
+
+        UserInstance.objects.create(user=self.test_user, instance=self.instance, is_change=True)
+
+        self.client.force_login(self.test_user)
+
+        response = self.client.post(reverse('instances:resizevm_cpu', args=[self.instance.id]), {
+            'vcpu': 4,
+            'cur_vcpu': 2,
+        })
+        self.assertRedirects(response, reverse('instances:instance', args=[self.instance.id]) + '#resize')
+
+        del self.instance.vcpu
+        del self.instance.cur_vcpu
+
+        # no changes as user reached quota
+        self.assertEqual(self.instance.vcpu, vcpu)
+        self.assertEqual(self.instance.cur_vcpu, cur_vcpu)
+
+    def test_resize_memory(self):
+        self.assertEqual(self.instance.memory, 128)
+        self.assertEqual(self.instance.cur_memory, 128)
+
+        response = self.client.post(reverse('instances:resize_memory', args=[self.instance.id]), {
+            'memory': 512,
+            'cur_memory': 256
+        })
+        self.assertRedirects(response, reverse('instances:instance', args=[self.instance.id]) + '#resize')
+
+        del self.instance.memory
+        del self.instance.cur_memory
+        self.assertEqual(self.instance.memory, 512)
+        self.assertEqual(self.instance.cur_memory, 256)
+
+        response = self.client.post(reverse('instances:resize_memory', args=[self.instance.id]), {
+            'memory_custom': 500,
+            'cur_memory_custom': 200
+        })
+        self.assertRedirects(response, reverse('instances:instance', args=[self.instance.id]) + '#resize')
+
+        del self.instance.memory
+        del self.instance.cur_memory
+
+        self.assertEqual(self.instance.memory, 500)
+        self.assertEqual(self.instance.cur_memory, 200)
+
+    def test_resize_memory_with_quota(self):
+        # test for non admin user with quotas
+        memory = self.instance.memory
+        cur_memory = self.instance.cur_memory
+
+        UserInstance.objects.create(user=self.test_user, instance=self.instance, is_change=True)
+
+        self.client.force_login(self.test_user)
+
+        response = self.client.post(reverse('instances:resize_memory', args=[self.instance.id]), {
+            'memory': 512,
+            'cur_memory': 256
+        })
+        self.assertRedirects(response, reverse('instances:instance', args=[self.instance.id]) + '#resize')
+
+        del self.instance.memory
+        del self.instance.cur_memory
+
+        # no changes as user reached quota
+        self.assertEqual(self.instance.memory, memory)
+        self.assertEqual(self.instance.cur_memory, cur_memory)
+
+    def test_resize_disk(self):
+        self.assertEqual(self.instance.disks[0]['size'], 1024**3)
+
+        response = self.client.post(reverse('instances:resize_disk', args=[self.instance.id]), {
+            'disk_size_vda': 2,
+        })
+        self.assertRedirects(response, reverse('instances:instance', args=[self.instance.id]) + '#resize')
+
+        del self.instance.disks
+        self.assertEqual(self.instance.disks[0]['size'], 2 * 1024**3)
+
+    def test_resize_disk_with_quota(self):
+        # test for non admin user with quotas
+        disk_size = self.instance.disks[0]['size']
+        UserInstance.objects.create(user=self.test_user, instance=self.instance, is_change=True)
+
+        self.client.force_login(self.test_user)
+
+        response = self.client.post(reverse('instances:resize_disk', args=[self.instance.id]), {
+            'disk_size_vda': 3,
+        })
+        self.assertRedirects(response, reverse('instances:instance', args=[self.instance.id]) + '#resize')
+
+        # no changes as user reached quota
+        del self.instance.disks
+        self.assertEqual(self.instance.disks[0]['size'], disk_size)
+
+    def test_add_delete_new_volume(self):
+        self.assertEqual(len(self.instance.disks), 1)
+
+        response = self.client.post(
+            reverse('instances:add_new_vol', args=[self.instance.id]),
             {
                 'storage': 'default',
-                'name': 'test2',
+                'name': 'test-volume-2',
                 'size': 1,
             },
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.disks
-        self.assertEqual(len(instance.disks), 2)
+        del self.instance.disks
+        self.assertEqual(len(self.instance.disks), 2)
 
-        # delete volume from instance
         response = self.client.post(
-            reverse('instances:delete_vol', args=[instance.id]),
+            reverse('instances:delete_vol', args=[self.instance.id]),
             {
                 'storage': 'default',
                 'dev': 'vdb',
-                'name': 'test2.qcow2',
+                'name': 'test-volume-2.qcow2',
             },
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.disks
-        self.assertEqual(len(instance.disks), 1)
+        del self.instance.disks
+        self.assertEqual(len(self.instance.disks), 1)
 
+    def test_detach_attach_volume(self):
         # detach volume
         response = self.client.post(
-            reverse('instances:detach_vol', args=[instance.id]),
+            reverse('instances:detach_vol', args=[self.instance.id]),
             {
                 'dev': 'vda',
             },
@@ -165,28 +351,28 @@ class InstancesTestCase(TestCase):
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.disks
-        self.assertEqual(len(instance.disks), 0)
+        del self.instance.disks
+        self.assertEqual(len(self.instance.disks), 0)
 
-        # add existing volume
+        # reattach volume
         response = self.client.post(
-            reverse('instances:add_existing_vol', args=[instance.id]),
+            reverse('instances:add_existing_vol', args=[self.instance.id]),
             {
                 'selected_storage': 'default',
-                'vols': 'test.qcow2',
+                'vols': 'test-volume.qcow2',
             },
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.disks
-        self.assertEqual(len(instance.disks), 1)
+        del self.instance.disks
+        self.assertEqual(len(self.instance.disks), 1)
 
-        # edit volume
+    def test_edit_volume(self):
         response = self.client.post(
-            reverse('instances:edit_volume', args=[instance.id]),
+            reverse('instances:edit_volume', args=[self.instance.id]),
             {
-                'vol_path': '/var/lib/libvirt/images/test.qcow2',
+                'vol_path': '/var/lib/libvirt/images/test-volume.qcow2',
                 # 'vol_shareable': False,
                 # 'vol_readonly': False,
                 'vol_bus': 'virtio',
@@ -199,11 +385,11 @@ class InstancesTestCase(TestCase):
         )
         self.assertEqual(response.status_code, 302)
 
-        # add media device
-        self.assertEqual(len(instance.media), 1)
+    def test_attach_detach_cdrom(self):
+        self.assertEqual(len(self.instance.media), 1)
 
         response = self.client.post(
-            reverse('instances:add_cdrom', args=[instance.id]),
+            reverse('instances:add_cdrom', args=[self.instance.id]),
             {
                 'bus': 'sata',
             },
@@ -211,8 +397,8 @@ class InstancesTestCase(TestCase):
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.media
-        self.assertEqual(len(instance.media), 2)
+        del self.instance.media
+        self.assertEqual(len(self.instance.media), 2)
 
         # create dummy iso
         # with tempfile.NamedTemporaryFile() as f:
@@ -226,139 +412,291 @@ class InstancesTestCase(TestCase):
         #         },
         #     )
 
-        # remove media device
+        # detach CD-ROM drive
         response = self.client.post(
-            reverse('instances:detach_cdrom', args=[instance.id, 'sda']),
+            reverse('instances:detach_cdrom', args=[self.instance.id, 'sda']),
             {},
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.media
-        self.assertEqual(len(instance.media), 1)
+        del self.instance.media
+        self.assertEqual(len(self.instance.media), 1)
 
-        # snapshots
-        self.assertEqual(len(instance.snapshots), 0)
+    def test_snapshots(self):
+        self.assertEqual(len(self.instance.snapshots), 0)
 
         response = self.client.post(
-            reverse('instances:snapshot', args=[instance.id]),
+            reverse('instances:snapshot', args=[self.instance.id]),
             {
-                'name': 'test',
+                'name': 'test-snapshot',
             },
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.snapshots
-        self.assertEqual(len(instance.snapshots), 1)
+        del self.instance.snapshots
+        self.assertEqual(len(self.instance.snapshots), 1)
 
         response = self.client.post(
-            reverse('instances:revert_snapshot', args=[instance.id]),
+            reverse('instances:revert_snapshot', args=[self.instance.id]),
             {
-                'name': 'test',
+                'name': 'test-snapshot',
             },
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
         response = self.client.post(
-            reverse('instances:delete_snapshot', args=[instance.id]),
+            reverse('instances:delete_snapshot', args=[self.instance.id]),
             {
-                'name': 'test',
+                'name': 'test-snapshot',
             },
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.snapshots
-        self.assertEqual(len(instance.snapshots), 0)
+        del self.instance.snapshots
+        self.assertEqual(len(self.instance.snapshots), 0)
 
-        # autostart
-        self.assertEqual(instance.autostart, 0)
+    def test_autostart(self):
+        self.assertEqual(self.instance.autostart, 0)
 
         response = self.client.post(
-            reverse('instances:set_autostart', args=[instance.id]),
+            reverse('instances:set_autostart', args=[self.instance.id]),
             {},
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.autostart
-        self.assertEqual(instance.autostart, 1)
+        del self.instance.autostart
+        self.assertEqual(self.instance.autostart, 1)
 
         response = self.client.post(
-            reverse('instances:unset_autostart', args=[instance.id]),
+            reverse('instances:unset_autostart', args=[self.instance.id]),
             {},
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.autostart
-        self.assertEqual(instance.autostart, 0)
+        del self.instance.autostart
+        self.assertEqual(self.instance.autostart, 0)
 
-        # bootmenu
-        self.assertEqual(instance.bootmenu, True)
+    def test_bootmenu(self):
+        self.assertEqual(self.instance.bootmenu, True)
 
         response = self.client.post(
-            reverse('instances:unset_bootmenu', args=[instance.id]),
+            reverse('instances:unset_bootmenu', args=[self.instance.id]),
             {},
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.bootmenu
-        self.assertEqual(instance.bootmenu, False)
+        del self.instance.bootmenu
+        self.assertEqual(self.instance.bootmenu, False)
 
         response = self.client.post(
-            reverse('instances:set_bootmenu', args=[instance.id]),
+            reverse('instances:set_bootmenu', args=[self.instance.id]),
             {},
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.bootmenu
-        self.assertEqual(instance.bootmenu, True)
+        del self.instance.bootmenu
+        self.assertEqual(self.instance.bootmenu, True)
 
-        # guest agent
-
-        self.assertEqual(instance.guest_agent, False)
+    def test_guest_agent(self):
+        self.assertEqual(self.instance.guest_agent, False)
 
         response = self.client.post(
-            reverse('instances:set_guest_agent', args=[instance.id]),
+            reverse('instances:set_guest_agent', args=[self.instance.id]),
             {'guest_agent': True},
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.guest_agent
-        self.assertEqual(instance.guest_agent, True)
+        del self.instance.guest_agent
+        self.assertEqual(self.instance.guest_agent, True)
 
         response = self.client.post(
-            reverse('instances:set_guest_agent', args=[instance.id]),
+            reverse('instances:set_guest_agent', args=[self.instance.id]),
             {'guest_agent': False},
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.guest_agent
-        self.assertEqual(instance.guest_agent, False)
+        del self.instance.guest_agent
+        self.assertEqual(self.instance.guest_agent, False)
 
-        # video model
-        self.assertEqual(instance.video_model, 'vga')
+    def test_video_model(self):
+        self.assertEqual(self.instance.video_model, 'vga')
 
         response = self.client.post(
-            reverse('instances:set_video_model', args=[instance.id]),
+            reverse('instances:set_video_model', args=[self.instance.id]),
             {'video_model': 'virtio'},
             HTTP_REFERER=reverse('index'),
         )
         self.assertEqual(response.status_code, 302)
 
-        del instance.video_model
-        self.assertEqual(instance.video_model, 'virtio')
+        del self.instance.video_model
+        self.assertEqual(self.instance.video_model, 'virtio')
 
-        # console
+    def test_owner(self):
+        self.assertEqual(UserInstance.objects.count(), 0)
         response = self.client.post(
-            reverse('instances:update_console', args=[instance.id]),
+            reverse('instances:add_owner', args=[self.instance.id]),
+            {'user_id': self.admin_user.id},
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(UserInstance.objects.count(), 1)
+
+        user_instance: UserInstance = UserInstance.objects.get(id=1)
+        self.assertEqual(user_instance.instance_id, self.instance.id)
+        self.assertEqual(user_instance.user_id, self.admin_user.id)
+
+        # test when no multiple owners allowed
+        setting = AppSettings.objects.get(key='ALLOW_INSTANCE_MULTIPLE_OWNER')
+        setting.value = 'False'
+        setting.save()
+
+        response = self.client.post(
+            reverse('instances:add_owner', args=[self.instance.id]),
+            {'user_id': self.test_user.id},
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(UserInstance.objects.count(), 1)
+
+        response = self.client.post(
+            reverse('instances:del_owner', args=[self.instance.id]),
+            {'userinstance': user_instance.id},
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(UserInstance.objects.count(), 0)
+
+    def test_clone(self):
+        instance_count = Instance.objects.count()
+        response = self.client.post(
+            reverse('instances:clone', args=[self.instance.id]),
+            {
+                'name': 'test-vm-clone',
+                'clone-net-mac-0': 'de:ad:be:ef:de:ad',
+                'disk-vda': 'test-clone.img',
+                'clone-title': '',
+                'clone-description': '',
+                'clone': '',
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(Instance.objects.count(), instance_count + 1)
+
+        clone_qs = Instance.objects.filter(name='test-vm-clone')
+        self.assertEqual(len(clone_qs), 1)
+        clone = clone_qs[0]
+
+        self.assertEqual(clone.proxy.get_net_devices()[0]['mac'], 'de:ad:be:ef:de:ad')
+
+        response = self.client.post(
+            reverse('instances:snapshot', args=[clone.id]),
+            {
+                'name': 'test',
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+
+        response = self.client.post(
+            reverse('instances:destroy', args=[clone.id]),
+            {
+                'delete_disk': True,
+                'delete_nvram': True
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertRedirects(response, reverse('instances:index'))
+        self.assertEqual(Instance.objects.count(), instance_count)
+
+    def test_clone_with_quota(self):
+        # test for non admin user with quotas
+        instance_count = Instance.objects.count()
+
+        UserInstance.objects.create(user=self.test_user, instance=self.instance)
+
+        self.client.force_login(self.test_user)
+
+        response = self.client.post(
+            reverse('instances:clone', args=[self.instance.id]),
+            {
+                'name': 'test-vm-clone',
+                'clone-net-mac-0': 'de:ad:be:ef:de:ad',
+                'disk-vda': 'test-clone.img',
+                'clone-title': '',
+                'clone-description': '',
+                'clone': '',
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+        # no new instances created as user reached quota
+        self.assertEqual(Instance.objects.count(), instance_count)
+
+    def test_clone_errors(self):
+        instance_count = Instance.objects.count()
+
+        # duplicate name
+        response = self.client.post(
+            reverse('instances:clone', args=[self.instance.id]),
+            {
+                'name': 'test-vm',
+                'clone-net-mac-0': 'de:ad:be:ef:de:ad',
+                'disk-vda': 'test.img',
+                'clone-title': '',
+                'clone-description': '',
+                'clone': '',
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(Instance.objects.count(), instance_count)
+
+        # wrong name
+        response = self.client.post(
+            reverse('instances:clone', args=[self.instance.id]),
+            {
+                'name': '!@#$',
+                'clone-net-mac-0': 'de:ad:be:ef:de:ad',
+                'disk-vda': '!@#$.img',
+                'clone-title': '',
+                'clone-description': '',
+                'clone': '',
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(Instance.objects.count(), instance_count)
+
+        # wrong mac
+        response = self.client.post(
+            reverse('instances:clone', args=[self.instance.id]),
+            {
+                'name': 'test-vm-clone',
+                'clone-net-mac-0': 'gh:ad:be:ef:de:ad',
+                'disk-vda': 'test-clone.img',
+                'clone-title': '',
+                'clone-description': '',
+                'clone': '',
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(Instance.objects.count(), instance_count)
+
+    def test_console(self):
+        response = self.client.post(
+            reverse('instances:update_console', args=[self.instance.id]),
             {
                 'type': 'spice',
                 'listen_on': '0.0.0.0',
@@ -369,109 +707,320 @@ class InstancesTestCase(TestCase):
         )
         self.assertEqual(response.status_code, 302)
 
-        # poweron
-        self.assertEqual(instance.status, 5)
-
-        response = self.client.get(reverse('instances:poweron', args=[instance.id]), HTTP_REFERER=reverse('index'))
-        self.assertEqual(response.status_code, 302)
-
-        del instance.status
-
-        self.assertEqual(instance.status, 1)
-
-        # status
-        response = self.client.get(reverse('instances:status', args=[instance.id]))
+    def test_status(self):
+        response = self.client.get(reverse('instances:status', args=[self.instance.id]))
         self.assertEqual(response.status_code, 200)
 
-        # stats
-        response = self.client.get(reverse('instances:stats', args=[instance.id]))
+    def test_stats(self):
+        response = self.client.get(reverse('instances:stats', args=[self.instance.id]))
         self.assertEqual(response.status_code, 200)
 
-        # guess_mac_address
-        response = self.client.get(reverse('instances:guess_mac_address', args=[instance.name]))
+    def test_guess_mac_address(self):
+        response = self.client.get(reverse('instances:guess_mac_address', args=[self.instance.name]))
         self.assertEqual(response.status_code, 200)
 
-        # random_mac_address
+    def test_random_mac_address(self):
         response = self.client.get(reverse('instances:random_mac_address'))
         self.assertEqual(response.status_code, 200)
 
-        # random_mac_address
+    def test_guess_clone_name(self):
         response = self.client.get(reverse('instances:guess_clone_name'))
         self.assertEqual(response.status_code, 200)
 
-        # guess_mac_address
-        response = self.client.get(reverse('instances:check_instance', args=[instance.name]))
+    def test_sshkeys(self):
+        UserSSHKey.objects.create(keyname='keyname', keypublic=self.rsa_key, user=self.test_user)
+        UserInstance.objects.create(user=self.test_user, instance=self.instance)
+
+        response = self.client.get(reverse('instances:sshkeys', args=[self.instance.id]))
         self.assertEqual(response.status_code, 200)
 
-        # sshkeys
-        response = self.client.get(reverse('instances:sshkeys', args=[instance.name]))
+        response = self.client.get(reverse('instances:sshkeys', args=[self.instance.id]) + '?plain=true')
         self.assertEqual(response.status_code, 200)
 
+    def test_check_instance(self):
+        response = self.client.get(reverse('instances:check_instance', args=['test-vm']))
+        self.assertEqual(response.status_code, 200)
+        self.assertJSONEqual(response.content, {'vname': 'test-vm', 'exists': True})
+
+    def test_start_template(self):
+        # starting templates must fail
+        self.assertEqual(self.instance.status, 5)
+
+        self.instance.is_template = True
+        self.instance.save()
+
+        response = self.client.get(reverse('instances:poweron', args=[self.instance.id]), HTTP_REFERER=reverse('index'))
+        self.assertEqual(response.status_code, 302)
+
+        del self.instance.status
+        self.assertEqual(self.instance.status, 5)
+
+        self.instance.is_template = False
+        self.instance.save()
+
+    def test_power(self):
+        # poweron
+        self.assertEqual(self.instance.status, 5)
+
+        response = self.client.get(reverse('instances:poweron', args=[self.instance.id]), HTTP_REFERER=reverse('index'))
+        self.assertEqual(response.status_code, 302)
+
+        del self.instance.status
+
+        self.assertEqual(self.instance.status, 1)
+
         # suspend
-        response = self.client.get(reverse('instances:suspend', args=[instance.id]), HTTP_REFERER=reverse('index'))
+        response = self.client.get(reverse('instances:suspend', args=[self.instance.id]), HTTP_REFERER=reverse('index'))
         self.assertEqual(response.status_code, 302)
 
-        del instance.status
-        self.assertEqual(instance.status, 3)
+        del self.instance.status
+        self.assertEqual(self.instance.status, 3)
 
         # resume
-        response = self.client.get(reverse('instances:resume', args=[instance.id]), HTTP_REFERER=reverse('index'))
+        response = self.client.get(reverse('instances:resume', args=[self.instance.id]), HTTP_REFERER=reverse('index'))
         self.assertEqual(response.status_code, 302)
 
-        del instance.status
-        self.assertEqual(instance.status, 1)
+        del self.instance.status
+        self.assertEqual(self.instance.status, 1)
 
         # poweroff
-        response = self.client.get(reverse('instances:poweroff', args=[instance.id]), HTTP_REFERER=reverse('index'))
+        response = self.client.get(reverse('instances:poweroff', args=[self.instance.id]), HTTP_REFERER=reverse('index'))
         self.assertEqual(response.status_code, 302)
 
         # as no OS is installed ACPI won't work
-        del instance.status
-        self.assertEqual(instance.status, 1)
+        del self.instance.status
+        self.assertEqual(self.instance.status, 1)
 
         # powercycle
-        response = self.client.get(reverse('instances:powercycle', args=[instance.id]), HTTP_REFERER=reverse('index'))
+        response = self.client.get(reverse('instances:powercycle', args=[self.instance.id]), HTTP_REFERER=reverse('index'))
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(instance.status, 1)
+
+        del self.instance.status
+        self.assertEqual(self.instance.status, 1)
 
         # force_off
-        response = self.client.get(reverse('instances:force_off', args=[instance.id]), HTTP_REFERER=reverse('index'))
+        response = self.client.get(reverse('instances:force_off', args=[self.instance.id]), HTTP_REFERER=reverse('index'))
         self.assertEqual(response.status_code, 302)
 
-        del instance.status
-        self.assertEqual(instance.status, 5)
+        del self.instance.status
+        self.assertEqual(self.instance.status, 5)
 
-        # delete started instance with disks
-        instance.proxy.start()
-        del instance.status
-        self.assertEqual(instance.status, 1)
+    def test_vv_file(self):
+        response = self.client.get(reverse('instances:getvvfile', args=[self.instance.id]))
+        self.assertEqual(response.status_code, 200)
+
+    def test_vcpu_hotplug(self):
+        response = self.client.post(
+            reverse('instances:set_vcpu_hotplug', args=[self.instance.id]),
+            {'vcpu_hotplug': 'True'},
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+
+    def test_change_network(self):
+        self.assertEqual(self.instance.networks[0]['mac'], '52:54:00:a2:3c:e7')
+        response = self.client.post(
+            reverse('instances:change_network', args=[self.instance.id]),
+            {
+                'net-mac-0': '52:54:00:a2:3c:e8',
+                'net-source-0': 'net:default',
+                'net-nwfilter-0': '',
+                'net-model-0': 'virtio',
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+
+        del self.instance.networks
+        self.assertEqual(self.instance.networks[0]['mac'], '52:54:00:a2:3c:e8')
+
+    def test_add_delete_network(self):
+        self.assertEqual(len(self.instance.networks), 1)
+        net_mac = self.instance.networks[0]['mac']
+        response = self.client.post(
+            reverse('instances:add_network', args=[self.instance.id]),
+            {
+                'add-net-mac': '52:54:00:a2:3c:e9',
+                'add-net-network': 'net:default',
+                'add_net-nwfilter': '',
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+
+        del self.instance.networks
+        self.assertEqual(len(self.instance.networks), 2)
+        self.assertEqual(self.instance.networks[1]['mac'], '52:54:00:a2:3c:e9')
 
         response = self.client.post(
-            reverse('instances:destroy', args=[instance.id]),
-            {'delete_disk': True},
+            reverse('instances:delete_network', args=[self.instance.id]),
+            {
+                'delete_network': '52:54:00:a2:3c:e9',
+            },
+            HTTP_REFERER=reverse('index'),
         )
-        self.assertRedirects(response, reverse('instances:index'))
+        self.assertEqual(response.status_code, 302)
 
-        # # create volume
-        # response = self.client.post(
-        #     reverse('create_volume', args=[compute.id, 'default']),
-        #     {
-        #         'name': 'test3',
-        #         'format': 'qcow2',
-        #         'size': '1',
-        #         'meta_prealloc': False,
-        #     },
-        # )
-        # self.assertRedirects(response, reverse('storage', args=[compute.id, 'default']))
+        del self.instance.networks
+        self.assertEqual(len(self.instance.networks), 1)
+        self.assertEqual(self.instance.networks[0]['mac'], net_mac)
 
-        # # delete volume
+    def test_set_link_state(self):
+        self.assertEqual(self.instance.networks[0]['state'], 'up')
+        response = self.client.post(
+            reverse('instances:set_link_state', args=[self.instance.id]),
+            {
+                'mac': self.instance.networks[0]['mac'],
+                'set_link_state': 'up',
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+
+        del self.instance.networks
+        self.assertEqual(self.instance.networks[0]['state'], 'down')
+
+    def test_set_unset_qos(self):
+        self.assertEqual(len(self.instance.qos.keys()), 0)
+        net_mac = self.instance.networks[0]['mac']
+        response = self.client.post(
+            reverse('instances:set_qos', args=[self.instance.id]),
+            {
+                'net-mac-0': net_mac,
+                'qos_direction': 'inbound',
+                'qos_average': 1,
+                'qos_peak': 1,
+                'qos_burst': 1,
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+
+        del self.instance.qos
+        self.assertEqual(len(self.instance.qos.keys()), 1)
+
+        response = self.client.post(
+            reverse('instances:unset_qos', args=[self.instance.id]),
+            {
+                'net-mac': net_mac,
+                'qos_direction': 'inbound',
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+        del self.instance.qos
+        self.assertEqual(len(self.instance.qos.keys()), 0)
+
+        # test on running instance
+        # self.instance.proxy.start()
         # response = self.client.post(
-        #     reverse('instances:delete_vol', args=[instance.id]),
+        #     reverse('instances:set_qos', args=[self.instance.id]),
         #     {
-        #         'storage': 'default',
-        #         'dev': 'vdb',
-        #         'name': 'test3.qcow2',
+        #         'net-mac-0': net_mac,
+        #         'qos_direction': 'inbound',
+        #         'qos_average': 1,
+        #         'qos_peak': 1,
+        #         'qos_burst': 1,
         #     },
         #     HTTP_REFERER=reverse('index'),
         # )
         # self.assertEqual(response.status_code, 302)
+        # self.instance.proxy.force_shutdown()
+
+    def test_change_options(self):
+        self.assertEqual(self.instance.title, '')
+        self.assertEqual(self.instance.description, '')
+
+        response = self.client.post(
+            reverse('instances:change_options', args=[self.instance.id]),
+            {
+                'title': 'test-vm-title',
+                'description': 'test-vm description',
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+
+        del self.instance.title
+        del self.instance.description
+
+        self.assertEqual(self.instance.title, 'test-vm-title')
+        self.assertEqual(self.instance.description, 'test-vm description')
+
+    def test_flavors(self):
+        response = self.client.get(reverse('instances:flavor_create'))
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.post(
+            reverse('instances:flavor_create'),
+            {
+                'label': 'test_flavor',
+                'memory': 256,
+                'vcpu': 1,
+                'disk': 10,
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+
+        id = Flavor.objects.last().id
+
+        response = self.client.get(reverse('instances:flavor_update', args=[id]))
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.post(
+            reverse('instances:flavor_update', args=[id]),
+            {
+                'label': 'test_flavor_',
+                'memory': 256,
+                'vcpu': 1,
+                'disk': 10,
+            },
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+
+        response = self.client.get(reverse('instances:flavor_delete', args=[id]))
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.post(
+            reverse('instances:flavor_delete', args=[id]),
+            {},
+            HTTP_REFERER=reverse('index'),
+        )
+        self.assertEqual(response.status_code, 302)
+
+    # def donot_test_instance(self):
+    #     compute: Compute = Compute.objects.get(pk=1)
+    #     user: User = User.objects.get(pk=1)
+
+    #     # delete started instance with disks
+    #     self.instance.proxy.start()
+    #     del self.instance.status
+    #     self.assertEqual(self.instance.status, 1)
+
+    # # create volume
+    # response = self.client.post(
+    #     reverse('create_volume', args=[compute.id, 'default']),
+    #     {
+    #         'name': 'test3',
+    #         'format': 'qcow2',
+    #         'size': '1',
+    #         'meta_prealloc': False,
+    #     },
+    # )
+    # self.assertRedirects(response, reverse('storage', args=[compute.id, 'default']))
+
+    # # delete volume
+    # response = self.client.post(
+    #     reverse('instances:delete_vol', args=[instance.id]),
+    #     {
+    #         'storage': 'default',
+    #         'dev': 'vdb',
+    #         'name': 'test3.qcow2',
+    #     },
+    #     HTTP_REFERER=reverse('index'),
+    # )
+    # self.assertEqual(response.status_code, 302)
+
+    # , list(response.context['messages'])[0]
diff --git a/instances/urls.py b/instances/urls.py
index cd1cd2c..7c7f5a0 100644
--- a/instances/urls.py
+++ b/instances/urls.py
@@ -65,5 +65,5 @@ urlpatterns = [
     path('guess_clone_name/', views.guess_clone_name, name='guess_clone_name'),
     path('random_mac_address/', views.random_mac_address, name='random_mac_address'),
     path('check_instance/<vname>/', views.check_instance, name='check_instance'),
-    path('sshkeys/<vname>/', views.sshkeys, name='sshkeys'),
+    path('<int:pk>/sshkeys/', views.sshkeys, name='sshkeys'),
 ]
diff --git a/instances/utils.py b/instances/utils.py
index e6be97d..c4f20b8 100644
--- a/instances/utils.py
+++ b/instances/utils.py
@@ -1,40 +1,17 @@
 import os
 import random
 import string
-from collections import OrderedDict
-
-from django.conf import settings
-from django.contrib.auth.models import User
-from django.utils.translation import gettext_lazy as _
 
 from accounts.models import UserInstance
 from appsettings.settings import app_settings
-from logs.views import addlogmsg
+from django.conf import settings
+from django.utils.translation import gettext_lazy as _
 from vrtManager.connection import connection_manager
-from vrtManager.hostdetails import wvmHostDetails
 from vrtManager.instance import wvmInstance, wvmInstances
 
 from .models import Instance
 
 
-def filesizefstr(size_str):
-    if size_str == '':
-        return 0
-    size_str = size_str.upper().replace("B", "")
-    if size_str[-1] == 'K':
-        return int(float(size_str[:-1])) << 10
-    elif size_str[-1] == 'M':
-        return int(float(size_str[:-1])) << 20
-    elif size_str[-1] == 'G':
-        return int(float(size_str[:-1])) << 30
-    elif size_str[-1] == 'T':
-        return int(float(size_str[:-1])) << 40
-    elif size_str[-1] == 'P':
-        return int(float(size_str[:-1])) << 50
-    else:
-        return int(float(size_str))
-
-
 def get_clone_free_names(size=10):
     prefix = app_settings.CLONE_INSTANCE_DEFAULT_PREFIX
     free_names = []
@@ -186,36 +163,6 @@ def migrate_instance(
     instance.save()
 
 
-def get_hosts_status(computes):
-    """
-        Function return all hosts all vds on host
-        """
-    compute_data = []
-    for compute in computes:
-        compute_data.append({
-            'id': compute.id,
-            'name': compute.name,
-            'hostname': compute.hostname,
-            'status': connection_manager.host_is_up(compute.type, compute.hostname),
-            'type': compute.type,
-            'login': compute.login,
-            'password': compute.password,
-            'details': compute.details,
-        })
-    return compute_data
-
-
-def get_userinstances_info(instance):
-    info = {}
-    uis = UserInstance.objects.filter(instance=instance)
-    info['count'] = uis.count()
-    if info['count'] > 0:
-        info['first_user'] = uis[0]
-    else:
-        info['first_user'] = None
-    return info
-
-
 def refr(compute):
     if compute.status is True:
         domains = compute.proxy.wvm.listAllDomains()
@@ -229,83 +176,6 @@ def refr(compute):
                 Instance(compute=compute, name=domain.name(), uuid=domain.UUIDString()).save()
 
 
-def refresh_instance_database(comp, inst_name, info, all_host_vms, user):
-    # Multiple Instance Name Check
-    instances = Instance.objects.filter(name=inst_name)
-    if instances.count() > 1:
-        for i in instances:
-            user_instances_count = UserInstance.objects.filter(instance=i).count()
-            if user_instances_count == 0:
-                addlogmsg(user.username, i.name, _("Deleting due to multiple(Instance Name) records."))
-                i.delete()
-
-    # Multiple UUID Check
-    instances = Instance.objects.filter(uuid=info['uuid'])
-    if instances.count() > 1:
-        for i in instances:
-            if i.name != inst_name:
-                addlogmsg(user.username, i.name, _("Deleting due to multiple(UUID) records."))
-                i.delete()
-
-    try:
-        inst_on_db = Instance.objects.get(compute_id=comp["id"], name=inst_name)
-        if inst_on_db.uuid != info['uuid']:
-            inst_on_db.save()
-
-        all_host_vms[comp["id"], comp["name"], comp["status"], comp["cpu"], comp["mem_size"],
-                     comp["mem_perc"]][inst_name]['is_template'] = inst_on_db.is_template
-        all_host_vms[comp["id"], comp["name"], comp["status"], comp["cpu"], comp["mem_size"],
-                     comp["mem_perc"]][inst_name]['userinstances'] = get_userinstances_info(inst_on_db)
-    except Instance.DoesNotExist:
-        inst_on_db = Instance(compute_id=comp["id"], name=inst_name, uuid=info['uuid'])
-        inst_on_db.save()
-
-
-def get_user_instances(user):
-    all_user_vms = {}
-    user_instances = UserInstance.objects.filter(user=user)
-    for usr_inst in user_instances:
-        if connection_manager.host_is_up(usr_inst.instance.compute.type, usr_inst.instance.compute.hostname):
-            conn = wvmHostDetails(
-                usr_inst.instance.compute.hostname,
-                usr_inst.instance.compute.login,
-                usr_inst.instance.compute.password,
-                usr_inst.instance.compute.type,
-            )
-            all_user_vms[usr_inst] = conn.get_user_instances(usr_inst.instance.name)
-            all_user_vms[usr_inst].update({'compute_id': usr_inst.instance.compute.id})
-    return all_user_vms
-
-
-def get_host_instances(compute):
-    all_host_vms = OrderedDict()
-
-    # if compute.status:
-    comp_node_info = compute.proxy.get_node_info()
-    comp_mem = compute.proxy.get_memory_usage()
-    comp_instances = compute.proxy.get_host_instances(True)
-
-    # if comp_instances:
-    comp_info = {
-        "id": compute.id,
-        "name": compute.name,
-        "status": compute.status,
-        "cpu": comp_node_info[3],
-        "mem_size": comp_node_info[2],
-        "mem_perc": comp_mem['percent'],
-    }
-    # refr(compute)
-    all_host_vms[comp_info["id"], comp_info["name"], comp_info["status"], comp_info["cpu"], comp_info["mem_size"],
-                 comp_info["mem_perc"]] = comp_instances
-    for vm, info in comp_instances.items():
-        # TODO: Delete this function completely
-        refresh_instance_database(comp_info, vm, info, all_host_vms, User.objects.get(pk=1))
-
-    # else:
-    #     raise libvirtError(_(f"Problem occurred with host: {compute.name} - {status}"))
-    return all_host_vms
-
-
 def get_dhcp_mac_address(vname):
     dhcp_file = settings.BASE_DIR + '/dhcpd.conf'
     mac = ''
@@ -342,20 +212,3 @@ def get_clone_disk_name(disk, prefix, clone_name=''):
     else:
         image = f"{disk['image']}-clone"
     return image
-
-
-# TODO: this function is not used
-def _get_clone_disks(disks, vname=''):
-    clone_disks = []
-    for disk in disks:
-        new_image = get_clone_disk_name(disk, vname)
-        if not new_image:
-            continue
-        new_disk = {
-            'dev': disk['dev'],
-            'storage': disk['storage'],
-            'image': new_image,
-            'format': disk['format'],
-        }
-        clone_disks.append(new_disk)
-    return clone_disks
diff --git a/instances/views.py b/instances/views.py
index 871a1cb..66a0e1b 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -51,7 +51,7 @@ def index(request):
 
 
 def instance(request, pk):
-    instance: Instance = get_object_or_404(Instance, pk=pk)
+    instance: Instance = get_instance(request.user, pk)
     compute: Compute = instance.compute
     computes = Compute.objects.all().order_by('name')
     computes_count = computes.count()
@@ -59,7 +59,6 @@ def instance(request, pk):
     publickeys = UserSSHKey.objects.filter(user_id=request.user.id)
     keymaps = settings.QEMU_KEYMAPS
     console_types = AppSettings.objects.get(key="QEMU_CONSOLE_DEFAULT_TYPE").choices_as_list()
-    #
     console_form = ConsoleForm(
         initial={
             'type': instance.console_type,
@@ -67,7 +66,6 @@ def instance(request, pk):
             'password': instance.console_passwd,
             'keymap': instance.console_keymap,
         })
-    #
     console_listen_addresses = settings.QEMU_CONSOLE_LISTEN_ADDRESSES
     bottom_bar = app_settings.VIEW_INSTANCE_DETAIL_BOTTOM_BAR
     allow_admin_or_not_template = request.user.is_superuser or request.user.is_staff or not instance.is_template
@@ -78,15 +76,6 @@ def instance(request, pk):
     except UserInstance.DoesNotExist:
         userinstance = None
 
-    if not request.user.is_superuser:
-        if not userinstance:
-            return redirect(reverse('index'))
-
-    if len(instance.media) != 0:
-        media_iso = sorted(instance.proxy.get_iso_media())
-    else:
-        media_iso = []
-
     memory_range = [256, 512, 768, 1024, 2048, 3072, 4096, 6144, 8192, 16384]
     if instance.memory not in memory_range:
         insort(memory_range, instance.memory)
@@ -127,18 +116,11 @@ def instance(request, pk):
     vcpu_host = len(instance.vcpu_range)
     memory_host = instance.proxy.get_max_memory()
     bus_host = instance.proxy.get_disk_bus_types(instance.arch, instance.machine)
-    # videos_host = instance.proxy.get_video_models(instance.arch, instance.machine)
     networks_host = sorted(instance.proxy.get_networks())
     nwfilters_host = instance.proxy.get_nwfilters()
     storages_host = sorted(instance.proxy.get_storages(True))
     net_models_host = instance.proxy.get_network_models()
 
-    try:
-        interfaces_host = sorted(instance.proxy.get_ifaces())
-    except Exception as e:
-        addlogmsg(request.user.username, instance.name, e)
-        messages.error(request, e)
-
     return render(request, 'instance.html', locals())
 
 
@@ -210,18 +192,18 @@ def check_instance(request, vname):
     data = {'vname': vname, 'exists': False}
     if instance:
         data['exists'] = True
-    return HttpResponse(json.dumps(data))
+    return JsonResponse(data)
 
 
-def sshkeys(request, vname):
+def sshkeys(request, pk):
     """
     :param request:
     :param vname:
     :return:
     """
-
+    instance = get_instance(request.user, pk)
     instance_keys = []
-    userinstances = UserInstance.objects.filter(instance__name=vname)
+    userinstances = UserInstance.objects.filter(instance=instance)
 
     for ui in userinstances:
         keys = UserSSHKey.objects.filter(user=ui.user)
@@ -239,7 +221,7 @@ def get_instance(user, pk):
     '''
     Check that instance is available for user, if not raise 404
     '''
-    instance = Instance.objects.get(pk=pk)
+    instance = get_object_or_404(Instance, pk=pk)
     user_instances = user.userinstance_set.all().values_list('instance', flat=True)
 
     if user.is_superuser or instance.id in user_instances:
@@ -498,7 +480,6 @@ def resize_disk(request, pk):
         if request.user.is_superuser or request.user.is_staff or userinstance.is_change:
             disks_new = list()
             for disk in disks:
-                # input_disk_size = utils.filesizefstr(request.POST.get('disk_size_' + disk['dev'], ''))
                 input_disk_size = int(request.POST.get('disk_size_' + disk['dev'], '0')) * 1073741824
                 if input_disk_size > disk['size'] + (64 << 20):
                     disk['size_new'] = input_disk_size
@@ -973,7 +954,7 @@ def set_qos(request, pk):
         messages.success(
             request,
             _("%(qos_dir)s QoS is set. Network XML is changed. \
-                Stop and start network to activate new config."                                                               ) % {'qos_dir': qos_dir.capitalize()})
+                Stop and start network to activate new config.") % {'qos_dir': qos_dir.capitalize()})
 
     return redirect(request.META.get('HTTP_REFERER') + '#network')
 
@@ -991,7 +972,7 @@ def unset_qos(request, pk):
         messages.success(
             request,
             _("%(qos_dir)s QoS is deleted. Network XML is changed. \
-                Stop and start network to activate new config."                                                               ) % {'qos_dir': qos_dir.capitalize()})
+                Stop and start network to activate new config.") % {'qos_dir': qos_dir.capitalize()})
     return redirect(request.META.get('HTTP_REFERER') + '#network')
 
 
@@ -1005,7 +986,7 @@ def add_owner(request, pk):
     if app_settings.ALLOW_INSTANCE_MULTIPLE_OWNER == 'False':
         check_inst = UserInstance.objects.filter(instance=instance).count()
 
-    if check_inst > 1:
+    if check_inst > 0:
         messages.error(request, _("Only one owner is allowed and the one already added"))
     else:
         add_user_inst = UserInstance(instance=instance, user_id=user_id)
@@ -1027,7 +1008,7 @@ def del_owner(request, pk):
     return redirect(request.META.get('HTTP_REFERER') + '#users')
 
 
-@permission_required('instances.clone_instances')
+@permission_required('instances.clone_instances', raise_exception=True)
 def clone(request, pk):
     instance = get_instance(request.user, pk)
 

From d04267eaa464a8dbbc9abbc01a3e539a5d89c420 Mon Sep 17 00:00:00 2001
From: Real-Gecko <alexandrbezenkov@gmail.com>
Date: Thu, 15 Oct 2020 17:49:36 +0600
Subject: [PATCH 3/6] Minor improvements for post_migrate signals

---
 accounts/apps.py  | 16 ++++++++--------
 instances/apps.py | 22 +++++++++++++---------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/accounts/apps.py b/accounts/apps.py
index 94f4d27..6a2e2bd 100644
--- a/accounts/apps.py
+++ b/accounts/apps.py
@@ -10,19 +10,19 @@ def apply_change_password(sender, **kwargs):
     from django.conf import settings
     from django.contrib.auth.models import User, Permission
     if hasattr(settings, 'SHOW_PROFILE_EDIT_PASSWORD'):
-        print('\033[92mSHOW_PROFILE_EDIT_PASSWORD is found inside settings.py\033[0m')
-        print('\033[92mApplying permission can_change_password for all users\033[0m')
+        print('\033[1m! \033[92mSHOW_PROFILE_EDIT_PASSWORD is found inside settings.py\033[0m')
+        print('\033[1m* \033[92mApplying permission can_change_password for all users\033[0m')
         users = User.objects.all()
         permission = Permission.objects.get(codename='change_password')
         if settings.SHOW_PROFILE_EDIT_PASSWORD:
-            print('\033[91mWarning!!! Setting to True for all users\033[0m')
+            print('\033[1m! \033[91mWarning!!! Setting to True for all users\033[0m')
             for user in users:
                 user.user_permissions.add(permission)
         else:
-            print('\033[91mWarning!!! Setting to False for all users\033[0m')
+            print('\033[1m* \033[91mWarning!!! Setting to False for all users\033[0m')
             for user in users:
                 user.user_permissions.remove(permission)
-        print('\033[1mDon`t forget to remove the option from settings.py\033[0m')
+        print('\033[1m! Don`t forget to remove the option from settings.py\033[0m')
 
 
 def create_admin(sender, **kwargs):
@@ -32,11 +32,11 @@ def create_admin(sender, **kwargs):
     from django.contrib.auth.models import User
     from accounts.models import UserAttributes
 
-    plan = kwargs['plan']
+    plan = kwargs.get('plan', [])
     for migration, rolled_back in plan:
         if migration.app_label == 'accounts' and migration.name == '0001_initial' and not rolled_back:
             if User.objects.count() == 0:
-                print('\033[92mCreating default admin user\033[0m')
+                print('\033[1m* \033[92mCreating default admin user\033[0m')
                 admin = User.objects.create_superuser('admin', None, 'admin')
                 UserAttributes(user=admin, max_instances=-1, max_cpus=-1, max_memory=-1, max_disk_size=-1).save()
             break
@@ -47,5 +47,5 @@ class AccountsConfig(AppConfig):
     verbose_name = 'Accounts'
 
     def ready(self):
-        post_migrate.connect(apply_change_password, sender=self)
         post_migrate.connect(create_admin, sender=self)
+        post_migrate.connect(apply_change_password, sender=self)
diff --git a/instances/apps.py b/instances/apps.py
index 12b11f9..3b5c07d 100644
--- a/instances/apps.py
+++ b/instances/apps.py
@@ -8,12 +8,12 @@ def migrate_can_clone_instances(sender, **kwargs):
     '''
     from django.contrib.auth.models import Permission, User
 
-    plan = kwargs['plan']
+    plan = kwargs.get('plan', [])
     for migration, rolled_back in plan:
         if migration.app_label == 'instances' and migration.name == '0002_permissionset' and not rolled_back:
             users = User.objects.all()
             permission = Permission.objects.get(codename='clone_instances')
-            print('\033[92mMigrating can_clone_instaces user attribute to permission\033[0m')
+            print('\033[1m* \033[92mMigrating can_clone_instaces user attribute to permission\033[0m')
             for user in users:
                 if user.userattributes:
                     if user.userattributes.can_clone_instances:
@@ -25,13 +25,17 @@ def apply_passwordless_console(sender, **kwargs):
     '''
     Apply new passwordless_console permission for all users
     '''
-    from django.contrib.auth.models import Permission, User
-
-    print('\033[92mApplying permission passwordless_console for all users\033[0m')
-    users = User.objects.all()
-    permission = Permission.objects.get(codename='passwordless_console')
-    for user in users:
-        user.user_permissions.add(permission)
+    from django.contrib.auth.models import Permission
+    from django.contrib.auth import get_user_model
+    User = get_user_model()
+    plan = kwargs.get('plan', [])
+    for migration, rolled_back in plan:
+        if migration.app_label == 'instances' and migration.name == '0009_auto_20200717_0524' and not rolled_back:
+            print('\033[1m* \033[92mApplying permission passwordless_console for all users\033[0m')
+            users = User.objects.all()
+            permission = Permission.objects.get(codename='passwordless_console')
+            for user in users:
+                user.user_permissions.add(permission)
 
 
 class InstancesConfig(AppConfig):

From 01043ba8a8e07423eb94c70b734442090578062e Mon Sep 17 00:00:00 2001
From: Real-Gecko <alexandrbezenkov@gmail.com>
Date: Thu, 15 Oct 2020 20:18:45 +0600
Subject: [PATCH 4/6] Templates cleanup

---
 accounts/templates/account.html               |   6 +-
 accounts/templates/accounts-list.html         | 175 ------------------
 accounts/templates/accounts.html              | 151 ---------------
 accounts/templates/create_user_block.html     |  38 ----
 accounts/templates/profile.html               |   2 +-
 admin/__init__.py                             |   1 +
 admin/templates/admin/common/list.html        |  28 ---
 admin/templates/admin/group_list.html         |   1 -
 admin/templates/admin/logs.html               |  85 ++++-----
 admin/templates/admin/user_form.html          |  13 +-
 admin/templates/admin/user_list.html          |  27 +--
 appsettings/templates/appsettings.html        | 140 +++++++-------
 appsettings/views.py                          |  27 ++-
 computes/forms.py                             |   5 +-
 computes/templates/computes/instances.html    |   6 +-
 computes/templates/computes/list.html         |   1 -
 computes/templates/overview.html              |  26 +--
 instances/templates/allinstances.html         |   6 +-
 instances/templates/create_instance_w1.html   |  18 +-
 instances/templates/create_instance_w2.html   |  19 +-
 instances/templates/instance.html             |  12 +-
 .../instances/destroy_instance_form.html      |   4 +-
 interfaces/templates/interface.html           |   9 +-
 interfaces/templates/interfaces.html          |  12 +-
 interfaces/views.py                           |   9 +-
 logs/templates/paging.html                    |  12 --
 networks/templates/network.html               |  10 +-
 networks/templates/networks.html              |  18 +-
 networks/views.py                             |  36 ++--
 nwfilters/templates/nwfilter.html             |  13 +-
 nwfilters/templates/nwfilters.html            |  27 ++-
 nwfilters/views.py                            |  28 ++-
 secrets/templates/secrets.html                |  13 +-
 secrets/views.py                              |  27 ++-
 storages/templates/storage.html               |  15 +-
 storages/templates/storages.html              |  19 +-
 storages/views.py                             |  17 +-
 templates/base.html                           |   9 +-
 templates/common/confirm_delete.html          |   2 +-
 templates/common/form.html                    |   2 +-
 templates/errors_block.html                   |  17 --
 templates/messages_block.html                 |  17 --
 42 files changed, 307 insertions(+), 796 deletions(-)
 delete mode 100644 accounts/templates/accounts-list.html
 delete mode 100644 accounts/templates/accounts.html
 delete mode 100644 accounts/templates/create_user_block.html
 delete mode 100644 admin/templates/admin/common/list.html
 delete mode 100644 logs/templates/paging.html
 delete mode 100644 templates/errors_block.html
 delete mode 100644 templates/messages_block.html

diff --git a/accounts/templates/account.html b/accounts/templates/account.html
index 54e3ad9..3775a63 100644
--- a/accounts/templates/account.html
+++ b/accounts/templates/account.html
@@ -5,13 +5,13 @@
 {% load qr_code %}
 
 {% block title %}{% trans "User Profile" %} - {{ user }}{% endblock %}
-{% block page_header %}{% trans "User Profile" %}: {{ user }}{% endblock page_header %}
+{% block page_heading %}{% trans "User Profile" %}: {{ user }}{% endblock page_heading %}
 
-{% block page_header_extra %}
+{% block page_heading_extra %}
 <a href="{% url 'accounts:user_instance_create' user.id %}" class="btn btn-success">
     {% icon 'plus' %}
 </a>
-{% endblock page_header_extra %}
+{% endblock page_heading_extra %}
 
 {% block content %}
     <ul class="nav nav-tabs">
diff --git a/accounts/templates/accounts-list.html b/accounts/templates/accounts-list.html
deleted file mode 100644
index a600678..0000000
--- a/accounts/templates/accounts-list.html
+++ /dev/null
@@ -1,175 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load staticfiles %}
-{% block title %}{% trans "Users" %}{% endblock %}
-{% block content %}
-            <!-- Page Heading -->
-            <div class="row">
-                <div class="col-lg-12">
-                    {% include 'create_user_block.html' %}
-                    <div class="float-right search">
-                        <input id="filter" class="form-control" type="text" placeholder="{% trans 'Search' %}">
-                    </div>
-                    <h2 class="page-header">{% trans "Users" %}</h1>
-                </div>
-            </div>
-            <!-- /.row -->
-
-            {% include 'errors_block.html' %}
-
-            <div class="row">
-                {% if not users %}
-                    <div class="col-lg-12">
-                        <div class="alert alert-warning alert-dismissable">
-                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                            <i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning" %}:</strong> {% trans "You don't have any user" %}
-                        </div>
-                    </div>
-                {% else %}
-                    <div class="col-lg-12">
-                        <table class="table table-striped table-hover">
-                            <thead>
-                                <tr>
-                                    <th scope="col">{% trans "Username" %}</th>
-                                    <th scope="col">{% trans "Status" %}</th>
-                                    <th scope="col">{% trans "Staff" %}</th>
-                                    <th scope="col">{% trans "Superuser" %}</th>
-                                    <th scope="col">{% trans "Clone" %}</th>
-                                </tr>
-                            </thead>
-                            <tbody class="searchable">
-                            {% for user in users %}
-                                <tr class="{% if not user.is_active %}danger{% endif %}">
-                                    <td>
-                                        <a href="{% url 'accounts:account' user.id %}"><strong>{{ user.username }}</strong></a>
-                                        <a data-toggle="modal" href="#editUser{{ user.id }}" class="float-right" title="{% trans "Edit" %}">
-                                            <span class="fa fa-cog"></span>
-                                        </a>
-                                    </td>
-                                    <td>
-                                        {% if user.is_active %}
-                                            {% trans "Active" %}
-                                        {% else %}
-                                            {% trans "Blocked" %}
-                                        {% endif %}
-                                    </td>
-                                    <td>{% if user.is_staff %}<span class="fa fa-check"></span>{% endif %}</td>
-                                    <td>{% if user.is_superuser %}<span class="fa fa-check"></span>{% endif %}</td>
-                                    <td>{% if perms.instances.clone_instances %}<span class="fa fa-check"></span>{% endif %}</td>
-                                </tr>
-                            {% endfor %}
-                            </tbody>
-                        </table>
-
-                        {% for user in users %}
-                        <!-- Modal Edit -->
-                        <div class="modal fade" id="editUser{{ user.id }}" tabindex="-1" role="dialog" aria-labelledby="editUserLabel" aria-hidden="true">
-                            <div class="modal-dialog">
-                                <div class="modal-content">
-                                    <form method="post" role="form" aria-label="Edit user form">{% csrf_token %}
-                                        <div class="modal-header">
-                                            <h5 class="modal-title">{% trans "Edit user info" %}</h5>
-                                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                                        </div>
-                                        <div class="modal-body">
-                                            <div class="form-group row">
-                                                <label class="col-sm-4 col-form-label">{% trans "Name" %}</label>
-                                                <div class="col-sm-6">
-                                                    <input type="hidden" name="user_id" value="{{ user.id }}">
-                                                    <input type="text" name="name" class="form-control" value="{{ user.username }}" disabled>
-                                                </div>
-                                            </div>
-                                            <div class="form-group row">
-                                                <label class="col-sm-4 col-form-label">{% trans "Password" %}</label>
-                                                <div class="col-sm-6">
-                                                    <input type="password" name="user_pass" class="form-control" value="">
-                                                </div>
-                                            </div>
-                                            <div class="form-group row">
-                                                <label class="col-sm-4 col-form-label">{% trans "Is staff" %}</label>
-                                                <div class="col-sm-2">
-                                                    <input type="checkbox" name="user_is_staff" {% if user.is_staff %}checked{% endif %}>
-                                                </div>
-                                            </div>
-                                            <div class="form-group row">
-                                                <label class="col-sm-4 col-form-label">{% trans "Is superuser" %}</label>
-                                                <div class="col-sm-2">
-                                                    <input type="checkbox" name="user_is_superuser" {% if user.is_superuser %}checked{% endif %}>
-                                                </div>
-                                            </div>
-                                            <div class="form-group row">
-                                                <label class="col-sm-4 col-form-label">{% trans "Can clone instances" %}</label>
-                                                <div class="col-sm-2">
-                                                    <input type="checkbox" name="userattributes_can_clone_instances" {% if user.userattributes.can_clone_instances %}checked{% endif %}>
-                                                </div>
-                                            </div>
-                                            <div class="form-group row">
-                                                <label class="col-sm-4 col-form-label">{% trans "Max instances" %}</label>
-                                                <div class="col-sm-6">
-                                                    <input type="text" name="userattributes_max_instances" class="form-control" value="{{ user.userattributes.max_instances }}">
-                                                </div>
-                                            </div>
-                                            <div class="form-group row">
-                                                <label class="col-sm-4 col-form-label">{% trans "Max cpus" %}</label>
-                                                <div class="col-sm-6">
-                                                    <input type="text" name="userattributes_max_cpus" class="form-control" value="{{ user.userattributes.max_cpus }}">
-                                                </div>
-                                            </div>
-                                            <div class="form-group row">
-                                                <label class="col-sm-4 col-form-label">{% trans "Max memory (MB)" %}</label>
-                                                <div class="col-sm-6">
-                                                    <input type="text" name="userattributes_max_memory" class="form-control" value="{{ user.userattributes.max_memory }}">
-                                                </div>
-                                            </div>
-                                            <div class="form-group row">
-                                                <label class="col-sm-4 col-form-label">{% trans "Max disk size (GB)" %}</label>
-                                                <div class="col-sm-6">
-                                                    <input type="text" name="userattributes_max_disk_size" class="form-control" value="{{ user.userattributes.max_disk_size }}">
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="modal-footer">
-                                            <button type="submit" class="float-left btn btn-danger" name="delete">
-                                                {% trans "Delete" %}
-                                            </button>
-                                            {% if user.is_active %}
-                                                <button type="submit" class="btn btn-warning mr-auto" name="block">
-                                                    {% trans "Block" %}
-                                                </button>
-                                            {% else %}
-                                                <button type="submit" class="btn btn-success mr-auto" name="unblock">
-                                                    {% trans "Unblock" %}
-                                                </button>
-                                            {% endif %}
-                                            <button type="button" class="btn btn-secondary" data-dismiss="modal">
-                                                {% trans "Close" %}
-                                            </button>
-                                            <button type="submit" class="btn btn-primary" name="edit">
-                                                {% trans "Edit" %}
-                                            </button>
-                                        </div>
-                                    </form>
-                                </div><!-- /.modal-content -->
-                            </div><!-- /.modal-dialog -->
-                        </div><!-- /.modal -->
-                    {% endfor %}
-                    </div>
-                {% endif %}
-            </div>
-{% endblock %}
-{% block script %}
-<script>
-    function filter_table() {
-        var rex = new RegExp($(this).val(), 'i');
-        $('.searchable tr').hide();
-        $('.searchable tr').filter(function () {
-            return rex.test($(this).text());
-        }).show();
-    }
-    $(document).ready(function () {
-        (function ($) {
-            $('#filter').keyup(filter_table)
-        }(jQuery));
-    });
-</script>
-{% endblock %}
diff --git a/accounts/templates/accounts.html b/accounts/templates/accounts.html
deleted file mode 100644
index 162d179..0000000
--- a/accounts/templates/accounts.html
+++ /dev/null
@@ -1,151 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block title %}{% trans "Users" %}{% endblock %}
-{% block content %}
-<!-- Page Heading -->
-<div class="row">
-    <div class="col-lg-12">
-        {% include 'create_user_block.html' %}
-        <h2 class="page-header">{% trans "Users" %}</h2>
-    </div>
-</div>
-<!-- /.row -->
-
-{% include 'errors_block.html' %}
-
-<div class="row">
-    {% if not users %}
-        <div class="col-lg-12">
-            <div class="alert alert-warning alert-dismissable">
-                <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                <i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning" %}:</strong> {% trans "You don't have any user" %}
-            </div>
-        </div>
-    {% else %}
-        {% for user in users %}
-            <div id="{{ user.username }}" class="col-sm-12 col-md-4">
-                {% if user.is_active %}
-                    <div class="card border-success shadow">
-                        <div class="card-header bg-success">
-                {% else %}
-                    <div class="card border-secondary shadow">
-                        <div class="card-header bg-secondary">
-                {% endif %}    
-                        <h5 class="my-0 card-title">
-                            <a class="card-link text-light" href="{% url 'accounts:account' user.id %}"><strong>{{ user.username }}</strong></a>
-                            <a class="card-link text-light float-right" data-toggle="modal" href="#editUser{{ user.id }}" title="{% trans "Edit" %}">
-                                <span class="fa fa-cog"></span>
-                            </a>
-                        </h5>
-                    </div>
-                    <div class="card-body">
-                        <div class="row row-cols-2">
-                            <div class="col">
-                                <p class="card-text font-weight-bold">{% trans "Status" %}:</p>
-                            </div>
-                            <div class="col">
-                                {% if user.is_active %}
-                                    <p>{% trans "Active" %}</p>
-                                {% else %}
-                                    <p>{% trans "Blocked" %}</p>
-                                {% endif %}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Modal Edit -->
-            <div class="modal fade" id="editUser{{ user.id }}" tabindex="-1" role="dialog" aria-labelledby="editUserLabel" aria-hidden="true">
-                <div class="modal-dialog">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h5 class="modal-title">{% trans "Edit user info" %}</h5>
-                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                        </div>
-                        <div class="modal-body">
-                            <form method="post" aria-label="Edit user form">{% csrf_token %}
-                                <div class="form-group row">
-                                    <label class="col-sm-4 col-form-label">{% trans "Name" %}</label>
-                                    <div class="col-sm-6">
-                                        <input type="hidden" name="user_id" value="{{ user.id }}">
-                                        <input type="text" name="name" class="form-control" value="{{ user.username }}" disabled>
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-sm-4 col-form-label">{% trans "Password" %}</label>
-                                    <div class="col-sm-6">
-                                        <input type="password" name="user_pass" class="form-control" value="">
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-sm-4 col-form-label">{% trans "Is staff" %}</label>
-                                    <div class="form-check form-check-inline col-sm-2  ml-3">
-                                        <input class="form-check-input position-static" type="checkbox" name="user_is_staff" {% if user.is_staff %}checked{% endif %}>
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-sm-4 col-form-label">{% trans "Is superuser" %}</label>
-                                    <div class="form-check form-check-inline col-sm-2 ml-3">
-                                        <input class="form-check-input position-static" type="checkbox" name="user_is_superuser" {% if user.is_superuser %}checked{% endif %}>
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-sm-4 col-form-label">{% trans "Can clone instances" %}</label>
-                                    <div class="form-check form-check-inline col-sm-2 ml-3">
-                                        <input class="form-check-input position-static" type="checkbox" name="userattributes_can_clone_instances" {% if user.userattributes.can_clone_instances %}checked{% endif %}>
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-sm-4 col-form-label">{% trans "Max instances" %}</label>
-                                    <div class="col-sm-6">
-                                        <input type="text" name="userattributes_max_instances" class="form-control" value="{{ user.userattributes.max_instances}}" required="True" >
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-sm-4 col-form-label">{% trans "Max cpus" %}</label>
-                                    <div class="col-sm-6">
-                                        <input type="text" name="userattributes_max_cpus" class="form-control" value="{{ user.userattributes.max_cpus }}" required="True">
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-sm-4 col-form-label">{% trans "Max memory (MB)" %}</label>
-                                    <div class="col-sm-6">
-                                        <input type="text" name="userattributes_max_memory" class="form-control" value="{{ user.userattributes.max_memory}}" required="True">
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-sm-4 col-form-label">{% trans "Max disk size (GB)" %}</label>
-                                    <div class="col-sm-6">
-                                        <input type="text" name="userattributes_max_disk_size" class="form-control" value="{{ user.userattributes.max_disk_size }}" required="True">
-                                    </div>
-                                </div>
-                        </div>
-                        <div class="modal-footer">
-                            <button type="submit" class="btn btn-danger" name="delete">
-                                {% trans "Delete" %}
-                            </button>
-                            {% if user.is_active %}
-                                <button type="submit" class="btn btn-warning mr-auto" name="block">
-                                    {% trans "Block" %}
-                                </button>
-                            {% else %}
-                                <button type="submit" class="btn btn-success mr-auto" name="unblock">
-                                    {% trans "Unblock" %}
-                                </button>
-                            {% endif %}
-                            <button type="submit" class="btn btn-secondary" data-dismiss="modal">
-                                {% trans "Close" %}
-                            </button>
-                            <button type="submit" class="btn btn-primary" name="edit">
-                                {% trans "Edit" %}
-                            </button>                                
-                            </form>
-                        </div>
-                    </div><!-- /.modal-content -->
-                </div><!-- /.modal-dialog -->
-            </div><!-- /.modal -->
-        {% endfor %}
-    {% endif %}
-</div>
-{% endblock %}
diff --git a/accounts/templates/create_user_block.html b/accounts/templates/create_user_block.html
deleted file mode 100644
index dafc071..0000000
--- a/accounts/templates/create_user_block.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% load i18n %}
-{% if request.user.is_superuser %}
-    <a href="#AddUser" type="button" class="btn btn-success btn-header float-right" data-toggle="modal">
-        <span class="fa fa-plus" aria-hidden="true"></span>
-    </a>
-
-    <!-- Modal pool -->
-    <div class="modal fade" id="AddUser" tabindex="-1" role="dialog" aria-labelledby="AddUserLabel" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <form method="post" aria-label="Add user form">{% csrf_token %}
-                    <div class="modal-header">
-                        <h5 class="modal-title">{% trans "Add New User" %}</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="form-group row">
-                            <label class="col-sm-4 col-form-label">{% trans "Name" %}</label>
-                            <div class="col-sm-6">
-                                <input type="text" class="form-control" name="name" placeholder="{% trans "john" %}" required pattern="[a-z0-9]+">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label class="col-sm-4 col-form-label">{% trans "Password" %}</label>
-                            <div class="col-sm-6">
-                                <input type="password" class="form-control" name="password" placeholder="*******" {% if not allow_empty_password %}required{% endif %}>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">{% trans "Close" %}</button>
-                        <button type="submit" class="btn btn-primary" name="create">{% trans "Create" %}</button>
-                    </div>
-                </form>
-            </div> <!-- /.modal-content -->
-        </div> <!-- /.modal-dialog -->
-    </div> <!-- /.modal -->
-{% endif %}
diff --git a/accounts/templates/profile.html b/accounts/templates/profile.html
index 23ab53a..37ce8da 100644
--- a/accounts/templates/profile.html
+++ b/accounts/templates/profile.html
@@ -6,7 +6,7 @@
 
 {% block title %}{% trans "Profile" %}: {{ request.user.first_name }} {{ request.user.last_name}}{% endblock %}
 
-{% block page_header %}{% trans "Profile" %}: {{ request.user.first_name }} {{ request.user.last_name}}{% endblock page_header %}
+{% block page_heading %}{% trans "Profile" %}: {{ request.user.first_name }} {{ request.user.last_name}}{% endblock page_heading %}
 
 {% block content %}
 <ul class="nav nav-tabs">
diff --git a/admin/__init__.py b/admin/__init__.py
index e69de29..b7f8a6a 100644
--- a/admin/__init__.py
+++ b/admin/__init__.py
@@ -0,0 +1 @@
+defautl_app_config = 'admin.apps.AdminConfig'
diff --git a/admin/templates/admin/common/list.html b/admin/templates/admin/common/list.html
deleted file mode 100644
index d267636..0000000
--- a/admin/templates/admin/common/list.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "base.html" %}
-{% load icons %}
-{% load i18n %}
-
-{% block title %}{{ title }}{% endblock %}
-
-{% block content %}
-{% if create_url %}
-    <a class="btn btn-success float-right" href="{% url create_url %}">{% icon 'plus' %} {%trans "Create New" %}</a>
-{% endif %}
-<table class="table table-hover">
-    {% for object in object_list %}
-    <tr>
-        <td>{{ object }}
-            <div class="btn-group float-right">
-                <a class="btn btn-success" href="{% url update_url object.id %}">{% icon 'edit' %} {%trans "Edit"%}</a>
-                {% if extra_urls %}
-                    {% for url in extra_urls %}
-                        <a class="btn btn-primary" href="{% url url.0 object.id %}">{{ url.1 }}</a>
-                    {% endfor %}
-                {% endif %}
-                <a class="btn btn-danger" href="{% url delete_url object.id %}">{% icon 'times' %} {%trans "Delete" %}</a>
-            </div>
-        </td>
-    </tr>
-    {% endfor %}
-</table>
-{% endblock %}
\ No newline at end of file
diff --git a/admin/templates/admin/group_list.html b/admin/templates/admin/group_list.html
index 82b8890..d101466 100644
--- a/admin/templates/admin/group_list.html
+++ b/admin/templates/admin/group_list.html
@@ -15,7 +15,6 @@
         <h1 class="page-header">{% trans "Groups" %}</h1>
     </div>
 </div>
-{% include 'errors_block.html' %}
 <div class="row">
     {% if not groups %}
         <div class="col-lg-12">
diff --git a/admin/templates/admin/logs.html b/admin/templates/admin/logs.html
index c2db0c4..906fa21 100644
--- a/admin/templates/admin/logs.html
+++ b/admin/templates/admin/logs.html
@@ -1,55 +1,48 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load bootstrap4 %}
+
 {% block title %}{% trans "Logs" %}{% endblock %}
+
+{% block page_heading %}{% trans "Logs" %}{% endblock page_heading %}
+
 {% block content %}
-    <!-- Page Heading -->
-    <div class="row">
-        <div class="col-lg-12">
-            <h2 class="page-header">{% trans "Logs" %}</h2>
-        </div>
-    </div>
-    <!-- /.row -->
-
-    {% include 'errors_block.html' %}
-
-    <div class="row">
-        <div class="col-lg-12">
-            {% if not logs %}
-                <div class="col-lg-12">
-                    <div class="alert alert-warning alert-dismissable">
-                        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                        <i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning" %}:</strong> {% trans "You don't have any Logs" %}
-                    </div>
+<div class="row">
+    <div class="col-lg-12">
+        {% if not logs %}
+            <div class="col-lg-12">
+                <div class="alert alert-warning alert-dismissable">
+                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                    <i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning" %}:</strong> {% trans "You don't have any Logs" %}
                 </div>
-            {% else %}
-                {% include "paging.html" %}
-                <div class="table-responsive">
-                    <table class="table table-bordered table-hover">
-                        <thead>
+            </div>
+        {% else %}
+            <div class="table-responsive">
+                <table class="table table-hover table-striped">
+                    <thead>
+                        <tr>
+                            <th scope="col">#</th>
+                            <th scope="col">{% trans "Date" %}</th>
+                            <th scope="col">{% trans "User" %}</th>
+                            <th scope="col">{% trans "Instance" %}</th>
+                            <th scope="col">{% trans "Message" %}</th>
+                            </tr>
+                    </thead>
+                    <tbody>
+                        {% for log in logs %}
                             <tr>
-                                <th scope="col">#</th>
-                                <th scope="col">{% trans "Date" %}</th>
-                                <th scope="col">{% trans "User" %}</th>
-                                <th scope="col">{% trans "Instance" %}</th>
-                                <th scope="col">{% trans "Message" %}</th>
-                                </tr>
-                        </thead>
-                        <tbody>
-                            {% for log in logs %}
-                                <tr>
-                                    <td>{{ log.id }}</td>
-                                    <td style="width:130px;">{{ log.date|date:"M d H:i:s" }}</td>
-                                    <td>{{ log.user }}</td>
-                                    <td>{{ log.instance }}</td>
-                                    <td>{{ log.message }}</td>
-                                </tr>
-                            {% endfor %}
-                        </tbody>
-                    </table>
-                </div>
-                {% bootstrap_pagination logs %}
-            {% endif %}
-        </div>
+                                <td>{{ log.id }}</td>
+                                <td style="width:130px;">{{ log.date|date:"M d H:i:s" }}</td>
+                                <td>{{ log.user }}</td>
+                                <td>{{ log.instance }}</td>
+                                <td>{{ log.message }}</td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+            {% bootstrap_pagination logs %}
+        {% endif %}
     </div>
+</div>
 {% endblock %}
diff --git a/admin/templates/admin/user_form.html b/admin/templates/admin/user_form.html
index db77710..76a5656 100644
--- a/admin/templates/admin/user_form.html
+++ b/admin/templates/admin/user_form.html
@@ -3,16 +3,13 @@
 {% load icons %}
 {% load i18n %}
 
-{% block title %}{% trans "User" %}{% endblock %}
+{% block title %}{{ title }}{% endblock %}
+
+{% block page_heading %}{{ title }}{% endblock page_heading %}
 
 {% block content %}
-<div class="row">
-    <div class="col-lg-12">
-        <h2 class="page-header">{{ title }}</h2>
-    </div>
-</div>
-<div class="row">
-    <div class="thumbnail col-sm-10 offset-1">
+<div class="card col-sm-10 offset-1">
+    <div class="card-body">
         <form id="create-update" action="" method="post">
             {% csrf_token %}
             {% bootstrap_form user_form layout='horizontal' %}
diff --git a/admin/templates/admin/user_list.html b/admin/templates/admin/user_list.html
index 746e726..f1a6323 100644
--- a/admin/templates/admin/user_list.html
+++ b/admin/templates/admin/user_list.html
@@ -3,20 +3,21 @@
 {% load static %}
 {% load common_tags %}
 {% load icons %}
-{% block title %}{% trans "Users" %}{% endblock %}
-{% block content %}
-<div class="row">
-    <div class="col-lg-12">
-        <a href="{% url 'admin:user_create' %}" class="btn btn-success btn-header float-right">
-            {% icon 'plus' %}
-        </a>
-        <div class="float-right search">
-            <input id="filter" class="form-control" type="text" placeholder="{% trans "Search" %}">
-        </div>
-        <h1 class="page-header">{% trans "Users" %}</h1>
-    </div>
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block page_heading %}{{ title }}{% endblock page_heading %}
+
+{% block page_heading_extra %}
+<a href="{% url 'admin:user_create' %}" class="btn btn-success btn-header float-right">
+    {% icon 'plus' %}
+</a>
+<div class="float-right search">
+    <input id="filter" class="form-control" type="text" placeholder="{% trans "Search" %}">
 </div>
-{% include 'errors_block.html' %}
+{% endblock page_heading_extra %}
+
+{% block content %}
 <div class="row">
     {% if not users %}
         <div class="col-lg-12">
diff --git a/appsettings/templates/appsettings.html b/appsettings/templates/appsettings.html
index 26a3904..659afb7 100644
--- a/appsettings/templates/appsettings.html
+++ b/appsettings/templates/appsettings.html
@@ -1,80 +1,74 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% block title %}{% trans "Edit Settings" %}{% endblock %}
+
+{% block title %}{% trans "Edit Settings" %}{% endblock title %}
+
+{% block page_heading %}{% trans "Edit Settings" %}{% endblock page_heading %}
+
 {% block content %}
-        <!-- Page Heading -->
-        <div class="row">
-            <div class="col-lg-12">
-                <h2 class="page-header">{% trans "Edit Settings" %}</h2>
+<div class="">
+    <div class="col-lg-12">
+        <h3 class="page-header">{% trans "App Settings" %}</h3>
+        <form action="{% url 'set_language' %}" method="post" style="display:inline" aria-label="Edit language.name_local settings form">{% csrf_token %}
+            <div class="form-group row">
+                <input name="next" type="hidden" value="{{ redirect_to }}">
+                <label class="col-sm-3 col-form-label">{% trans "Language" %}</label>
+                <div class="col-sm-6">
+                    <select name="language" class="form-control" onchange="this.form.submit()">
+                        {% get_current_language as LANGUAGE_CODE %}
+                        {% get_available_languages as LANGUAGES %}
+                        {% get_language_info_list for LANGUAGES as languages %}
+                        {% for language in languages %}
+                            <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected{% endif %}>
+                                {{ language.name_local }} ({{ language.code }})
+                            </option>
+                        {% endfor %}
+                    </select>
+                </div>
             </div>
-        </div>
-        <!-- /.row -->
-
-        {% include 'errors_block.html' %}
-
-        <div class="">
-            <div class="col-lg-12">
-                <h3 class="page-header">{% trans "App Settings" %}</h3>
-                <form action="{% url 'set_language' %}" method="post" style="display:inline" aria-label="Edit language.name_local settings form">{% csrf_token %}
-                    <div class="form-group row">
-                        <input name="next" type="hidden" value="{{ redirect_to }}">
-                        <label class="col-sm-3 col-form-label">{% trans "Language" %}</label>
-                        <div class="col-sm-6">
-                            <select name="language" class="form-control" onchange="this.form.submit()">
-                                {% get_current_language as LANGUAGE_CODE %}
-                                {% get_available_languages as LANGUAGES %}
-                                {% get_language_info_list for LANGUAGES as languages %}
-                                {% for language in languages %}
-                                    <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected{% endif %}>
-                                        {{ language.name_local }} ({{ language.code }})
-                                    </option>
-                                {% endfor %}
-                            </select>
-                        </div>
-                    </div>
-                </form>
-                {% if request.user.is_superuser %}
-                <form method="post" action="" role="form" aria-label="Edit sass directory settings form">{% csrf_token %}
-                    <div class="form-group row">
-                        <label class="col-sm-3 col-form-label">{% trans sass_dir.name %}</label>
-                        <div class="col-sm-6">
-                            <input class="form-control" name="{{ sass_dir.key }}" value="{{ sass_dir.value }}" onchange="this.form.submit()" title="{% trans sass_dir.description %}"/>
-                        </div>
-                    </div>
-                </form>
-                <form method="post" action="" role="form" aria-label="Edit theme settings form">{% csrf_token %}
-                    <div class="form-group row">
-                        <label class="col-sm-3 col-form-label">{% trans bootstrap_theme.name %}</label>
-                        <div class="col-sm-6">
-                            <select class="form-control" name="{{ bootstrap_theme.key }}" onchange="this.form.submit()" title="{% trans bootstrap_theme.description %}">
-                            {% for theme in themes_list %}
-                                <option {% if bootstrap_theme.value == theme %}selected{% endif %} value="{{ theme }}">{{ theme }}</option>
+        </form>
+        {% if request.user.is_superuser %}
+        <form method="post" action="" role="form" aria-label="Edit sass directory settings form">{% csrf_token %}
+            <div class="form-group row">
+                <label class="col-sm-3 col-form-label">{% trans sass_dir.name %}</label>
+                <div class="col-sm-6">
+                    <input class="form-control" name="{{ sass_dir.key }}" value="{{ sass_dir.value }}" onchange="this.form.submit()" title="{% trans sass_dir.description %}"/>
+                </div>
+            </div>
+        </form>
+        <form method="post" action="" role="form" aria-label="Edit theme settings form">{% csrf_token %}
+            <div class="form-group row">
+                <label class="col-sm-3 col-form-label">{% trans bootstrap_theme.name %}</label>
+                <div class="col-sm-6">
+                    <select class="form-control" name="{{ bootstrap_theme.key }}" onchange="this.form.submit()" title="{% trans bootstrap_theme.description %}">
+                    {% for theme in themes_list %}
+                        <option {% if bootstrap_theme.value == theme %}selected{% endif %} value="{{ theme }}">{{ theme }}</option>
+                    {% endfor %}
+                    </select>
+                    <span class="text-muted">{% trans "After change please full refresh page with 'Ctrl + F5' "%}</span>
+                </div>
+            </div>
+        </form>
+        {% endif %}
+            <h3 class="page-header">{% trans "Other Settings" %}</h3>
+        {% for setting in appsettings %}
+            <form method="post" action="" role="form" aria-label="{{setting.name}} form">{% csrf_token %}
+                <div class="form-group row">
+                    <label class="col-sm-3 col-form-label">{% trans setting.name %}</label>
+                    <div class="col-sm-6">
+                    {% if setting.choices %}
+                        <select class="form-control" name="{{ setting.key }}"  onchange="this.form.submit()" title="{% trans setting.description %}">
+                            {% for choice in setting.choices_as_list %}
+                                <option {% if setting.value == choice %} selected {% endif %} value={{ choice }}>{% trans choice %}</option>
                             {% endfor %}
-                            </select>
-                            <span class="text-muted">{% trans "After change please full refresh page with 'Ctrl + F5' "%}</span>
-                        </div>
+                        </select>
+                    {% else %}
+                        <input class="form-control" name="{{ setting.key }}" value="{{ setting.value }}" title="{% trans setting.description %}"  onchange="this.form.submit()"/>
+                    {% endif%}
                     </div>
-                </form>
-                {% endif %}
-                 <h3 class="page-header">{% trans "Other Settings" %}</h3>
-                {% for setting in appsettings %}
-                    <form method="post" action="" role="form" aria-label="{{setting.name}} form">{% csrf_token %}
-                        <div class="form-group row">
-                            <label class="col-sm-3 col-form-label">{% trans setting.name %}</label>
-                            <div class="col-sm-6">
-                            {% if setting.choices %}
-                                <select class="form-control" name="{{ setting.key }}"  onchange="this.form.submit()" title="{% trans setting.description %}">
-                                    {% for choice in setting.choices_as_list %}
-                                        <option {% if setting.value == choice %} selected {% endif %} value={{ choice }}>{% trans choice %}</option>
-                                    {% endfor %}
-                                </select>
-                            {% else %}
-                                <input class="form-control" name="{{ setting.key }}" value="{{ setting.value }}" title="{% trans setting.description %}"  onchange="this.form.submit()"/>
-                            {% endif%}
-                            </div>
-                        </div>
-                    </form>
-                {% endfor %}
-            </div>
-        </div>
+                </div>
+            </form>
+        {% endfor %}
+    </div>
+</div>
 {% endblock %}
diff --git a/appsettings/views.py b/appsettings/views.py
index 07c6511..5d9a19c 100644
--- a/appsettings/views.py
+++ b/appsettings/views.py
@@ -1,16 +1,14 @@
-import sass
 import os
 
-from django.shortcuts import render
-from django.http import HttpResponseRedirect
-from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
-from django.contrib.auth.decorators import login_required
+import sass
 from django.contrib import messages
-
-from appsettings.models import AppSettings
+from django.contrib.auth.decorators import login_required
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
+from django.utils.translation import gettext_lazy as _
 from logs.views import addlogmsg
 
+from appsettings.models import AppSettings
 
 
 @login_required
@@ -19,20 +17,18 @@ def appsettings(request):
     :param request:
     :return:
     """
-    error_messages = []
     main_css = "wvc-main.min.css"
     sass_dir = AppSettings.objects.get(key="SASS_DIR")
     bootstrap_theme = AppSettings.objects.get(key="BOOTSTRAP_THEME")
     try:
         themes_list = os.listdir(sass_dir.value + "/wvc-theme")
     except FileNotFoundError as err:
-        error_messages.append(err)
+        messages.error(request, err)
         addlogmsg(request.user.username, "", err)
 
     # Bootstrap settings related with filesystems, because of that they are excluded from other settings
     appsettings = AppSettings.objects.exclude(description__startswith="Bootstrap").order_by("name")
 
-
     if request.method == 'POST':
         if 'SASS_DIR' in request.POST:
             try:
@@ -43,7 +39,7 @@ def appsettings(request):
                 messages.success(request, msg)
             except Exception as err:
                 msg = err
-                error_messages.append(msg)
+                messages.error(request, msg)
 
             addlogmsg(request.user.username, "", msg)
             return HttpResponseRedirect(request.get_full_path())
@@ -58,7 +54,8 @@ def appsettings(request):
                 with open(sass_dir.value + "/wvc-main.scss", "w") as main:
                     main.write(scss_var + "\n" + scss_boot + "\n" + scss_bootswatch + "\n")
 
-                css_compressed = sass.compile(string=scss_var + "\n"+ scss_boot + "\n" + scss_bootswatch, output_style='compressed')
+                css_compressed = sass.compile(string=scss_var + "\n" + scss_boot + "\n" + scss_bootswatch,
+                                              output_style='compressed')
                 with open("static/css/" + main_css, "w") as css:
                     css.write(css_compressed)
 
@@ -69,7 +66,7 @@ def appsettings(request):
                 messages.success(request, msg)
             except Exception as err:
                 msg = err
-                error_messages.append(msg)
+                messages.error(request, msg)
 
             addlogmsg(request.user.username, "", msg)
             return HttpResponseRedirect(request.get_full_path())
@@ -84,7 +81,7 @@ def appsettings(request):
                     messages.success(request, msg)
                 except Exception as err:
                     msg = err
-                    error_messages.append(msg)
+                    messages.error(request, msg)
 
                 addlogmsg(request.user.username, "", msg)
                 return HttpResponseRedirect(request.get_full_path())
diff --git a/computes/forms.py b/computes/forms.py
index e77be30..6927272 100644
--- a/computes/forms.py
+++ b/computes/forms.py
@@ -1,8 +1,9 @@
-import re
 from django import forms
 from django.utils.translation import gettext_lazy as _
+from vrtManager.connection import CONN_SOCKET, CONN_SSH, CONN_TCP, CONN_TLS
+
 from computes.models import Compute
-from vrtManager.connection import CONN_TCP, CONN_SSH, CONN_TLS, CONN_SOCKET
+
 from .validators import validate_hostname
 
 
diff --git a/computes/templates/computes/instances.html b/computes/templates/computes/instances.html
index 342d53d..d5a02b3 100644
--- a/computes/templates/computes/instances.html
+++ b/computes/templates/computes/instances.html
@@ -6,9 +6,9 @@
 {% block style %}
 <link rel="stylesheet" href="{% static "css/sortable-theme-bootstrap.css" %}" />
 {% endblock %}
-{% block page_header %}{{ compute.name }}{% endblock page_header %}
+{% block page_heading %}{{ compute.name }}{% endblock page_heading %}
 
-{% block page_header_extra %}
+{% block page_heading_extra %}
 <a href="{% url 'instances:create_instance_select_type' compute.id %}"
     class="btn btn-success btn-header float-right">
     {% icon 'plus' %}
@@ -18,7 +18,7 @@
     <input id="filter" class="form-control" type="text" placeholder="{% trans 'Search' %}">
 </div>
 {% endif %}
-{% endblock page_header_extra %}
+{% endblock page_heading_extra %}
 
 {% block content %}
 <div class="row">
diff --git a/computes/templates/computes/list.html b/computes/templates/computes/list.html
index 79b61fe..8e4b899 100644
--- a/computes/templates/computes/list.html
+++ b/computes/templates/computes/list.html
@@ -12,7 +12,6 @@
         <h3 class="page-header">{% trans "Computes" %}</h3>
     </div>
 </div>
-{% include 'errors_block.html' %}
 <div class="row">
     {% if not computes %}
         <div class="col-lg-12">
diff --git a/computes/templates/overview.html b/computes/templates/overview.html
index c2d2e34..2894ebb 100644
--- a/computes/templates/overview.html
+++ b/computes/templates/overview.html
@@ -1,42 +1,42 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load staticfiles %}
+{% load icons %}
+
 {% block title %}{% trans "Overview" %} - {{ compute.name }}{% endblock %}
+
+{% block page_heading %}{{ compute.name }}{% endblock page_heading %}
+
 {% block content %}
-    <!-- Page Heading -->
     <div class="row">
         <div class="col-lg-12">
-            <h2 class="page-header">{{ compute.name }}</h2>
             <nav aria-label="breadcrumb">
             <ol class="breadcrumb bg-light shadow-sm">
-                <li class="breadcrumb-item active">
-                    <span class="font-weight-bold"><i class="fa fa-dashboard"></i> {% trans "Overview" %}</span>
+                <li class="breadcrumb-item">
+                    <span class="font-weight-bold">{% icon 'dashboard' %} {% trans "Overview" %}</span>
                 </li>
                 <li class="breadcrumb-item">
-                    <a href="{% url 'instances' compute.id %}"><i class="fa fa-server"></i> {% trans "Instances" %}</a>
+                    <a href="{% url 'instances' compute.id %}">{% icon 'server' %} {% trans "Instances" %}</a>
                 </li>
                 <li class="breadcrumb-item">
-                    <a href="{% url 'storages' compute.id %}"><i class="fa fa-hdd-o"></i> {% trans "Storages" %}</a>
+                    <a href="{% url 'storages' compute.id %}">{% icon 'hdd-o' %} {% trans "Storages" %}</a>
                 </li>
                 <li class="breadcrumb-item">
-                    <a href="{% url 'networks' compute.id %}"><i class="fa fa-sitemap"></i> {% trans "Networks" %}</a>
+                    <a href="{% url 'networks' compute.id %}">{% icon 'sitemap' %} {% trans "Networks" %}</a>
                 </li>
                 <li class="breadcrumb-item">
-                    <a href="{% url 'interfaces' compute.id %}"><i class="fa fa-wifi"></i> {% trans "Interfaces" %}</a>
+                    <a href="{% url 'interfaces' compute.id %}">{% icon 'wifi' %} {% trans "Interfaces" %}</a>
                 </li>
                 <li class="breadcrumb-item">
-                    <a href="{% url 'nwfilters' compute.id %}"><i class="fa fa-filter"></i> {% trans "NWFilters" %}</a>
+                    <a href="{% url 'nwfilters' compute.id %}">{% icon 'filter' %} {% trans "NWFilters" %}</a>
                 </li>
                 <li class="breadcrumb-item">
-                    <a href="{% url 'secrets' compute.id %}"><i class="fa fa-key"></i> {% trans "Secrets" %}</a>
+                    <a href="{% url 'secrets' compute.id %}">{% icon 'key' %} {% trans "Secrets" %}</a>
                 </li>
             </ol>
             </nav>
         </div>
     </div>
-    <!-- /.row -->
-
-    {% include 'errors_block.html' %}
 
     <div class="shadow-sm">
         <h3 class="page-header">{% trans "Basic details" %}</h3>
diff --git a/instances/templates/allinstances.html b/instances/templates/allinstances.html
index caaa932..8c29794 100644
--- a/instances/templates/allinstances.html
+++ b/instances/templates/allinstances.html
@@ -6,16 +6,16 @@
 {% block style %}
     <link rel="stylesheet" href="{% static "css/sortable-theme-bootstrap.css" %}" />
 {% endblock %}
-{% block page_header %}{% trans "Instances" %}{% endblock page_header %}
+{% block page_heading %}{% trans "Instances" %}{% endblock page_heading %}
 
-{% block page_header_extra %}
+{% block page_heading_extra %}
 {% if request.user.is_superuser %}
     {% include 'create_inst_block.html' %}
 {% endif %}
 <div class="float-right search">
     <input id="filter" class="form-control" type="text" placeholder="{% trans 'Search' %}">
 </div>
-{% endblock page_header_extra %}
+{% endblock page_heading_extra %}
 
 {% block content %}
     {% for compute in computes %}
diff --git a/instances/templates/create_instance_w1.html b/instances/templates/create_instance_w1.html
index 11567b5..522da69 100644
--- a/instances/templates/create_instance_w1.html
+++ b/instances/templates/create_instance_w1.html
@@ -1,21 +1,15 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load staticfiles %}
+
 {% block title %}{% trans "Create new instance" %} - {% trans "Select Type" %}{% endblock %}
 
-{% block content %}
-    <!-- Page Heading -->   
-    <div class="row">
-        <div class="col-lg-12">
-            <h3 class="page-header">
-                {% blocktrans with host=compute.name %}New instance on {{ host }} {% endblocktrans %}
-            </h3>
-        </div>
-    </div>
-    <!-- /.row -->
-    {% include 'errors_block.html' %}
-    {% include 'pleasewaitdialog.html' %}
+{% block page_heading%}
+{% blocktrans with host=compute.name %}New instance on {{ host }} {% endblocktrans %}
+{% endblock page_heading %}
 
+{% block content %}
+    {% include 'pleasewaitdialog.html' %}
 
     {% if form.errors %}
     {% for field in form %}
diff --git a/instances/templates/create_instance_w2.html b/instances/templates/create_instance_w2.html
index 058d72c..301f552 100644
--- a/instances/templates/create_instance_w2.html
+++ b/instances/templates/create_instance_w2.html
@@ -3,22 +3,17 @@
 {% load staticfiles %}
 {% load icons %}
 {% block title %}{% trans "Create new instance" %}{% endblock %}
+
 {% block style %}
     <link href="{% static "css/bootstrap-multiselect.css" %}" rel="stylesheet">
 {% endblock %}
-{% block content %}
-    <!-- Page Heading -->
-    <div class="row">
-        <div class="col-lg-12">
-            <h3 class="page-header">
-                {% blocktrans with host=compute.name %}New instance on {{ host }} {% endblocktrans %}</h3>
-            </h3>
-        </div>
-    </div>
-    <!-- /.row -->
-    {% include 'errors_block.html' %}
-    {% include 'pleasewaitdialog.html' %}
 
+{% block page_heading %}
+{% blocktrans with host=compute.name %}New instance on {{ host }} {% endblocktrans %}
+{% endblock page_heading %}
+
+{% block content %}
+    {% include 'pleasewaitdialog.html' %}
 
     {% if form.errors %}
     {% for field in form %}
diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index 3739391..c4ce0e4 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -1,14 +1,16 @@
 {% extends "base.html" %}
 {% load staticfiles %}
 {% load i18n %}
+
 {% block title %}{% trans "Instance" %} - {{ instance.name }}{% endblock %}
+
+{% block page_heading %}
+{{ instance.name }}{% if instance.title %} ({{ instance.title }}){% endif %}
+{% endblock page_heading %}
+
 {% block content %}
     {% include 'pleasewaitdialog.html' %}
-    <!-- Page Heading -->
      <div>
-        <div>
-            <h3>{{ instance.name }}{% if instance.title %}&nbsp;({{ instance.title }}){% endif %}</h3>
-        </div>
         <div>
             {% if instance.status == 5 %}
                <span class="badge badge-danger">{% trans "Off" %}</span>
@@ -62,8 +64,6 @@
         <hr>
     </div>
 
-    {% include 'errors_block.html' %}
-
     <div class="row" id="max-width-page">
         <div class="container">
             <div role="tabpanel">
diff --git a/instances/templates/instances/destroy_instance_form.html b/instances/templates/instances/destroy_instance_form.html
index 94265ec..9ae46f2 100644
--- a/instances/templates/instances/destroy_instance_form.html
+++ b/instances/templates/instances/destroy_instance_form.html
@@ -4,9 +4,9 @@
 {% trans "Confirm Destroy" %}
 {% endblock title %}
 
-{% block page_header %}
+{% block page_heading %}
 {% trans "Destroy instance" %} {{ instance }}
-{% endblock page_header %}
+{% endblock page_heading %}
 
 {% block content %}
 {% if request.user.is_superuser or userinstance.is_delete %}
diff --git a/interfaces/templates/interface.html b/interfaces/templates/interface.html
index 62436f8..a06a950 100644
--- a/interfaces/templates/interface.html
+++ b/interfaces/templates/interface.html
@@ -1,11 +1,13 @@
 {% extends "base.html" %}
 {% load i18n %}
+
 {% block title %}{% trans "Interface" %} - {{ iface }}{% endblock %}
+
+{% block page_heading %}{% trans "Interface" %}: {{ iface }}{% endblock page_heading %}
+
 {% block content %}
-   <!-- Page Heading -->
     <div class="row">
         <div class="col-lg-12">
-            <h2 class="page-header">{% trans "Interface" %}: {{ iface }}</h2>
             <ol class="breadcrumb bg-light shadow-sm">
                 <li class="breadcrumb-item active">
                     <a href="{% url 'overview' compute.id %}"><i class="fa fa-dashboard"></i> {% trans "Overview" %}</a>
@@ -31,9 +33,6 @@
             </ol>
         </div>
     </div>
-    <!-- /.row -->
-
-    {% include 'errors_block.html' %}
 
     <div class="row">
         <dl class="ml-3 row">
diff --git a/interfaces/templates/interfaces.html b/interfaces/templates/interfaces.html
index b6221cc..c103de6 100644
--- a/interfaces/templates/interfaces.html
+++ b/interfaces/templates/interfaces.html
@@ -1,13 +1,16 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load staticfiles %}
+
 {% block title %}{% trans "Interfaces" %} - {{ compute.name }}{% endblock %}
+
+{% block page_heading%}{% trans "Interfaces" %} - {{ compute.name }}{% endblock page_heading %}
+
+{% block page_heading_extra %}{% include 'create_iface_block.html' %}{% endblock page_heading_extra %}
+
 {% block content %}
-    <!-- Page Heading -->
     <div class="row">
         <div class="col-lg-12">
-            {% include 'create_iface_block.html' %}
-            <h2 class="page-header">{{ compute.name }}</h2>
             <nav aria-label="breadcrumb">
             <ol class="breadcrumb bg-light shadow-sm">
                 <li class="breadcrumb-item active">
@@ -35,9 +38,6 @@
             </nav>
         </div>
     </div>
-    <!-- /.row -->
-
-    {% include 'errors_block.html' %}
 
     <div class="row">
         {% if not  ifaces_all %}
diff --git a/interfaces/views.py b/interfaces/views.py
index b7fdcc5..7a12a38 100644
--- a/interfaces/views.py
+++ b/interfaces/views.py
@@ -1,3 +1,4 @@
+from django.contrib import messages
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponseRedirect
 from django.urls import reverse
@@ -17,7 +18,6 @@ def interfaces(request, compute_id):
     """
 
     ifaces_all = []
-    error_messages = []
     compute = get_object_or_404(Compute, pk=compute_id)
 
     try:
@@ -42,10 +42,10 @@ def interfaces(request, compute_id):
                     return HttpResponseRedirect(request.get_full_path())
                 else:
                     for msg_err in form.errors.values():
-                        error_messages.append(msg_err.as_text())
+                        messages.error(request, msg_err.as_text())
         conn.close()
     except libvirtError as lib_err:
-        error_messages.append(lib_err)
+        messages.error(request, lib_err)
 
     return render(request, 'interfaces.html', locals())
 
@@ -60,7 +60,6 @@ def interface(request, compute_id, iface):
     """
 
     ifaces_all = []
-    error_messages = []
     compute = get_object_or_404(Compute, pk=compute_id)
 
     try:
@@ -88,6 +87,6 @@ def interface(request, compute_id, iface):
                 return HttpResponseRedirect(reverse('interfaces', args=[compute_id]))
         conn.close()
     except libvirtError as lib_err:
-        error_messages.append(lib_err)
+        messages.error(request, lib_err)
 
     return render(request, 'interface.html', locals())
diff --git a/logs/templates/paging.html b/logs/templates/paging.html
deleted file mode 100644
index 9901dff..0000000
--- a/logs/templates/paging.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="center-block">
-    {% if page > 1 %}
-        <a href="{% url 'showlogspage' page|add:"-1" %}">&larr;</a>
-    {% else %}
-        &nbsp;
-    {% endif %}
-    {% if has_next_page %}
-        <a href="{% url 'showlogspage' page|add:"1" %}">&rarr;</a>
-    {% else %}
-        &nbsp;
-    {% endif %}
-</div>
diff --git a/networks/templates/network.html b/networks/templates/network.html
index 5deea60..a096eca 100644
--- a/networks/templates/network.html
+++ b/networks/templates/network.html
@@ -1,13 +1,14 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load staticfiles %}
+
 {% block title %}{% trans "Network" %} - {{ pool }}{% endblock %}
+
+{% block page_heading %}{% trans "Network" %}: {{ pool }}{% endblock page_heading %}
+
 {% block content %}
-   <!-- Page Heading -->
     <div class="row">
         <div class="col-lg-12">
-            <h2 class="page-header">{% trans "Network" %}: {{ pool }}</h2>
-            
             <ol class="breadcrumb bg-light shadow-sm">
                 <li class="breadcrumb-item">
                     <a href="{% url 'overview' compute.id %}"><i class="fa fa-dashboard"></i> {% trans "Overview" %}</a>
@@ -34,9 +35,6 @@
 
         </div>
     </div>
-    <!-- /.row -->
-
-    {% include 'errors_block.html' %}
 
     <div class="row">
         <dl class="ml-3 row">
diff --git a/networks/templates/networks.html b/networks/templates/networks.html
index 30a05ac..5415acd 100644
--- a/networks/templates/networks.html
+++ b/networks/templates/networks.html
@@ -1,14 +1,13 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% block title %}{% trans "Networks" %} - {{ compute.name }}{% endblock %}
+
+{% block title %}{{ compute.name }} - {% trans "Networks" %}{% endblock %}
+
+{% block page_heading %}{{ compute.name }} - {% trans "Networks" %}{% endblock page_heading %}
+
+{% block page_heading_extra %}{% include 'create_net_block.html' %}{% endblock page_heading_extra %}
+
 {% block content %}
-<!-- Page Heading -->
-    <div class="row">
-        <div class="col-lg-12">
-            {% include 'create_net_block.html' %}
-            <h2 class="page-header">{{ compute.name }} - {% trans "Networks" %}</h2>
-        </div>
-    </div>
     <div class="row">
         <div class="col-lg-12">
             <nav aria-label="breadcrumb">
@@ -38,9 +37,6 @@
             </nav>
         </div>
     </div>
-    <!-- /.row -->
-
-    {% include 'errors_block.html' %}
 
     <div class="row">
         {% if not networks %}
diff --git a/networks/views.py b/networks/views.py
index 917cb6f..aade157 100644
--- a/networks/views.py
+++ b/networks/views.py
@@ -19,8 +19,8 @@ def networks(request, compute_id):
     :return:
     """
 
-    error_messages = []
     compute = get_object_or_404(Compute, pk=compute_id)
+    errors = False
 
     try:
         conn = wvmNetworks(
@@ -41,9 +41,11 @@ def networks(request, compute_id):
                     data = form.cleaned_data
                     if data['name'] in networks:
                         msg = _("Network pool name already in use")
-                        error_messages.append(msg)
+                        messages.error(request, msg)
+                        errors = True
                     if data['forward'] in ['bridge', 'macvtap'] and data['bridge_name'] == '':
-                        error_messages.append(_('Please enter bridge/dev name'))
+                        messages.error(request, _('Please enter bridge/dev name'))
+                        errors = True
                     if data['subnet']:
                         ipv4 = True
                         gateway4, netmask4, dhcp4 = network_size(data['subnet'], data['dhcp4'])
@@ -51,8 +53,9 @@ def networks(request, compute_id):
                         ipv6 = True
                         gateway6, prefix6, dhcp6 = network_size(data['subnet6'], data['dhcp6'])
                         if prefix6 != '64':
-                            error_messages.append(_('For libvirt, the IPv6 network prefix must be /64'))
-                    if not error_messages:
+                            messages.error(request, _('For libvirt, the IPv6 network prefix must be /64'))
+                            errors = True
+                    if not errors:
                         conn.create_network(
                             data['name'],
                             data['forward'],
@@ -71,10 +74,10 @@ def networks(request, compute_id):
                         return HttpResponseRedirect(reverse('network', args=[compute_id, data['name']]))
                 else:
                     for msg_err in form.errors.values():
-                        error_messages.append(msg_err.as_text())
+                        messages.error(request, msg_err.as_text())
         conn.close()
     except libvirtError as lib_err:
-        error_messages.append(lib_err)
+        messages.error(request, lib_err)
 
     return render(request, 'networks.html', locals())
 
@@ -88,7 +91,6 @@ def network(request, compute_id, pool):
     :return:
     """
 
-    error_messages = []
     compute = get_object_or_404(Compute, pk=compute_id)
 
     try:
@@ -125,7 +127,7 @@ def network(request, compute_id, pool):
 
         xml = conn._XMLDesc(0)
     except libvirtError as lib_err:
-        error_messages.append(lib_err)
+        messages.error(request, lib_err)
         return HttpResponseRedirect(reverse('networks', args=compute_id))
 
     if request.method == 'POST':
@@ -134,31 +136,31 @@ def network(request, compute_id, pool):
                 conn.start()
                 return HttpResponseRedirect(request.get_full_path())
             except libvirtError as lib_err:
-                error_messages.append(lib_err)
+                messages.error(request, lib_err)
         if 'stop' in request.POST:
             try:
                 conn.stop()
                 return HttpResponseRedirect(request.get_full_path())
             except libvirtError as lib_err:
-                error_messages.append(lib_err)
+                messages.error(request, lib_err)
         if 'delete' in request.POST:
             try:
                 conn.delete()
                 return HttpResponseRedirect(reverse('networks', args=[compute_id]))
             except libvirtError as lib_err:
-                error_messages.append(lib_err)
+                messages.error(request, lib_err)
         if 'set_autostart' in request.POST:
             try:
                 conn.set_autostart(1)
                 return HttpResponseRedirect(request.get_full_path())
             except libvirtError as lib_err:
-                error_messages.append(lib_err)
+                messages.error(request, lib_err)
         if 'unset_autostart' in request.POST:
             try:
                 conn.set_autostart(0)
                 return HttpResponseRedirect(request.get_full_path())
             except libvirtError as lib_err:
-                error_messages.append(lib_err)
+                messages.error(request, lib_err)
         if 'modify_fixed_address' in request.POST:
             name = request.POST.get('name', '')
             address = request.POST.get('address', '')
@@ -174,9 +176,9 @@ def network(request, compute_id, pool):
                 messages.success(request, _(f"{family.upper()} Fixed Address Operation Completed."))
                 return HttpResponseRedirect(request.get_full_path())
             except libvirtError as lib_err:
-                error_messages.append(lib_err)
+                messages.error(request, lib_err)
             except ValueError as val_err:
-                error_messages.append(val_err)
+                messages.error(request, val_err)
         if 'delete_fixed_address' in request.POST:
             ip = request.POST.get('address', '')
             family = request.POST.get('family', 'ipv4')
@@ -192,7 +194,7 @@ def network(request, compute_id, pool):
                 messages.success(request, _(f"{family.upper()} DHCP Range is Changed."))
                 return HttpResponseRedirect(request.get_full_path())
             except libvirtError as lib_err:
-                error_messages.append(lib_err)
+                messages.error(request, lib_err)
         if 'edit_network' in request.POST:
             edit_xml = request.POST.get('edit_xml', '')
             if edit_xml:
diff --git a/nwfilters/templates/nwfilter.html b/nwfilters/templates/nwfilter.html
index 4a41abf..c14282f 100644
--- a/nwfilters/templates/nwfilter.html
+++ b/nwfilters/templates/nwfilter.html
@@ -1,12 +1,14 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load staticfiles %}
-{% block title %}{% trans "NWFilters" %} - {{ compute.name }}{% endblock %}
+
+{% block title %}{% trans "NWFilter" %}: {{ name }}{% endblock %}
+
+{% block page_heading %}{% trans "NWFilter" %}: {{ name }}{% endblock page_heading %}
+
 {% block content %}
-   <!-- Page Heading -->
     <div class="row">
         <div class="col-lg-12">
-            <h3 class="page-header">{% trans "NWFilter" %}: {{ name }}</h3>
             <ol class="breadcrumb bg-light shadow-sm">
                 <li class="breadcrumb-item active">
                     <a href="{% url 'overview' compute.id %}"><i class="fa fa-dashboard"></i> {% trans "Overview" %}</a>
@@ -32,12 +34,7 @@
             </ol>
         </div>
     </div>
-    <!-- /.row -->
 
-    {% include 'errors_block.html' %}
-    {% include 'messages_block.html' %}
-
- 
     <dl class="ml-3 row">
         <dt class="col-4">{% trans "UUID" %}:</dt>
         <dd class="col-8">{{ uuid }}</dd>
diff --git a/nwfilters/templates/nwfilters.html b/nwfilters/templates/nwfilters.html
index b1fb566..d4110af 100644
--- a/nwfilters/templates/nwfilters.html
+++ b/nwfilters/templates/nwfilters.html
@@ -1,18 +1,19 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load staticfiles %}
-{% block title %}{% trans "NWFilters" %} - {{ compute.name }}{% endblock %}
+
+{% block title %}{{ compute.name }} - {% trans "NWFilters" %}{% endblock %}
+
+{% block page_heading %}{{ compute.name }} - {% trans "NWFilters" %}{% endblock page_heading %}
+
+{% block page_heading_extra %}
+{% include 'create_nwfilter_block.html' %}
+<div class="float-right search">
+    <input id="filter" class="form-control" type="text" placeholder="{% trans 'Search' %}">
+</div>
+{% endblock page_heading_extra %}
+
 {% block content %}
-    <!-- Page Heading -->
-    <div class="row">
-        <div class="col-lg-12">
-            {% include 'create_nwfilter_block.html' %}
-            <div class="float-right search">
-                <input id="filter" class="form-control" type="text" placeholder="{% trans 'Search' %}">
-            </div>
-            <h2 class="page-header">{{ compute.name }} - {% trans "NWFilters" %}</h2>
-        </div>
-    </div>
     <div class="row">
         <div class="col-lg-12">
             <nav aria-label="breadcrumb">
@@ -42,10 +43,6 @@
             </nav>
         </div>
     </div>
-    <!-- /.row -->
-
-    {% include 'errors_block.html' %}
-    {% include 'messages_block.html' %}
 
    <div class="row">
         <div class="col-lg-12">
diff --git a/nwfilters/views.py b/nwfilters/views.py
index 6fdef30..3ac9407 100644
--- a/nwfilters/views.py
+++ b/nwfilters/views.py
@@ -1,11 +1,10 @@
-from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404, render
-from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
-from libvirt import libvirtError
-
 from admin.decorators import superuser_only
 from computes.models import Compute
+from django.contrib import messages
+from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404, render
+from django.utils.translation import gettext_lazy as _
+from libvirt import libvirtError
 from logs.views import addlogmsg
 from vrtManager import util
 from vrtManager.instance import wvmInstance, wvmInstances
@@ -20,7 +19,6 @@ def nwfilters(request, compute_id):
     :return:
     """
 
-    error_messages = []
     nwfilters_all = []
     compute = get_object_or_404(Compute, pk=compute_id)
 
@@ -51,7 +49,7 @@ def nwfilters(request, compute_id):
                             conn.create_nwfilter(xml)
                             addlogmsg(request.user.username, compute.hostname, msg)
                         except libvirtError as lib_err:
-                            error_messages.append(lib_err)
+                            messages.error(request, lib_err)
                             addlogmsg(request.user.username, compute.hostname, lib_err)
 
             if 'del_nwfilter' in request.POST:
@@ -69,7 +67,7 @@ def nwfilters(request, compute_id):
                     if name in dom_filterrefs:
                         in_use = True
                         msg = _(f"NWFilter is in use by {inst}. Cannot be deleted.")
-                        error_messages.append(msg)
+                        messages.error(request, msg)
                         addlogmsg(request.user.username, compute.hostname, msg)
                         i_conn.close()
                         break
@@ -93,16 +91,15 @@ def nwfilters(request, compute_id):
 
         conn.close()
     except libvirtError as lib_err:
-        error_messages.append(lib_err)
+        messages.error(request, lib_err)
         addlogmsg(request.user.username, compute.hostname, lib_err)
     except Exception as err:
-        error_messages.append(err)
+        messages.error(request, err)
         addlogmsg(request.user.username, compute.hostname, err)
 
     return render(request, 'nwfilters.html', {
-        'error_messages': error_messages,
         'nwfilters': nwfilters_all,
-        'compute': compute
+        'compute': compute,
     })
 
 
@@ -113,7 +110,6 @@ def nwfilter(request, compute_id, nwfltr):
     :param nwfltr:
     :return:
     """
-    error_messages = []
     nwfilters_all = []
     compute = get_object_or_404(Compute, pk=compute_id)
 
@@ -194,8 +190,8 @@ def nwfilter(request, compute_id, nwfltr):
         conn.close()
         nwfilter.close()
     except libvirtError as lib_err:
-        error_messages.append(lib_err)
+        messages.error(request, lib_err)
     except Exception as error_msg:
-        error_messages.append(error_msg)
+        messages.error(request, error_msg)
 
     return render(request, 'nwfilter.html', locals())
diff --git a/secrets/templates/secrets.html b/secrets/templates/secrets.html
index a3274a0..b5e21ba 100644
--- a/secrets/templates/secrets.html
+++ b/secrets/templates/secrets.html
@@ -2,15 +2,19 @@
 {% load i18n %}
 {% load staticfiles %}
 {% block title %}{% trans "Secrets" %} - {{ compute.name }}{% endblock %}
+
 {% block style %}
     <link rel="stylesheet" href="{% static "css/sortable-theme-bootstrap.css" %}" />
 {% endblock %}
+
+{% block page_heading %}{{ compute }} - {% trans "Secrets" %}{% endblock page_heading %}
+
+{% block page_heading_extra %}{% include 'create_secret_block.html' %}{% endblock page_heading_extra %}
+
 {% block content %}
-   <!-- Page Heading -->
     <div class="row">
         <div class="col-lg-12">
-            {% include 'create_secret_block.html' %}
-            <h2 class="page-header">{% trans "Secrets" %}</h2>
+            <h2 class="page-header"></h2>
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb bg-light shadow-sm">
                     <li class="breadcrumb-item active">
@@ -38,9 +42,6 @@
             </nav>
         </div>
     </div>
-    <!-- /.row -->
-
-    {% include 'errors_block.html' %}
 
     <div class="row">
         {% if not  secrets_all %}
diff --git a/secrets/views.py b/secrets/views.py
index 9b47f18..3788d87 100644
--- a/secrets/views.py
+++ b/secrets/views.py
@@ -1,17 +1,12 @@
-
-from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404, render
-from django.urls import reverse
-from libvirt import libvirtError
-from libvirt import (VIR_SECRET_USAGE_TYPE_NONE, 
-    VIR_SECRET_USAGE_TYPE_CEPH, 
-    VIR_SECRET_USAGE_TYPE_TLS,
-    VIR_SECRET_USAGE_TYPE_VOLUME, 
-    VIR_SECRET_USAGE_TYPE_ISCSI)
+from secrets.forms import AddSecret
 
 from admin.decorators import superuser_only
 from computes.models import Compute
-from secrets.forms import AddSecret
+from django.contrib import messages
+from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404, render
+from libvirt import (VIR_SECRET_USAGE_TYPE_CEPH, VIR_SECRET_USAGE_TYPE_ISCSI, VIR_SECRET_USAGE_TYPE_NONE,
+                     VIR_SECRET_USAGE_TYPE_TLS, VIR_SECRET_USAGE_TYPE_VOLUME, libvirtError)
 from vrtManager.secrets import wvmSecrets
 
 
@@ -24,7 +19,6 @@ def secrets(request, compute_id):
     """
 
     secrets_all = []
-    error_messages = []
     compute = get_object_or_404(Compute, pk=compute_id)
     secret_usage_types = {
         VIR_SECRET_USAGE_TYPE_NONE: "none",
@@ -59,11 +53,12 @@ def secrets(request, compute_id):
                         data['ephemeral'],
                         data['private'],
                         data['usage_type'],
-                        data['data'])
+                        data['data'],
+                    )
                     return HttpResponseRedirect(request.get_full_path())
                 else:
                     for msg_err in form.errors.values():
-                        error_messages.append(msg_err.as_text())
+                        messages.error(request, msg_err.as_text())
             if 'delete' in request.POST:
                 uuid = request.POST.get('uuid', '')
                 conn.delete_secret(uuid)
@@ -74,9 +69,9 @@ def secrets(request, compute_id):
                 try:
                     conn.set_secret_value(uuid, value)
                 except Exception as err:
-                    error_messages.append(err)
+                    messages.error(request, err)
                 return HttpResponseRedirect(request.get_full_path())
     except libvirtError as err:
-        error_messages.append(err)
+        messages.error(request, err)
 
     return render(request, 'secrets.html', locals())
diff --git a/storages/templates/storage.html b/storages/templates/storage.html
index b23aa04..cec96b5 100644
--- a/storages/templates/storage.html
+++ b/storages/templates/storage.html
@@ -1,17 +1,19 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load staticfiles %}
-{% block title %}{% trans "Storage" %} - {{ pool }}{% endblock %}
+{% block title %}{{ compute }} - {% trans "Storage" %}: {{ pool }}{% endblock %}
 {% block style %}
     <link rel="stylesheet" href="{% static "css/sortable-theme-bootstrap.css" %}"/>
 {% endblock %}
-{% block content %}
 
-    <!-- Page Heading -->
+{% block page_heading %}{{ compute }} - {% trans "Storage" %}: {{ pool }}{% endblock page_heading %}
+
+{% block page_heading_extra %}{% include 'create_stg_vol_block.html' %}{% endblock page_heading_extra %}
+
+{% block content %}
     <div class="row">
         <div class="col-lg-12">
-            {% include 'create_stg_vol_block.html' %}
-            <h2 class="page-header">{% trans "Storage" %}: {{ pool }}</h2>
+            <h2 class="page-header"></h2>
             <ol class="breadcrumb bg-light shadow-sm">
                <li class="breadcrumb-item active">
                     <a href="{% url 'overview' compute.id %}"><i class="fa fa-dashboard"></i> {% trans "Overview" %}</a>
@@ -37,9 +39,6 @@
             </ol>
         </div>
     </div>
-    <!-- /.row -->
-
-    {% include 'errors_block.html' %}
 
     <dl class="ml-3 row">
         <dt class="col-6">{% trans "Pool name" %}</dt>
diff --git a/storages/templates/storages.html b/storages/templates/storages.html
index dba6770..fddcc58 100644
--- a/storages/templates/storages.html
+++ b/storages/templates/storages.html
@@ -1,14 +1,13 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% block title %}{% trans "Storages" %} - {{ compute.name }}{% endblock %}
+
+{% block title %}{{ compute.name }} - {% trans "Storages" %}{% endblock %}
+
+{% block page_heading %}{{ compute.name }} - {% trans "Storages" %}{% endblock page_heading %}
+
+{% block page_heading_extra %}{% include 'create_stg_block.html' %}{% endblock page_heading_extra %}
+
 {% block content %}
-    <!-- Page Heading -->
-    <div class="row">
-        <div class="col-lg-12">
-            {% include 'create_stg_block.html' %}
-            <h2 class="page-header">{{ compute.name }} - {% trans "Storages" %}</h2>
-        </div>
-    </div>
     <div class="row">
         <div class="col-lg-12">
             <nav aria-label="breadcrumb">
@@ -38,10 +37,6 @@
             </nav>
         </div>
     </div>
-    <!-- /.row -->
-
-    {% include 'errors_block.html' %}
-
     <div class="row">
         {% if not storages %}
             <div class="col-lg-12">
diff --git a/storages/views.py b/storages/views.py
index 2d70be2..b3ee0b1 100644
--- a/storages/views.py
+++ b/storages/views.py
@@ -23,8 +23,8 @@ def storages(request, compute_id):
     :return:
     """
 
-    error_messages = []
     compute = get_object_or_404(Compute, pk=compute_id)
+    errors = False
 
     try:
         conn = wvmStorages(compute.hostname, compute.login, compute.password, compute.type)
@@ -38,15 +38,18 @@ def storages(request, compute_id):
                     data = form.cleaned_data
                     if data['name'] in storages:
                         msg = _("Pool name already use")
-                        error_messages.append(msg)
+                        messages.error(request, msg)
+                        errors = True
                     if data['stg_type'] == 'rbd':
                         if not data['secret']:
                             msg = _("You need create secret for pool")
-                            error_messages.append(msg)
+                            messages.error(request, msg)
+                            errors = True
                         if not data['ceph_pool'] and not data['ceph_host'] and not data['ceph_user']:
                             msg = _("You need input all fields for creating ceph pool")
-                            error_messages.append(msg)
-                    if not error_messages:
+                            messages.error(request, msg)
+                            errors = True
+                    if not errors:
                         if data['stg_type'] == 'rbd':
                             conn.create_storage_ceph(data['stg_type'], data['name'], data['ceph_pool'], data['ceph_host'],
                                                      data['ceph_user'], data['secret'])
@@ -58,10 +61,10 @@ def storages(request, compute_id):
                         return HttpResponseRedirect(reverse('storage', args=[compute_id, data['name']]))
                 else:
                     for msg_err in form.errors.values():
-                        error_messages.append(msg_err.as_text())
+                        messages.error(request, msg_err.as_text())
         conn.close()
     except libvirtError as lib_err:
-        error_messages.append(lib_err)
+        messages.error(request, lib_err)
 
     return render(request, 'storages.html', locals())
 
diff --git a/templates/base.html b/templates/base.html
index 02a17e1..0d71065 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -40,15 +40,16 @@
       <div class"row">
         <div class="col-sm-12">
           <div class="float-right">
-            {% block page_header_extra %}
-            {% endblock page_header_extra %}
+            {% block page_heading_extra %}
+            {% endblock page_heading_extra %}
           </div>
           <h3 class="page-header">
-            {% block page_header %}
-            {% endblock page_header %}
+            {% block page_heading %}
+            {% endblock page_heading %}
           </h3>
         </div>
       </div>
+      <hr>
       {% bootstrap_messages %}
       {% block content %}{% endblock %}
     </div>
diff --git a/templates/common/confirm_delete.html b/templates/common/confirm_delete.html
index 6f4a42c..fc22c52 100644
--- a/templates/common/confirm_delete.html
+++ b/templates/common/confirm_delete.html
@@ -5,7 +5,7 @@
 
 {% block title %}{{ title }}{% endblock %}
 
-{% block page_header %}{{ title }}{% endblock page_header %}
+{% block page_heading %}{{ title }}{% endblock page_heading %}
 
 {% block content %}
 <div class="row">
diff --git a/templates/common/form.html b/templates/common/form.html
index 0e5a000..6c58af0 100644
--- a/templates/common/form.html
+++ b/templates/common/form.html
@@ -5,7 +5,7 @@
 
 {% block title %}{{ title }}{% endblock %}
 
-{% block page_header %}{{ title }}{% endblock page_header %}
+{% block page_heading %}{{ title }}{% endblock page_heading %}
 
 {% block content %}
 <div class="card">
diff --git a/templates/errors_block.html b/templates/errors_block.html
deleted file mode 100644
index 2fb6c61..0000000
--- a/templates/errors_block.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% load i18n %}
-{% if error_messages %}
-    {% for error in error_messages %}
-        <!-- Error Messages -->
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="alert alert-danger alert-dismissible" role="alert">
-                    <strong>{% trans 'Error' %}:</strong> {{ error }}
-                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-            </div>
-        </div>
-        <!-- /.row -->
-    {% endfor %}
-{% endif %}
\ No newline at end of file
diff --git a/templates/messages_block.html b/templates/messages_block.html
deleted file mode 100644
index 95773cf..0000000
--- a/templates/messages_block.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% load i18n %}
-{% if messages %}
-    {% for message in messages %}
-        <!-- Success Messages -->
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="alert alert-success alert-dismissible" role="alert">
-                    <strong>{% trans 'Success' %}:</strong> {{ message }}
-                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-            </div>
-        </div>
-        <!-- /.row -->
-    {% endfor %}
-{% endif %}
\ No newline at end of file

From 737e0faef7cfcfc696b2d9c5b6633641ca47c57d Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Wed, 14 Oct 2020 16:15:28 +0300
Subject: [PATCH 5/6] add code analysis for security

---
 .github/workflows/codeql-analysis.yml | 70 +++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 .github/workflows/codeql-analysis.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000..937aa06
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches-ignore: [master]
+  schedule:
+    - cron: '0 21 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['javascript', 'python']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file. 
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
\ No newline at end of file

From 9402ae2abb3d2c6a06f5523647f15edc7977e001 Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Wed, 14 Oct 2020 16:21:05 +0300
Subject: [PATCH 6/6] fix superlinter dependencies & others

---
 .github/workflows/linter.yml | 53 +++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 8182f1a..01ceee7 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -1,34 +1,56 @@
-# This is a basic workflow to help you get started with Actions
+###########################
+###########################
+## Linter GitHub Actions ##
+###########################
+###########################
 
-name: linter
+name: Lint Code Base
 
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
+#
+# Documentation:
+# https://help.github.com/en/articles/workflow-syntax-for-github-actions
+#
+
+#############################
+# Start the job on all push #
+#############################
 on:
   push:
-    branches: [ '*' ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches-ignore: [master]
+    
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+###############
+# Set the Job #
+###############
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
+    name: Lint Code Base
+    # Set the agent to run on
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
+    ##################
+    # Load all steps #
+    ###################
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@master
+      ##########################
+      # Checkout the code base #
+      ##########################
+    - name: Checkout Code
+      uses: actions/checkout@v2
+      with:
+          # Full git history is needed to get a proper list of changed files within `super-linter`
+          fetch-depth: 0
+
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
         python-version: '3.x'  
       
-    - name: install libvirt-dev
+    - name: Install Required packages
       run: |
-        sudo apt-get install -y libvirt-dev
+        sudo apt-get install -y libvirt-dev python3-lxml zlib1g-dev libxslt1-dev
     - name: Install dependencies
       run: |
         python3 -m pip install --upgrade pip
@@ -39,8 +61,8 @@ jobs:
     - name: Lint Code Base
       uses: docker://github/super-linter:latest
       env:
-        FILTER_REGEX_EXCLUDE: .*[static|scss]/.*
         DEFAULT_BRANCH: master
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         VALIDATE_ANSIBLE: false
         VALIDATE_CLOJURE: false
         VALIDATE_COFFEE: false
@@ -55,5 +77,4 @@ jobs:
         VALIDATE_RUBY: false
         VALIDATE_TSX: false
         VALIDATE_TERRAFORM: false
-