Commit 0ea04080 authored by Carlo Baffa's avatar Carlo Baffa
Browse files

Merge branch 'AT5-370' of gitlab.com:ska-telescope/csp-lmc-subelement into AT5-370

parents 7a3b70bb febf6d4c

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ linting: 
    - docker-executor

  stage: linting

  script:

    - cd docker

    - make lint

  when: always

  artifacts:

cspse/lmc/__init__.py

+1 −2
Original line number Diff line number Diff line 
__all__ = (

    "CspSubElementMaster",

    "CspSubElementSubarray"

    "CspSubElementMaster"

)



from .subelement_master import CspSubElementMaster

cspse/lmc/decorators.py

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ class IsCommandAllowed(object): 
            cmd_to_exec = f.__name__

            # the command input argument

            input_arg = args[1]

            device_list = input_arg

            #device_list = input_arg

            # Note: device list is a reference to args[1]: changing

            # device_list content, args[1] changes accordingly!

            num_of_devices = len(input_arg)

cspse/lmc/subelement_master.py

+8 −10
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ class CspSubElementMaster(SKAMaster): 
    **Properties:**



    - Device Property

        Racks

            - The list with the FQDNs of the sub-element racks devices.

            - Type:'DevVarStringArray'

    """

    # PROTECTED REGION ID(CspSubElementMaster.class_variable) ENABLED START #

    # PROTECTED REGION END #    //  CspSubElementMaster.class_variable
@@ -50,6 +53,10 @@ class CspSubElementMaster(SKAMaster): 
    # Device Properties

    # -----------------



    Racks = device_property(

        dtype='DevVarStringArray',

    )



    # ----------

    # Attributes

    # ----------
@@ -63,7 +70,7 @@ class CspSubElementMaster(SKAMaster): 
    onCmdFailure = attribute(

        dtype='DevBoolean',

        label="CBF command failure flag",

        polling_period=1000,

        #polling_period=1000,

        doc="Failure flag set when the On command fails with error(s).",

    )
@@ -76,7 +83,6 @@ class CspSubElementMaster(SKAMaster): 
    offCmdFailure = attribute(

        dtype='DevBoolean',

        label="Off execution failure flag",

        polling_period=1000,

        doc="Failure flag set when the Off command fails with error(s).",

    )
@@ -89,7 +95,6 @@ class CspSubElementMaster(SKAMaster): 
    standbyCmdFailure = attribute(

        dtype='DevBoolean',

        label="Standby execution failure message",

        polling_period=1000,

        doc="Failure flag set when the Standby command fails with error(s).",

    )
@@ -102,7 +107,6 @@ class CspSubElementMaster(SKAMaster): 
    adminMode = attribute(

        dtype=AdminMode,

        access=AttrWriteType.READ_WRITE,

        polling_period=1000,

        memorized=True,

        doc="The admin mode reported for this device. It may interpret the current device condition \nand condition of all managed devices to set this. Most possibly an aggregate attribute.",

    )
@@ -110,7 +114,6 @@ class CspSubElementMaster(SKAMaster): 
    onCommandProgress = attribute(

        dtype='DevUShort',

        label="Progress percentage for the On command",

        polling_period=3000,

        abs_change=10,

        max_value=100,

        min_value=0,
@@ -120,7 +123,6 @@ class CspSubElementMaster(SKAMaster): 
    offCommandProgress = attribute(

        dtype='DevUShort',

        label="Progress percentage for the Off command",

        polling_period=3000,

        abs_change=10,

        max_value=100,

        min_value=0,
@@ -130,7 +132,6 @@ class CspSubElementMaster(SKAMaster): 
    standbyCommandProgress = attribute(

        dtype='DevUShort',

        label="Progress percentage for the Standby command",

        polling_period=3000,

        abs_change=10,

        max_value=100,

        min_value=0,
@@ -200,21 +201,18 @@ class CspSubElementMaster(SKAMaster): 
    onCmdTimeoutExpired = attribute(

        dtype='DevBoolean',

        label="On execution timeout flag",

        polling_period=2000,

        doc="Signal the occurence of a timeout during the execution of the on command.",

    )



    offCmdTimeoutExpired = attribute(

        dtype='DevBoolean',

        label="Off execution timeout flag",

        polling_period=2000,

        doc="Signal the occurence of a timeout during the execution of the Off command.",

    )



    standbyCmdTimeoutExpired = attribute(

        dtype='DevBoolean',

        label="Standby execution timeout flag.",

        polling_period=2000,

        doc="Signal the occurence of a timeout during the execution of the Standby command.",

    )

docker-requirements.txt

+3 −1
Original line number Diff line number Diff line 
--extra-index-url https://nexus.engageska-portugal.pt/repository/pypi/simple

docutils

markupsafe

pygments
@@ -14,3 +15,4 @@ sphinx-rtd-theme 
sphinxcontrib-websupport

pipdeptree

pylint_junit

csp-lmc-common >= 0.5.3