ge/python-compute
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix creating instances from ISO and existing volumes

Browse Source
This commit is contained in:
ge
2024-05-17 00:05:38 +03:00
parent 197e272f3e
commit 7289248925
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
compute/session.py
View File

@@ -17,6 +17,7 @@
import logging import logging
from contextlib import AbstractContextManager from contextlib import AbstractContextManager
from pathlib import Path
from types import TracebackType from types import TracebackType
from typing import Any, NamedTuple from typing import Any, NamedTuple
from uuid import uuid4 from uuid import uuid4
@@ -245,11 +246,17 @@ class Session(AbstractContextManager):
log.info('Volume %s is CDROM device', volume_name) log.info('Volume %s is CDROM device', volume_name)
elif volume.source is not None: elif volume.source is not None:
log.info('Using volume %s as source', volume_name) log.info('Using volume %s as source', volume_name)
volume_source = volume.source
if volume.capacity: if volume.capacity:
capacity = units.to_bytes( capacity = units.to_bytes(
volume.capacity.value, volume.capacity.unit volume.capacity.value, volume.capacity.unit
) )
log.info('Getting volume %s', volume.source)
vol = volumes_pool.get_volume(Path(volume_name).name)
log.info(
'Resize volume to specified size: %s',
capacity,
)
vol.resize(capacity, unit=units.DataUnit.BYTES)
else: else:
capacity = units.to_bytes( capacity = units.to_bytes(
volume.capacity.value, volume.capacity.unit volume.capacity.value, volume.capacity.unit
@@ -259,7 +266,7 @@ class Session(AbstractContextManager):
path=str(volumes_pool.path.joinpath(volume_name)), path=str(volumes_pool.path.joinpath(volume_name)),
capacity=capacity, capacity=capacity,
) )
volume_source = volume_config.path volume.source = volume_config.path
log.debug('Volume config: %s', volume_config) log.debug('Volume config: %s', volume_config)
if volume.is_system is True and data.image: if volume.is_system is True and data.image:
log.info( log.info(
@@ -269,21 +276,20 @@ class Session(AbstractContextManager):
image = images_pool.get_volume(data.image) image = images_pool.get_volume(data.image)
log.info('Cloning image into volumes pool...') log.info('Cloning image into volumes pool...')
vol = volumes_pool.clone_volume(image, volume_config) vol = volumes_pool.clone_volume(image, volume_config)
log.info(
'Resize cloned volume to specified size: %s',
capacity,
)
vol.resize(capacity, unit=units.DataUnit.BYTES)
else: else:
log.info('Create volume %s', volume_config.name) log.info('Create volume %s', volume_config.name)
volumes_pool.create_volume(volume_config) volumes_pool.create_volume(volume_config)
if capacity is not None:
log.info(
'Resize cloned volume to specified size: %s',
capacity,
)
vol.resize(capacity, unit=units.DataUnit.BYTES)
log.info('Attaching volume to instance...') log.info('Attaching volume to instance...')
instance.attach_device( instance.attach_device(
DiskConfig( DiskConfig(
type=volume.type, type=volume.type,
device=volume.device, device=volume.device,
source=volume_source, source=volume.source,
target=volume.target, target=volume.target,
is_readonly=volume.is_readonly, is_readonly=volume.is_readonly,
bus=volume.bus, bus=volume.bus,