Skip to content
Snippets Groups Projects
Unverified Commit 102c157c authored by Drew Devereux's avatar Drew Devereux
Browse files

[MCCS-163] rename BaseDeviceStateMachine to DeviceStateMachine

parent f0f1bdf5
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,7 @@ implement further states. ...@@ -23,7 +23,7 @@ implement further states.
documentation, showing the state machine as designed documentation, showing the state machine as designed
.. figure:: images/BaseDeviceStateMachine.png .. figure:: images/DeviceStateMachine.png
:width: 80% :width: 80%
:alt: Diagram of the device state machine, automatically generated :alt: Diagram of the device state machine, automatically generated
from the state machine as specified in code. from the state machine as specified in code.
......
...@@ -38,7 +38,7 @@ from ska.base.control_model import ( ...@@ -38,7 +38,7 @@ from ska.base.control_model import (
LoggingLevel LoggingLevel
) )
from ska.base.faults import StateModelError from ska.base.faults import StateModelError
from ska.base.state_machine import BaseDeviceStateMachine from ska.base.state_machine import DeviceStateMachine
from ska.base.utils import get_groups_from_json, for_testing_only from ska.base.utils import get_groups_from_json, for_testing_only
from ska.base.faults import (GroupDefinitionsError, from ska.base.faults import (GroupDefinitionsError,
...@@ -339,7 +339,7 @@ class SKABaseDeviceStateModel: ...@@ -339,7 +339,7 @@ class SKABaseDeviceStateModel:
self._op_state_callback = op_state_callback self._op_state_callback = op_state_callback
self._admin_mode_callback = admin_mode_callback self._admin_mode_callback = admin_mode_callback
self._state_machine = BaseDeviceStateMachine( self._state_machine = DeviceStateMachine(
op_state_callback=self._update_op_state, op_state_callback=self._update_op_state,
admin_mode_callback=self._update_admin_mode admin_mode_callback=self._update_admin_mode
) )
......
...@@ -7,7 +7,7 @@ from tango import DevState ...@@ -7,7 +7,7 @@ from tango import DevState
from ska.base.control_model import AdminMode, ObsState from ska.base.control_model import AdminMode, ObsState
class BaseDeviceStateMachine(Machine): class DeviceStateMachine(Machine):
""" """
State machine for an SKA base device. State machine for an SKA base device.
Supports INIT, FAULT, DISABLED, STANDBY, OFF and ON states. Supports INIT, FAULT, DISABLED, STANDBY, OFF and ON states.
......
...@@ -3,14 +3,14 @@ This module contains the tests for the ska.base.state_machine module. ...@@ -3,14 +3,14 @@ This module contains the tests for the ska.base.state_machine module.
""" """
import pytest import pytest
from ska.base.state_machine import BaseDeviceStateMachine, ObservationStateMachine from ska.base.state_machine import DeviceStateMachine, ObservationStateMachine
from .conftest import load_data, TransitionsStateMachineTester from .conftest import load_data, TransitionsStateMachineTester
@pytest.mark.state_machine_tester(load_data("base_device_state_machine")) @pytest.mark.state_machine_tester(load_data("device_state_machine"))
class TestBaseDeviceStateMachine(TransitionsStateMachineTester): class TestDeviceStateMachine(TransitionsStateMachineTester):
""" """
This class contains the test for the BaseDeviceStateMachine class. This class contains the test for the DeviceStateMachine class.
""" """
@pytest.fixture @pytest.fixture
...@@ -18,7 +18,7 @@ class TestBaseDeviceStateMachine(TransitionsStateMachineTester): ...@@ -18,7 +18,7 @@ class TestBaseDeviceStateMachine(TransitionsStateMachineTester):
""" """
Fixture that returns the state machine under test in this class Fixture that returns the state machine under test in this class
""" """
yield BaseDeviceStateMachine() yield DeviceStateMachine()
@pytest.mark.state_machine_tester(load_data("observation_state_machine")) @pytest.mark.state_machine_tester(load_data("observation_state_machine"))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment