NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-16 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1856 from BrentBaccala/master

Browse Source 
Allow cloned QEMU disk images to be resized before the node starts
This commit is contained in:
Jeremy Grossmann 2021-01-10 16:57:10 +10:00 committed by GitHub
commit 0e6b97b27b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gns3server/compute/qemu/qemu_vm.py
View File

@ -1627,6 +1627,20 @@ class QemuVM(BaseNode):
log.info("{} returned with {}".format(self._get_qemu_img(), retcode)) log.info("{} returned with {}".format(self._get_qemu_img(), retcode))
return retcode return retcode
async def _create_linked_clone(self, disk_name, disk_image, disk):
try:
qemu_img_path = self._get_qemu_img()
command = [qemu_img_path, "create", "-o", "backing_file={}".format(disk_image), "-f", "qcow2", disk]
retcode = await self._qemu_img_exec(command)
if retcode:
stdout = self.read_qemu_img_stdout()
raise QemuError("Could not create '{}' disk image: qemu-img returned with {}\n{}".format(disk_name,
retcode,
stdout))
except (OSError, subprocess.SubprocessError) as e:
stdout = self.read_qemu_img_stdout()
raise QemuError("Could not create '{}' disk image: {}\n{}".format(disk_name, e, stdout))
async def _disk_options(self): async def _disk_options(self):
options = [] options = []
qemu_img_path = self._get_qemu_img() qemu_img_path = self._get_qemu_img()
@ -1669,17 +1683,7 @@ class QemuVM(BaseNode):
disk = os.path.join(self.working_dir, "{}_disk.qcow2".format(disk_name)) disk = os.path.join(self.working_dir, "{}_disk.qcow2".format(disk_name))
if not os.path.exists(disk): if not os.path.exists(disk):
# create the disk # create the disk
try: await self._create_linked_clone(disk_name, disk_image, disk)
command = [qemu_img_path, "create", "-o", "backing_file={}".format(disk_image), "-f", "qcow2", disk]
retcode = await self._qemu_img_exec(command)
if retcode:
stdout = self.read_qemu_img_stdout()
raise QemuError("Could not create '{}' disk image: qemu-img returned with {}\n{}".format(disk_name,
retcode,
stdout))
except (OSError, subprocess.SubprocessError) as e:
stdout = self.read_qemu_img_stdout()
raise QemuError("Could not create '{}' disk image: {}\n{}".format(disk_name, e, stdout))
else: else:
# The disk exists we check if the clone works # The disk exists we check if the clone works
try: try:
@ -1722,6 +1726,9 @@ class QemuVM(BaseNode):
if self.linked_clone: if self.linked_clone:
disk_image_path = os.path.join(self.working_dir, "{}_disk.qcow2".format(drive_name)) disk_image_path = os.path.join(self.working_dir, "{}_disk.qcow2".format(drive_name))
if not os.path.exists(disk_image_path):
disk_image = getattr(self, "_{}_disk_image".format(drive_name))
await self._create_linked_clone(drive_name, disk_image, disk_image_path)
else: else:
disk_image_path = getattr(self, "{}_disk_image".format(drive_name)) disk_image_path = getattr(self, "{}_disk_image".format(drive_name))