Skip to content
Snippets Groups Projects
Unverified Commit 3c610506 authored by SKAJohanVenter's avatar SKAJohanVenter
Browse files

SAR-276 Removed references to queue manager in base device

parent 2d711491
No related branches found
No related tags found
No related merge requests found
......@@ -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(
......
......@@ -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)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment