shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-22 13:34:04 +03:00
Code Issues Releases Wiki Activity

Restored removed methd by mistake

Browse Source
This commit is contained in:
Adolfo Gómez García 2024-03-18 19:52:03 +01:00
parent 4835035156
commit 42556d9e33
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/uds/core/services/specializations/dynamic_machine/dynamic_userservice.py
View File

@ -316,25 +316,26 @@ class DynamicUserService(services.UserService, autoserializable.AutoSerializable
""" """
This method is called when the service is shutdown This method is called when the service is shutdown
""" """
pass self.op_stop() # By default, shutdown is a stop
def op_shutdown_completed(self) -> None: def op_shutdown_completed(self) -> None:
""" """
This method is called when the service shutdown is completed This method is called when the service shutdown is completed
""" """
pass self.op_stop_completed()
def op_suspend(self) -> None: def op_suspend(self) -> None:
""" """
This method is called when the service is suspended This method is called when the service is suspended
""" """
pass # Note that by default suspend is "shutdown" and not "stop" because we
self.op_shutdown()
def op_suspend_completed(self) -> None: def op_suspend_completed(self) -> None:
""" """
This method is called when the service suspension is completed This method is called when the service suspension is completed
""" """
pass self.op_shutdown_completed()
def op_remove(self) -> None: def op_remove(self) -> None:
""" """

13
server/src/uds/core/services/specializations/fixed_machine/fixed_userservice.py
View File

@ -196,6 +196,12 @@ class FixedUserService(services.UserService, autoserializable.AutoSerializable,
self._queue = self._create_queue.copy() self._queue = self._create_queue.copy()
return self._execute_queue() return self._execute_queue()
@typing.final
def assign(self, vmid: str) -> types.states.TaskState:
logger.debug('Assigning from VM {}'.format(vmid))
self._vmid = vmid
self._queue = FixedUserService._assign_queue.copy() # copy is needed to avoid modifying class var
return self._execute_queue()
@typing.final @typing.final
def _execute_queue(self) -> types.states.TaskState: def _execute_queue(self) -> types.states.TaskState:
@ -210,7 +216,7 @@ class FixedUserService(services.UserService, autoserializable.AutoSerializable,
try: try:
operation_runner = _EXEC_FNCS[op] operation_runner = _EXEC_FNCS[op]
# Invoke using instance, we have overrided methods # Invoke using instance, we have overrided methods
# and we want to use the overrided ones # and we want to use the overrided ones
getattr(self, operation_runner.__name__)() getattr(self, operation_runner.__name__)()
@ -371,7 +377,6 @@ class FixedUserService(services.UserService, autoserializable.AutoSerializable,
try: try:
check_function = _CHECK_FNCS[op] check_function = _CHECK_FNCS[op]
# Invoke using instance, we have overrided methods # Invoke using instance, we have overrided methods
# and we want to use the overrided ones # and we want to use the overrided ones
state = typing.cast(types.states.TaskState, getattr(self, check_function.__name__)()) state = typing.cast(types.states.TaskState, getattr(self, check_function.__name__)())
@ -465,7 +470,9 @@ class FixedUserService(services.UserService, autoserializable.AutoSerializable,
# Operations, duwe to the fact that can be overrided some of them, must be invoked via instance # Operations, duwe to the fact that can be overrided some of them, must be invoked via instance
# We use __name__ later to use them, so we can use type checking and invoke them via instance instead of class # We use __name__ later to use them, so we can use type checking and invoke them via instance instead of class
# Note that ERROR and FINISH are not here, as they final states not needing to be executed # Note that ERROR and FINISH are not here, as they final states not needing to be executed
_EXEC_FNCS: typing.Final[collections.abc.Mapping[Operation, collections.abc.Callable[[FixedUserService], None]]] = { _EXEC_FNCS: typing.Final[
collections.abc.Mapping[Operation, collections.abc.Callable[[FixedUserService], None]]
] = {
Operation.CREATE: FixedUserService._create, Operation.CREATE: FixedUserService._create,
Operation.RETRY: FixedUserService._retry, Operation.RETRY: FixedUserService._retry,
Operation.START: FixedUserService.start_machine, Operation.START: FixedUserService.start_machine,