shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-02-02 09:47:13 +03:00
Code Issues Releases Wiki Activity

Done migration of Publication of OpenStack to new generics

Browse Source
This commit is contained in:
Adolfo Gómez García 2024-06-17 00:46:57 +02:00
parent 1a33f3d6d5
commit 570c15be1b
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
2 changed files with 44 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/tests/services/openstack/test_serialization_publication.py
View File

@ -32,10 +32,12 @@ Author: Adolfo Gómez, dkmaster at dkmon dot com
""" """
import typing import typing
from tests.utils.test import UDSTestCase
from uds.core.environment import Environment from uds.core.environment import Environment
from uds.core import types as core_types
from uds.services.OpenStack import publication from uds.services.OpenStack import publication
from tests.utils.test import UDSTestCase
# We use commit/rollback # We use commit/rollback
@ -53,8 +55,8 @@ EXPECTED_OWN_FIELDS: typing.Final[set[str]] = {
'_name', '_name',
'_reason', '_reason',
'_vmid', '_vmid',
'_status', '_queue',
'_destroy_after', '_is_flagged_for_destroy',
} }
@ -66,8 +68,8 @@ class OpenStackPublicationSerializationTest(UDSTestCase):
self.assertEqual(instance._name, 'name') self.assertEqual(instance._name, 'name')
self.assertEqual(instance._reason, 'reason') self.assertEqual(instance._reason, 'reason')
self.assertEqual(instance._vmid, 'template_id') self.assertEqual(instance._vmid, 'template_id')
self.assertEqual(instance._status, 'state') self.assertEqual(instance._queue, [core_types.services.Operation.CREATE, core_types.services.Operation.FINISH])
self.assertTrue(instance._destroy_after) self.assertTrue(instance._is_flagged_for_destroy)
def test_marshaling(self) -> None: def test_marshaling(self) -> None:
environment = Environment.testing_environment() environment = Environment.testing_environment()

107
server/src/uds/services/OpenStack/publication.py
View File

@ -33,7 +33,7 @@ Author: Adolfo Gómez, dkmaster at dkmon dot com
import logging import logging
import typing import typing
from uds.core.services import Publication from uds.core.services.generics.dynamic.publication import DynamicPublication
from uds.core import types from uds.core import types
from uds.core.util import autoserializable from uds.core.util import autoserializable
@ -46,16 +46,23 @@ if typing.TYPE_CHECKING:
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class OpenStackLivePublication(Publication, autoserializable.AutoSerializable): class OpenStackLivePublication(DynamicPublication, autoserializable.AutoSerializable):
""" """
This class provides the publication of a oVirtLinkedService This class provides the publication of a oVirtLinkedService
""" """
_name = autoserializable.StringField(default='') # _name = autoserializable.StringField(default='')
_reason = autoserializable.StringField(default='') # _vmid = autoserializable.StringField(default='')
_vmid = autoserializable.StringField(default='') # _reason = autoserializable.StringField(default='')
_status = autoserializable.StringField(default='r') # _status = autoserializable.StringField(default='r')
_destroy_after = autoserializable.BoolField(default=False) # _destroy_after = autoserializable.BoolField(default=False)
# _name = autoserializable.StringField(default='')
# _vmid = autoserializable.StringField(default='')
# _queue = autoserializable.ListField[Operation]()
# _reason = autoserializable.StringField(default='')
# _is_flagged_for_destroy = autoserializable.BoolField(default=False)
# _name: str = '' # _name: str = ''
# _reason: str = '' # _reason: str = ''
@ -77,87 +84,47 @@ class OpenStackLivePublication(Publication, autoserializable.AutoSerializable):
vals = data.decode('utf8').split('\t') vals = data.decode('utf8').split('\t')
if vals[0] == 'v1': if vals[0] == 'v1':
(self._name, self._reason, self._vmid, self._status, destroy_after) = vals[1:] (self._name, self._reason, self._vmid, status, destroy_after) = vals[1:]
else: else:
raise Exception('Invalid data') raise Exception('Invalid data')
if status == openstack_types.SnapshotStatus.ERROR:
self._queue = [types.services.Operation.ERROR]
elif status == openstack_types.SnapshotStatus.AVAILABLE:
self._queue = [types.services.Operation.FINISH]
else:
self._queue = [types.services.Operation.CREATE, types.services.Operation.FINISH]
self._destroy_after = destroy_after == 'y' self._is_flagged_for_destroy = destroy_after == 'y'
self.mark_for_upgrade() # This will force remarshalling self.mark_for_upgrade() # This will force remarshalling
def publish(self) -> types.states.TaskState: def op_create(self) -> None:
""" """
Realizes the publication of the service Realizes the publication of the service
""" """
self._name = self.service().sanitized_name( self._name = self.service().sanitized_name(
'UDS-P-' + self.servicepool_name() + "-" + str(self.revision()) 'UDS-P-' + self.servicepool_name() + "-" + str(self.revision())
) )
self._reason = '' # No error, no reason for it
self._destroy_after = False
try: volume_snapshot_info = self.service().make_template(self._name)
res = self.service().make_template(self._name) logger.debug('Publication result: %s', volume_snapshot_info)
logger.debug('Publication result: %s', res) self._vmid = volume_snapshot_info.id # In fact is not an vmid, but the volume snapshot id, but this way we can use the same method for all publications
self._vmid = res.id if volume_snapshot_info.status == openstack_types.SnapshotStatus.ERROR:
self._status = res.status raise Exception('Error creating snapshot')
except Exception as e:
logger.exception('Got exception')
self._status = 'error'
self._reason = 'Got error {}'.format(e)
return types.states.TaskState.ERROR
return types.states.TaskState.RUNNING def op_create_checker(self) -> types.states.TaskState:
def check_state(self) -> types.states.TaskState:
""" """
Checks state of publication creation Checks state of publication creation
""" """
if self._status == openstack_types.SnapshotStatus.ERROR: status = self.service().get_template(self._vmid).status # For next check
return types.states.TaskState.ERROR if status == openstack_types.SnapshotStatus.AVAILABLE:
if self._status == openstack_types.SnapshotStatus.AVAILABLE:
return types.states.TaskState.FINISHED return types.states.TaskState.FINISHED
try: if status == openstack_types.SnapshotStatus.ERROR:
self._status = self.service().get_template(self._vmid).status # For next check raise Exception('Error creating snapshot')
if self._destroy_after and self._status == openstack_types.SnapshotStatus.AVAILABLE: return types.states.TaskState.RUNNING
self._destroy_after = False
return self.destroy()
return types.states.TaskState.RUNNING
except Exception as e:
self._status = 'error'
self._reason = str(e)
return types.states.TaskState.ERROR
def error_reason(self) -> str:
return self._reason
def destroy(self) -> types.states.TaskState:
# We do not do anything else to destroy this instance of publication
if self._status == 'error':
return types.states.TaskState.ERROR # Nothing to cancel
if self._status == 'creating':
self._destroy_after = True
return types.states.TaskState.RUNNING
try:
self.service().api.delete_snapshot(self._vmid)
except Exception as e:
self._status = 'error'
self._reason = str(e)
return types.states.TaskState.ERROR
return types.states.TaskState.FINISHED
def cancel(self) -> types.states.TaskState:
return self.destroy()
# Here ends the publication needed methods.
# Methods provided below are specific for this publication
# and will be used by user deployments that uses this kind of publication
def get_template_id(self) -> str: def get_template_id(self) -> str:
""" """