j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2025-07-31 12:41:08 +00:00
Code Issues Projects Releases Wiki Activity

lint with black python. convert f style strings to old one. some small fixes

Browse source
This commit is contained in:
catborise 2020-11-05 12:34:31 +03:00
parent c20c353a40
commit 508e3609be
54 changed files with 2123 additions and 1824 deletions
Download patch file Download diff file Expand all files Collapse all files

1
computes/urls.py
View file

@ -1,7 +1,6 @@
from secrets.views import secrets
from django.urls import include, path
# from instances.views import create_instance, create_instance_select_type
from interfaces.views import interface, interfaces
from networks.views import network, networks

6
computes/validators.py
View file

@ -1,8 +1,8 @@
from django.core.exceptions import ValidationError
from django.utils.translation import gettext_lazy as _
import re
from django.core.exceptions import ValidationError
from django.utils.translation import gettext_lazy as _
have_symbol = re.compile('[^a-zA-Z0-9._-]+')
wrong_ip = re.compile('^0.|^255.')
wrong_name = re.compile('[^a-zA-Z0-9._-]+')

89
computes/views.py
View file

@ -1,18 +1,23 @@
import json
from django.contrib import messages
from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import get_object_or_404, redirect, render, reverse
from django.http import HttpResponse
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse
from django.utils import timezone
from libvirt import libvirtError
from accounts.models import UserInstance
from admin.decorators import superuser_only
from computes.forms import (SocketComputeForm, SshComputeForm, TcpComputeForm, TlsComputeForm)
from computes.forms import SocketComputeForm, SshComputeForm, TcpComputeForm, TlsComputeForm
from computes.models import Compute
from instances.models import Instance
from vrtManager.connection import (CONN_SOCKET, CONN_SSH, CONN_TCP, CONN_TLS, connection_manager, wvmConnect)
from vrtManager.connection import (
CONN_SOCKET,
CONN_SSH,
CONN_TCP,
CONN_TLS,
connection_manager,
wvmConnect,
)
from vrtManager.hostdetails import wvmHostDetails
from . import utils
@ -25,15 +30,17 @@ def computes(request):
:return:
"""
computes = Compute.objects.filter().order_by('name')
computes = Compute.objects.filter().order_by("name")
return render(request, 'computes/list.html', {'computes': computes})
return render(request, "computes/list.html", {"computes": computes})
@superuser_only
def overview(request, compute_id):
compute = get_object_or_404(Compute, pk=compute_id)
status = 'true' if connection_manager.host_is_up(compute.type, compute.hostname) is True else 'false'
status = (
"true" if connection_manager.host_is_up(compute.type, compute.hostname) is True else "false"
)
conn = wvmHostDetails(
compute.hostname,
@ -49,7 +56,7 @@ def overview(request, compute_id):
lib_version = conn.get_lib_version()
conn.close()
return render(request, 'overview.html', locals())
return render(request, "overview.html", locals())
@superuser_only
@ -57,9 +64,9 @@ def instances(request, compute_id):
compute = get_object_or_404(Compute, pk=compute_id)
utils.refresh_instance_database(compute)
instances = Instance.objects.filter(compute=compute).prefetch_related('userinstance_set')
instances = Instance.objects.filter(compute=compute).prefetch_related("userinstance_set")
return render(request, 'computes/instances.html', {'compute': compute, 'instances': instances})
return render(request, "computes/instances.html", {"compute": compute, "instances": instances})
@superuser_only
@ -67,9 +74,9 @@ def compute_create(request, FormClass):
form = FormClass(request.POST or None)
if form.is_valid():
form.save()
return redirect(reverse('computes'))
return redirect(reverse("computes"))
return render(request, 'computes/form.html', {'form': form})
return render(request, "computes/form.html", {"form": form})
@superuser_only
@ -88,22 +95,22 @@ def compute_update(request, compute_id):
form = FormClass(request.POST or None, instance=compute)
if form.is_valid():
form.save()
return redirect(reverse('computes'))
return redirect(reverse("computes"))
return render(request, 'computes/form.html', {'form': form})
return render(request, "computes/form.html", {"form": form})
@superuser_only
def compute_delete(request, compute_id):
compute = get_object_or_404(Compute, pk=compute_id)
if request.method == 'POST':
if request.method == "POST":
compute.delete()
return redirect('computes')
return redirect("computes")
return render(
request,
'common/confirm_delete.html',
{'object': compute},
"common/confirm_delete.html",
{"object": compute},
)
@ -126,17 +133,19 @@ def compute_graph(request, compute_id):
mem_usage = conn.get_memory_usage()
conn.close()
except libvirtError:
cpu_usage = {'usage': 0}
mem_usage = {'usage': 0}
cpu_usage = {"usage": 0}
mem_usage = {"usage": 0}
current_time = 0
data = json.dumps({
'cpudata': cpu_usage['usage'],
'memdata': mem_usage,
'timeline': current_time,
})
data = json.dumps(
{
"cpudata": cpu_usage["usage"],
"memdata": mem_usage,
"timeline": current_time,
}
)
response = HttpResponse()
response['Content-Type'] = "text/javascript"
response["Content-Type"] = "text/javascript"
response.write(data)
return response
@ -163,14 +172,14 @@ def get_compute_disk_buses(request, compute_id, arch, machine, disk):
disk_device_types = conn.get_disk_device_types(arch, machine)
if disk in disk_device_types:
if disk == 'disk':
data['bus'] = sorted(disk_device_types)
elif disk == 'cdrom':
data['bus'] = ['ide', 'sata', 'scsi']
elif disk == 'floppy':
data['bus'] = ['fdc']
elif disk == 'lun':
data['bus'] = ['scsi']
if disk == "disk":
data["bus"] = sorted(disk_device_types)
elif disk == "cdrom":
data["bus"] = ["ide", "sata", "scsi"]
elif disk == "floppy":
data["bus"] = ["fdc"]
elif disk == "lun":
data["bus"] = ["scsi"]
except libvirtError:
pass
@ -193,7 +202,7 @@ def get_compute_machine_types(request, compute_id, arch):
compute.password,
compute.type,
)
data['machines'] = conn.get_machine_types(arch)
data["machines"] = conn.get_machine_types(arch)
except libvirtError:
pass
@ -217,7 +226,7 @@ def get_compute_video_models(request, compute_id, arch, machine):
compute.password,
compute.type,
)
data['videos'] = conn.get_video_models(arch, machine)
data["videos"] = conn.get_video_models(arch, machine)
except libvirtError:
pass
@ -241,8 +250,8 @@ def get_dom_capabilities(request, compute_id, arch, machine):
compute.password,
compute.type,
)
data['videos'] = conn.get_disk_device_types(arch, machine)
data['bus'] = conn.get_disk_device_types(arch, machine)
data["videos"] = conn.get_disk_device_types(arch, machine)
data["bus"] = conn.get_disk_device_types(arch, machine)
except libvirtError:
pass