1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2025-07-31 12:41:08 +00:00

Add 'Adding, deleting and detaching disk volumes' to instances

This commit is contained in:
catborise 2018-10-19 16:14:33 +03:00
parent 8f5cc5755a
commit ea5e9cfead
4 changed files with 123 additions and 92 deletions

View file

@ -259,6 +259,7 @@ class wvmInstance(wvmConnect):
if device == 'disk':
try:
dev = disk.xpath('target/@dev')[0]
bus = disk.xpath('target/@bus')[0]
src_fl = disk.xpath('source/@file|source/@dev|source/@name|source/@volume')[0]
try:
disk_format = disk.xpath('driver/@type')[0]
@ -267,7 +268,9 @@ class wvmInstance(wvmConnect):
try:
vol = self.get_volume_by_path(src_fl)
volume = vol.name()
disk_size = vol.info()[1]
used_size = vol.info()[2]
stg = vol.storagePoolLookupByVolume()
storage = stg.name()
except libvirtError:
@ -276,8 +279,8 @@ class wvmInstance(wvmConnect):
pass
finally:
result.append(
{'dev': dev, 'image': volume, 'storage': storage, 'path': src_fl,
'format': disk_format, 'size': disk_size})
{'dev': dev, 'bus': bus, 'image': volume, 'storage': storage, 'path': src_fl,
'format': disk_format, 'size': disk_size, 'used': used_size})
return result
return util.get_xml_path(self._XMLDesc(0), func=disks)
@ -376,6 +379,25 @@ class wvmInstance(wvmConnect):
xmldom = ElementTree.tostring(tree)
self._defineXML(xmldom)
def detach_disk(self, dev, image):
tree = ElementTree.fromstring(self._XMLDesc(0))
for disk in tree.findall("./devices/disk[@device='disk']"):
source = disk.find("source")
target = disk.find("target")
if source.get("file") == image and target.get("dev") == dev:
devices = tree.find('devices')
devices.remove(disk)
if self.get_status() == 1:
xml_disk = ElementTree.tostring(disk)
yyy = self.instance.detachDevice(xml_disk)
xmldom = self._XMLDesc(VIR_DOMAIN_XML_SECURE)
if self.get_status() == 5:
xmldom = ElementTree.tostring(tree)
break
self._defineXML(xmldom)
def cpu_usage(self):
cpu_usage = {}
if self.get_status() == 1:
@ -628,7 +650,7 @@ class wvmInstance(wvmConnect):
iso.append(img)
return iso
def delete_disk(self):
def delete_all_disks(self):
disks = self.get_disk_device()
for disk in disks:
vol = self.get_volume_by_path(disk.get('path'))