reorg imports and black format

instances/api/serializers.py

@@ -1,7 +1,6 @@
+from instances.models import CreateInstance, Flavor, Instance, MigrateInstance
 from rest_framework import serializers
 
-from instances.models import Flavor, Instance, MigrateInstance, CreateInstance
-
 
 class InstanceSerializer(serializers.ModelSerializer):
     class Meta:

instances/api/viewsets.py

@@ -1,33 +1,31 @@
-from django.shortcuts import get_object_or_404
 from appsettings.settings import app_settings
-from computes.models import Compute
 from computes import utils
+from computes.models import Compute
+from django.shortcuts import get_object_or_404
 from instances.models import Flavor, Instance
-from instances.views import get_instance
 from instances.utils import migrate_instance
+from instances.views import destroy as instance_destroy
 from instances.views import (
-    poweron,
+    force_off,
+    get_instance,
     powercycle,
     poweroff,
-    force_off,
-    suspend,
+    poweron,
     resume,
-    destroy as instance_destroy,
+    suspend,
 )
-
-from rest_framework import status, viewsets, permissions
+from rest_framework import permissions, status, viewsets
 from rest_framework.decorators import action
 from rest_framework.response import Response
-
 from vrtManager import util
-
 from vrtManager.create import wvmCreate
+
 from .serializers import (
-    FlavorSerializer,
-    InstanceSerializer,
-    InstanceDetailsSerializer,
-    MigrateSerializer,
     CreateInstanceSerializer,
+    FlavorSerializer,
+    InstanceDetailsSerializer,
+    InstanceSerializer,
+    MigrateSerializer,
 )
 
 
@@ -40,14 +38,16 @@ class InstancesViewSet(viewsets.ViewSet):
 
     def list(self, request):
 
-        if request.user.is_superuser or request.user.has_perm("instances.view_instances"):
+        if request.user.is_superuser or request.user.has_perm(
+            "instances.view_instances"
+        ):
             queryset = Instance.objects.all().prefetch_related("userinstance_set")
         else:
-            queryset = Instance.objects.filter(userinstance__user=request.user).prefetch_related("userinstance_set")
+            queryset = Instance.objects.filter(
+                userinstance__user=request.user
+            ).prefetch_related("userinstance_set")
         serializer = InstanceSerializer(
-            queryset,
-            many=True,
-            context={"request": request}
+            queryset, many=True, context={"request": request}
         )
 
         return Response(serializer.data)
@@ -72,11 +72,11 @@ class InstanceViewSet(viewsets.ViewSet):
 
         utils.refresh_instance_database(compute)
 
-        queryset = Instance.objects.filter(compute=compute).prefetch_related("userinstance_set")
+        queryset = Instance.objects.filter(compute=compute).prefetch_related(
+            "userinstance_set"
+        )
         serializer = InstanceSerializer(
-            queryset,
-            many=True,
-            context={"request": request}
+            queryset, many=True, context={"request": request}
         )
 
         return Response(serializer.data)
@@ -190,7 +190,9 @@ class CreateInstanceViewSet(viewsets.ViewSet):
             default_io = app_settings.INSTANCE_VOLUME_DEFAULT_IO
             default_discard = app_settings.INSTANCE_VOLUME_DEFAULT_DISCARD
             default_zeroes = app_settings.INSTANCE_VOLUME_DEFAULT_DETECT_ZEROES
-            default_scsi_disk_model = app_settings.INSTANCE_VOLUME_DEFAULT_SCSI_CONTROLLER
+            default_scsi_disk_model = (
+                app_settings.INSTANCE_VOLUME_DEFAULT_SCSI_CONTROLLER
+            )
             default_disk_format = app_settings.INSTANCE_VOLUME_DEFAULT_FORMAT
             default_disk_owner_uid = int(app_settings.INSTANCE_VOLUME_DEFAULT_OWNER_UID)
             default_disk_owner_gid = int(app_settings.INSTANCE_VOLUME_DEFAULT_OWNER_GID)
@@ -227,7 +229,9 @@ class CreateInstanceViewSet(viewsets.ViewSet):
             volume_list.append(volume)
 
             if "UEFI" in serializer.validated_data["firmware"]:
-                firmware["loader"] = (serializer.validated_data["firmware"].split(":")[1].strip())
+                firmware["loader"] = (
+                    serializer.validated_data["firmware"].split(":")[1].strip()
+                )
                 firmware["secure"] = "no"
                 firmware["readonly"] = "yes"
                 firmware["type"] = "pflash"

instances/forms.py

@@ -1,9 +1,8 @@
 import re
 
+from appsettings.models import AppSettings
 from django import forms
 from django.utils.translation import gettext_lazy as _
-
-from appsettings.models import AppSettings
 from webvirtcloud.settings import QEMU_CONSOLE_LISTENER_ADDRESSES, QEMU_KEYMAPS
 
 from .models import CreateInstance, Flavor

instances/models.py

@@ -1,12 +1,10 @@
+from computes.models import Compute
 from django.db import models
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
-
 from libvirt import VIR_DOMAIN_XML_SECURE
-from webvirtcloud.settings import QEMU_CONSOLE_LISTENER_ADDRESSES
-
-from computes.models import Compute
 from vrtManager.instance import wvmInstance
+from webvirtcloud.settings import QEMU_CONSOLE_LISTENER_ADDRESSES
 
 
 class Flavor(models.Model):
@@ -210,14 +208,10 @@ class Instance(models.Model):
 
 class MigrateInstance(models.Model):
     instance = models.ForeignKey(
-        Instance,
-        related_name="source_host",
-        on_delete=models.DO_NOTHING
+        Instance, related_name="source_host", on_delete=models.DO_NOTHING
     )
     target_compute = models.ForeignKey(
-        Compute,
-        related_name="target_host",
-        on_delete=models.DO_NOTHING
+        Compute, related_name="target_host", on_delete=models.DO_NOTHING
     )
 
     live = models.BooleanField(_("Live"))
@@ -234,9 +228,7 @@ class MigrateInstance(models.Model):
 
 class CreateInstance(models.Model):
     compute = models.ForeignKey(
-        Compute,
-        related_name="host",
-        on_delete=models.DO_NOTHING
+        Compute, related_name="host", on_delete=models.DO_NOTHING
     )
     name = models.CharField(
         max_length=64,

instances/views.py

@@ -3,8 +3,8 @@ import json
 import os
 import re
 import socket
-import time
 import subprocess
+import time
 from bisect import insort
 
 from accounts.models import UserInstance, UserSSHKey
@@ -20,12 +20,8 @@ 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 gettext_lazy as _
-from instances.models import Instance
-from libvirt import (
-    VIR_DOMAIN_UNDEFINE_KEEP_NVRAM,
-    VIR_DOMAIN_UNDEFINE_NVRAM,
-    libvirtError,
-)
+from libvirt import (VIR_DOMAIN_UNDEFINE_KEEP_NVRAM, VIR_DOMAIN_UNDEFINE_NVRAM,
+                     libvirtError)
 from logs.views import addlogmsg
 from vrtManager import util
 from vrtManager.create import wvmCreate
@@ -34,6 +30,8 @@ from vrtManager.interface import wvmInterface
 from vrtManager.storage import wvmStorage
 from vrtManager.util import randomPasswd
 
+from instances.models import Instance
+
 from . import utils
 from .forms import ConsoleForm, FlavorForm, NewVMForm
 from .models import Flavor