mirror of
				https://github.com/retspen/webvirtcloud
				synced 2025-07-31 12:41:08 +00:00 
			
		
		
		
	lint with black python. convert f style strings to old one. some small fixes
This commit is contained in:
		
							parent
							
								
									c20c353a40
								
							
						
					
					
						commit
						508e3609be
					
				
					 54 changed files with 2123 additions and 1824 deletions
				
			
		| 
						 | 
				
			
			@ -1,4 +1,5 @@
 | 
			
		|||
from django.urls import path
 | 
			
		||||
 | 
			
		||||
from . import views
 | 
			
		||||
 | 
			
		||||
urlpatterns = [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,14 +1,16 @@
 | 
			
		|||
import json
 | 
			
		||||
import socket
 | 
			
		||||
 | 
			
		||||
from django.shortcuts import render, get_object_or_404
 | 
			
		||||
from django.http import HttpResponse, Http404
 | 
			
		||||
from libvirt import libvirtError
 | 
			
		||||
 | 
			
		||||
from accounts.models import UserInstance, UserSSHKey
 | 
			
		||||
from computes.models import Compute
 | 
			
		||||
from vrtManager.instance import wvmInstance
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
OS_VERSIONS = ['latest', '']
 | 
			
		||||
OS_VERSIONS = ["latest", ""]
 | 
			
		||||
OS_UUID = "iid-dswebvirtcloud"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -17,7 +19,7 @@ def os_index(request):
 | 
			
		|||
    :param request:
 | 
			
		||||
    :return:
 | 
			
		||||
    """
 | 
			
		||||
    response = '\n'.join(OS_VERSIONS)
 | 
			
		||||
    response = "\n".join(OS_VERSIONS)
 | 
			
		||||
    return HttpResponse(response)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -28,13 +30,13 @@ def os_metadata_json(request, version):
 | 
			
		|||
    :return:
 | 
			
		||||
    """
 | 
			
		||||
 | 
			
		||||
    if version == 'latest':
 | 
			
		||||
    if version == "latest":
 | 
			
		||||
        ip = get_client_ip(request)
 | 
			
		||||
        hostname = get_hostname_by_ip(ip)
 | 
			
		||||
        response = {'uuid': OS_UUID, 'hostname': hostname}
 | 
			
		||||
        response = {"uuid": OS_UUID, "hostname": hostname}
 | 
			
		||||
        return HttpResponse(json.dumps(response))
 | 
			
		||||
    else:
 | 
			
		||||
        err = f"Invalid version: {version}"
 | 
			
		||||
        err = "Invalid version: %(version)s" % {"version": version}
 | 
			
		||||
        raise Http404(err)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -44,10 +46,10 @@ def os_userdata(request, version):
 | 
			
		|||
    :param version:
 | 
			
		||||
    :return:
 | 
			
		||||
    """
 | 
			
		||||
    if version == 'latest':
 | 
			
		||||
    if version == "latest":
 | 
			
		||||
        ip = get_client_ip(request)
 | 
			
		||||
        hostname = get_hostname_by_ip(ip)
 | 
			
		||||
        vname = hostname.split('.')[0]
 | 
			
		||||
        vname = hostname.split(".")[0]
 | 
			
		||||
 | 
			
		||||
        instance_keys = []
 | 
			
		||||
        userinstances = UserInstance.objects.filter(instance__name=vname)
 | 
			
		||||
| 
						 | 
				
			
			@ -57,9 +59,9 @@ def os_userdata(request, version):
 | 
			
		|||
            for k in keys:
 | 
			
		||||
                instance_keys.append(k.keypublic)
 | 
			
		||||
 | 
			
		||||
        return render(request, 'user_data', locals())
 | 
			
		||||
        return render(request, "user_data", locals())
 | 
			
		||||
    else:
 | 
			
		||||
        err = f"Invalid version: {version}"
 | 
			
		||||
        err = "Invalid version: %(version)s" % {"version": version}
 | 
			
		||||
        raise Http404(err)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -68,11 +70,11 @@ def get_client_ip(request):
 | 
			
		|||
    :param request:
 | 
			
		||||
    :return:
 | 
			
		||||
    """
 | 
			
		||||
    x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
 | 
			
		||||
    x_forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR")
 | 
			
		||||
    if x_forwarded_for:
 | 
			
		||||
        ip = x_forwarded_for.split(',')[-1].strip()
 | 
			
		||||
        ip = x_forwarded_for.split(",")[-1].strip()
 | 
			
		||||
    else:
 | 
			
		||||
        ip = request.META.get('REMOTE_ADDR')
 | 
			
		||||
        ip = request.META.get("REMOTE_ADDR")
 | 
			
		||||
    return ip
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -97,16 +99,12 @@ def get_vdi_url(request, compute_id, vname):
 | 
			
		|||
    compute = get_object_or_404(Compute, pk=compute_id)
 | 
			
		||||
 | 
			
		||||
    try:
 | 
			
		||||
        conn = wvmInstance(compute.hostname,
 | 
			
		||||
                           compute.login,
 | 
			
		||||
                           compute.password,
 | 
			
		||||
                           compute.type,
 | 
			
		||||
                           vname)
 | 
			
		||||
        conn = wvmInstance(compute.hostname, compute.login, compute.password, compute.type, vname)
 | 
			
		||||
 | 
			
		||||
        fqdn = get_hostname_by_ip(compute.hostname)
 | 
			
		||||
        url = f"{conn.get_console_type()}://{fqdn}:{conn.get_console_port()}"
 | 
			
		||||
        response = url
 | 
			
		||||
        return HttpResponse(response)
 | 
			
		||||
    except libvirtError:
 | 
			
		||||
        err = f"Error getting VDI URL for {vname}"
 | 
			
		||||
        err = "Error getting VDI URL for %(name)s" % {"name": vname}
 | 
			
		||||
        raise Http404(err)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue