From eb8aae957eed186b6103c4f1a489bacf54cf0dcc Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 23 Nov 2018 15:18:32 +0300 Subject: [PATCH] Bundle: Add/Delete Cdrom function added. Add disk device type/bus choice for custom instance creation. Change some cosmetics on create instance. Change some functions signature for compatibility. Add getting disk device types function. Fixed some bugs --- computes/urls.py | 3 +- computes/views.py | 31 +++++++- create/views.py | 45 +++++++++--- instances/templates/add_instance_volume.html | 4 +- instances/templates/instance.html | 74 +++++++++++-------- instances/views.py | 75 +++++++++++++------- vrtManager/create.py | 46 +++++++----- 7 files changed, 192 insertions(+), 86 deletions(-) diff --git a/computes/urls.py b/computes/urls.py index ec9ab5d..51276f6 100644 --- a/computes/urls.py +++ b/computes/urls.py @@ -4,7 +4,7 @@ from networks.views import networks, network from secrets.views import secrets from create.views import create_instance from interfaces.views import interfaces, interface -from computes.views import overview, compute_graph, computes +from computes.views import overview, compute_graph, computes, get_compute_disk_buses from instances.views import instances from nwfilters.views import nwfilter, nwfilters @@ -24,4 +24,5 @@ urlpatterns = [ url(r'^(?P[0-9]+)/nwfilter/(?P[\w\-\.\:]+)/$', nwfilter, name='nwfilter'), url(r'^(?P[0-9]+)/secrets/$', secrets, name='secrets'), url(r'^(?P[0-9]+)/create/$', create_instance, name='create_instance'), + url(r'^(?P[0-9]+)/disk/(?P[\w\-\.\/]+)/buses$', get_compute_disk_buses, name='buses'), ] diff --git a/computes/views.py b/computes/views.py index db3887c..245fdea 100644 --- a/computes/views.py +++ b/computes/views.py @@ -9,7 +9,7 @@ from instances.models import Instance from accounts.models import UserInstance from computes.forms import ComputeAddTcpForm, ComputeAddSshForm, ComputeEditHostForm, ComputeAddTlsForm, ComputeAddSocketForm from vrtManager.hostdetails import wvmHostDetails -from vrtManager.connection import CONN_SSH, CONN_TCP, CONN_TLS, CONN_SOCKET, connection_manager +from vrtManager.connection import CONN_SSH, CONN_TCP, CONN_TLS, CONN_SOCKET, connection_manager, wvmConnect from libvirt import libvirtError @@ -225,3 +225,32 @@ def compute_graph(request, compute_id): response.cookies['mem'] = datasets['mem'] response.write(data) return response + + +@login_required +def get_compute_disk_buses(request, compute_id, disk): + data = {} + compute = get_object_or_404(Compute, pk=compute_id) + try: + conn = wvmConnect(compute.hostname, + compute.login, + compute.password, + compute.type) + + disk_device_types = conn.get_disk_device_types() + disk_bus_types = conn.get_disk_bus_types() + + 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',] + except libvirtError: + pass + + return HttpResponse(json.dumps(data)) + diff --git a/create/views.py b/create/views.py index d514a22..9879d05 100644 --- a/create/views.py +++ b/create/views.py @@ -12,9 +12,11 @@ from vrtManager import util from libvirt import libvirtError from webvirtcloud.settings import QEMU_CONSOLE_LISTEN_ADDRESSES from webvirtcloud.settings import INSTANCE_VOLUME_DEFAULT_CACHE +from webvirtcloud.settings import INSTANCE_VOLUME_DEFAULT_BUS from django.contrib import messages from logs.views import addlogmsg + @login_required def create_instance(request, compute_id): """ @@ -48,6 +50,9 @@ def create_instance(request, compute_id): default_cache = INSTANCE_VOLUME_DEFAULT_CACHE listener_addr = QEMU_CONSOLE_LISTEN_ADDRESSES mac_auto = util.randomMAC() + disk_devices = conn.get_disk_device_types() + disk_buses = conn.get_disk_bus_types() + default_bus = INSTANCE_VOLUME_DEFAULT_BUS #get_images = sorted(conn.get_storages_images()) except libvirtError as lib_err: error_messages.append(lib_err) @@ -92,7 +97,9 @@ def create_instance(request, compute_id): except libvirtError as lib_err: error_messages.append(lib_err.message) if 'create' in request.POST: - volumes = {} + volume_list = [] + + clone_path = "" form = NewVMForm(request.POST) if form.is_valid(): data = form.cleaned_data @@ -113,7 +120,13 @@ def create_instance(request, compute_id): try: path = conn.create_volume(data['storage'], data['name'], data['hdd_size'], metadata=meta_prealloc) - volumes[path] = conn.get_volume_type(path) + volume = dict() + volume['path'] = path + volume['type'] = conn.get_volume_type(path) + volume['device'] = 'disk' + volume['bus'] = 'virtio' + volume_list.append(volume) + #volumes[path] = conn.get_volume_type(path) except libvirtError as lib_err: error_messages.append(lib_err.message) elif data['template']: @@ -124,16 +137,31 @@ def create_instance(request, compute_id): error_messages.append(error_msg) else: clone_path = conn.clone_from_template(data['name'], templ_path, metadata=meta_prealloc) - volumes[clone_path] = conn.get_volume_type(clone_path) + volume = dict() + volume['path'] = clone_path + volume['type'] = conn.get_volume_type(clone_path) + volume['device'] = 'disk' + volume['bus'] = 'virtio' + volume_list.append(volume) + #volumes[clone_path] = conn.get_volume_type(clone_path) else: if not data['images']: error_msg = _("First you need to create or select an image") error_messages.append(error_msg) else: - for vol in data['images'].split(','): + for idx, vol in enumerate(data['images'].split(',')): try: + path = conn.get_volume_path(vol) - volumes[path] = conn.get_volume_type(path) + volume = dict() + volume['path'] = path + volume['type'] = conn.get_volume_type(path) + volume['device'] = request.POST.get('device' + str(idx), '') + volume['bus'] = request.POST.get('bus' + str(idx), '') + volume_list.append(volume) + + #volumes[path] = conn.get_volume_type(path) + except libvirtError as lib_err: error_messages.append(lib_err.message) if data['cache_mode'] not in conn.get_cache_modes(): @@ -143,7 +171,7 @@ def create_instance(request, compute_id): uuid = util.randomUUID() try: conn.create_instance(data['name'], data['memory'], data['vcpu'], data['host_model'], - uuid, volumes, data['cache_mode'], data['networks'], data['virtio'], + uuid, volume_list, data['cache_mode'], data['networks'], data['virtio'], data["listener_addr"], data["nwfilter"], data["video"], data["console_pass"], data['mac']) create_instance = Instance(compute_id=compute_id, name=data['name'], uuid=uuid) @@ -153,8 +181,9 @@ def create_instance(request, compute_id): addlogmsg(request.user.username, create_instance.name, msg) return HttpResponseRedirect(reverse('instance', args=[compute_id, data['name']])) except libvirtError as lib_err: - if data['hdd_size'] or volumes[clone_path]: - conn.delete_volume(volumes.keys()[0]) + if data['hdd_size'] or volume_list.count() > 0: + for vol in volume_list: + conn.delete_volume(vol['path']) error_messages.append(lib_err) conn.close() return render(request, 'create_instance.html', locals()) diff --git a/instances/templates/add_instance_volume.html b/instances/templates/add_instance_volume.html index dfb4c0f..9cea2fc 100644 --- a/instances/templates/add_instance_volume.html +++ b/instances/templates/add_instance_volume.html @@ -85,7 +85,7 @@
{% ifequal status 5 %} - + {% else %} {% endifequal %} @@ -143,7 +143,7 @@
{% ifequal status 5 %} - + {% else %} {% endifequal %} diff --git a/instances/templates/instance.html b/instances/templates/instance.html index a20e9ff..67eb21c 100644 --- a/instances/templates/instance.html +++ b/instances/templates/instance.html @@ -594,10 +594,30 @@
+ {% if request.user.is_superuser and status == 5 %} +
{% csrf_token %} +
+
+ +
+
+
+ {% endif %} {% for cd in media %}
{% csrf_token %}
- + + {% trans "CDROM" %} {{ forloop.counter }} + {% if not cd.image %}
@@ -677,18 +700,20 @@ {% csrf_token %} + + {% ifequal status 5 %} - - {% else %} - - {% endifequal %} @@ -1243,13 +1268,20 @@ {% block script %} diff --git a/instances/views.py b/instances/views.py index 979fd01..1b0932b 100644 --- a/instances/views.py +++ b/instances/views.py @@ -197,12 +197,18 @@ def instance(request, compute_id, vname): def get_new_disk_dev(disks, bus): if bus == "virtio": dev_base = "vd" + elif bus == "ide": + dev_base = "hd" + elif bus == "fdc": + dev_base = "fd" else: dev_base = "sd" - existing_devs = [disk['dev'] for disk in disks] + existing_disk_devs = [disk['dev'] for disk in disks] + # cd-rom bus could be virtio/sata, because of that we should check it also + existing_media_devs = [disk['dev'] for disk in media] for l in string.lowercase: dev = dev_base + l - if dev not in existing_devs: + if dev not in existing_disk_devs and dev not in existing_media_devs: return dev raise Exception(_('None available device name')) @@ -290,7 +296,7 @@ def instance(request, compute_id, vname): default_owner = settings.INSTANCE_VOLUME_DEFAULT_OWNER formats = conn.get_image_formats() - busses = conn.get_busses() + busses = conn.get_disk_bus_types() default_bus = settings.INSTANCE_VOLUME_DEFAULT_BUS show_access_root_password = settings.SHOW_ACCESS_ROOT_PASSWORD show_access_ssh_keys = settings.SHOW_ACCESS_SSH_KEYS @@ -445,7 +451,7 @@ def instance(request, compute_id, vname): addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#resize') - if 'addnewvol' in request.POST and allow_admin_or_not_template: + if 'add_new_vol' in request.POST and allow_admin_or_not_template: connCreate = wvmCreate(compute.hostname, compute.login, compute.password, @@ -461,11 +467,11 @@ def instance(request, compute_id, vname): path = connCreate.create_volume(storage, name, size, format, meta_prealloc, default_owner) conn.attach_disk(path, target, subdriver=format, cache=cache, targetbus=bus) - msg = _('Attach new disk') + msg = _('Attach new disk: ' + target) addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#disks') - if 'addexistingvol' in request.POST and allow_admin_or_not_template: + if 'add_existing_vol' in request.POST and allow_admin_or_not_template: storage = request.POST.get('selected_storage', '') name = request.POST.get('vols', '') bus = request.POST.get('bus', default_bus) @@ -483,42 +489,57 @@ def instance(request, compute_id, vname): source = path + "/" + name; conn.attach_disk(source, target, subdriver=format, cache=cache, targetbus=bus) - msg = _('Attach Existing disk') + msg = _('Attach Existing disk: ' + target) addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#disks') - if 'delvolume' in request.POST and allow_admin_or_not_template: - connDelete = wvmCreate(compute.hostname, - compute.login, - compute.password, - compute.type) + if 'delete_vol' in request.POST and allow_admin_or_not_template: + storage = request.POST.get('storage', '') + connDelete = wvmStorage(compute.hostname, + compute.login, + compute.password, + compute.type, + storage) dev = request.POST.get('dev', '') path = request.POST.get('path', '') + name = request.POST.get('name', '') - conn.detach_disk(dev, path) - connDelete.delete_volume(path) + conn.detach_disk(dev) + connDelete.del_volume(name) - msg = _('Delete disk') + msg = _('Delete disk: ' + dev) addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#disks') - if 'detachvolume' in request.POST and allow_admin_or_not_template: - connDelete = wvmCreate(compute.hostname, - compute.login, - compute.password, - compute.type) - dev = request.POST.get('dev', '') + if 'detach_vol' in request.POST and allow_admin_or_not_template: + dev = request.POST.get('detach_vol', '') path = request.POST.get('path', '') - conn.detach_disk(dev, path) - msg = _('Detach disk') + conn.detach_disk(dev) + msg = _('Detach disk: ' + dev) addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#disks') + if 'add_cdrom' in request.POST and allow_admin_or_not_template: + bus = request.POST.get('bus', 'ide') + target = get_new_disk_dev(media, bus) + conn.attach_disk("", target, device='cdrom', cache='none', targetbus=bus) + msg = _('Add CD-Rom: ' + target) + addlogmsg(request.user.username, instance.name, msg) + return HttpResponseRedirect(request.get_full_path() + '#media') + + if 'detach_cdrom' in request.POST and allow_admin_or_not_template: + dev = request.POST.get('detach_cdrom', '') + path = request.POST.get('path', '') + conn.detach_disk(dev) + msg = _('Detach CD-Rom: ' + dev) + addlogmsg(request.user.username, instance.name, msg) + return HttpResponseRedirect(request.get_full_path() + '#media') + if 'umount_iso' in request.POST and allow_admin_or_not_template: image = request.POST.get('path', '') dev = request.POST.get('umount_iso', '') conn.umount_iso(dev, image) - msg = _("Mount media") + msg = _("Mount media: " + dev) addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#media') @@ -526,21 +547,21 @@ def instance(request, compute_id, vname): image = request.POST.get('media', '') dev = request.POST.get('mount_iso', '') conn.mount_iso(dev, image) - msg = _("Umount media") + msg = _("Umount media: " + dev) addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#media') if 'snapshot' in request.POST and allow_admin_or_not_template: name = request.POST.get('name', '') conn.create_snapshot(name) - msg = _("New snapshot") + msg = _("New snapshot :" + name) addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#managesnapshot') if 'delete_snapshot' in request.POST and allow_admin_or_not_template: snap_name = request.POST.get('name', '') conn.snapshot_delete(snap_name) - msg = _("Delete snapshot") + msg = _("Delete snapshot :" + snap_name) addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#managesnapshot') diff --git a/vrtManager/create.py b/vrtManager/create.py index e4199d9..0431194 100644 --- a/vrtManager/create.py +++ b/vrtManager/create.py @@ -93,7 +93,7 @@ class wvmCreate(wvmConnect): def get_volume_type(self, path): vol = self.get_volume_by_path(path) vol_type = util.get_xml_path(vol.XMLDesc(0), "/volume/target/format/@type") - if vol_type == 'unknown': + if vol_type == 'unknown' or vol_type == 'iso': return 'raw' if vol_type: return vol_type @@ -189,11 +189,18 @@ class wvmCreate(wvmConnect): restart """ - disk_letters = list(string.lowercase) - for image, img_type in images.items(): - stg = self.get_storage_by_vol_path(image) + vd_disk_letters = list(string.lowercase) + fd_disk_letters = list(string.lowercase) + hd_disk_letters = list(string.lowercase) + sd_disk_letters = list(string.lowercase) + add_cd = True + #for image, img_type in images.items(): + for volume in images: + stg = self.get_storage_by_vol_path(volume['path']) stg_type = util.get_xml_path(stg.XMLDesc(0), "/pool/@type") + if volume['device'] == 'cdrom': add_cd = False + if stg_type == 'rbd': ceph_user, secret_uuid, ceph_hosts = get_rbd_storage_data(stg) xml += """ @@ -201,7 +208,7 @@ class wvmCreate(wvmConnect): - """ % (img_type, cache_mode, ceph_user, secret_uuid, image) + """ % (volume['type'], cache_mode, ceph_user, secret_uuid, volume['path']) if isinstance(ceph_hosts, list): for host in ceph_hosts: if host.get('port'): @@ -213,23 +220,26 @@ class wvmCreate(wvmConnect): xml += """ """ else: - xml += """ + xml += """ - """ % (img_type, cache_mode, image) + """ % (volume['device'], volume['type'], cache_mode, volume['path']) - if virtio: - xml += """""" % (disk_letters.pop(0),) + if volume['bus'] == 'virtio': + xml += """""" % (vd_disk_letters.pop(0), volume['bus']) + elif volume['bus'] == 'ide': + xml += """""" % (hd_disk_letters.pop(0), volume['bus']) + elif volume['bus'] == 'fdc': + xml += """""" % (fd_disk_letters.pop(0), volume['bus']) else: - xml += """""" % (disk_letters.pop(0),) + xml += """""" % (sd_disk_letters.pop(0), volume['bus']) xml += """""" - - xml += """ - - - - -
- """ + if add_cd: + xml += """ + + + + + """ % (hd_disk_letters.pop(0),) for net in networks.split(','): xml += """""" if mac: