Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
lmc-base-classes
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
LOFAR2.0
lmc-base-classes
Commits
3c610506
Unverified
Commit
3c610506
authored
3 years ago
by
SKAJohanVenter
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/ska_tango_base/base/base_device.py
+3
-3
3 additions, 3 deletions
src/ska_tango_base/base/base_device.py
src/ska_tango_base/base/component_manager.py
+9
-1
9 additions, 1 deletion
src/ska_tango_base/base/component_manager.py
with
12 additions
and
4 deletions
src/ska_tango_base/base/base_device.py
+
3
−
3
View file @
3c610506
...
...
@@ -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
(
...
...
This diff is collapsed.
Click to expand it.
src/ska_tango_base/base/component_manager.py
+
9
−
1
View file @
3c610506
...
...
@@ -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
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment