diff --git a/src/ska_tango_base/base/base_device.py b/src/ska_tango_base/base/base_device.py index 2c7f624a03cef40d71e83e50d08e15cebb1ee203..b715eb2366defe53e5e4b758418d69c944fae6ef 100644 --- a/src/ska_tango_base/base/base_device.py +++ b/src/ska_tango_base/base/base_device.py @@ -1134,7 +1134,7 @@ class SKABaseDevice(Device): :return: unique ids for the enqueued commands """ - return self.component_manager.queue_manager.task_ids_in_queue + return self.component_manager.task_ids_in_queue def read_longRunningCommandStatus(self): # PROTECTED REGION ID(SKABaseDevice.longRunningCommandStatus_read) ENABLED START # @@ -1498,7 +1498,7 @@ class SKABaseDevice(Device): Abort the currently executing LRC and remove all enqueued LRCs. """ - self.target.queue_manager.abort_tasks() + self.target.abort_tasks() return (ResultCode.OK, "Aborting") @command( @@ -1540,7 +1540,7 @@ class SKABaseDevice(Device): :rtype: tuple (ResultCode.OK, TaskState) """ - result = self.target.queue_manager.get_task_state(argin) + result = self.target.get_task_state(argin) return (ResultCode.OK, f"{result}") @command( diff --git a/src/ska_tango_base/base/component_manager.py b/src/ska_tango_base/base/component_manager.py index 18a87e6fee7694bbb320da92ce3102d2e123f874..c41243fc5aa2f89e59d911007762d1c7b35f533a 100644 --- a/src/ska_tango_base/base/component_manager.py +++ b/src/ska_tango_base/base/component_manager.py @@ -28,7 +28,7 @@ from typing import Any, Optional, Tuple from ska_tango_base.commands import BaseCommand, ResultCode from ska_tango_base.control_model import PowerMode -from ska_tango_base.base.task_queue_manager import QueueManager +from ska_tango_base.base.task_queue_manager import QueueManager, TaskState class BaseComponentManager: @@ -235,3 +235,11 @@ class BaseComponentManager: :rtype: tuple """ return self.queue_manager.enqueue_task(task, argin=argin) + + def abort_tasks(self) -> None: + """Start aborting tasks on the queue.""" + self.queue_manager.abort_tasks() + + def get_task_state(self, unique_id: str) -> TaskState: + """Attempt to get state of QueueTask.""" + return self.queue_manager.get_task_state(unique_id)