Commit a0716fe1 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

CT-66: Restart command implementation.

parent 3511e6b2

csp-lmc-common/HISTORY

+3 −0
Original line number Diff line number Diff line 
0.6.6:

- Added Restart and Reset



0.6.5

- Implemented Abort command. 

- Use mutex to avoid Abort invkoking while the configuring thread is

csp-lmc-common/csp_lmc_common/CspSubarray.py

+5 −1
Original line number Diff line number Diff line
@@ -994,7 +994,11 @@ class CspSubarray(SKASubarray): 
                proxy = device._sc_subarray_proxies[fqdn]

                self.logger.info("device {} obstate is {}".format(fqdn, ObsState(device._sc_subarray_obs_state[fqdn]).name))

                self.logger.info("lne(device) {}".format(len(device)))

                if device._sc_subarray_obs_state[fqdn] == ObsState.IDLE or len(device):

                #if device._sc_subarray_obs_state[fqdn] == ObsState.IDLE or len(device):

                # Note: the RemoveAllREceptors can be invoked on the cbf subarray only if it is idle.

                # if it is in ABORTED or FAULT state, it's CBF subarray responsability to remove the

                # receptors before executing the Restart 

                if device._sc_subarray_obs_state[fqdn] == ObsState.IDLE:

                    if fqdn == device.CbfSubarray:

                        self.logger.info("Issue command RemoveAllReceptors")

                        proxy.command_inout_asynch("RemoveAllReceptors", device._cmd_ended_cb)

csp-lmc-common/csp_lmc_common/release.py

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
"""Release information for Python Package"""



name = """csp-lmc-common"""

version = "0.6.5"

version = "0.6.6"

version_info = version.split(".")

description = """SKA CSP.LMC Common Software"""

author = "INAF-OAA"

csp-lmc-common/docker/.release

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
"""Release information for Python Package"""



name = """csplmc-common"""

version = "0.6.5"

version = "0.6.6"

version_info = version.split(".")

description = """SKA CSP.LMC Common Classe"""

author = "E.G"
@@ -18,5 +18,5 @@ license = """BSD-3-Clause""" 
url = """www.tango-controls.org"""

copyright = """"""



release=0.6.5

tag=csp-lmc-common-0.6.5
 
release=0.6.6

tag=csp-lmc-common-0.6.6

csp-lmc-common/docker/mid-cbf-mcs.yml

+13 −13
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ services: 
      - .:/csplmc



  cbfmaster:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}cbfmaster

    depends_on:
@@ -53,7 +53,7 @@ services: 




  cbfsubarray01:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}cbfsubarray01

    depends_on:
@@ -75,7 +75,7 @@ services: 




  cbfsubarray02:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}cbfsubarray02

    depends_on:
@@ -97,7 +97,7 @@ services: 




  vcc001:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}vcc001

    depends_on:
@@ -118,7 +118,7 @@ services: 




  vcc002:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}vcc002

    depends_on:
@@ -139,7 +139,7 @@ services: 




  vcc003:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}vcc003

    depends_on:
@@ -160,7 +160,7 @@ services: 




  vcc004:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}vcc004

    depends_on:
@@ -181,7 +181,7 @@ services: 




  fsp01:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}fsp01

    depends_on:
@@ -197,7 +197,7 @@ services: 
      - rsyslog-cbf:rw



  fsp02:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}fsp02

    depends_on:
@@ -213,7 +213,7 @@ services: 
      - rsyslog-cbf:rw



  fsp03:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}fsp03

    depends_on:
@@ -230,7 +230,7 @@ services: 




  fsp04:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}fsp04

    depends_on:
@@ -247,7 +247,7 @@ services: 




  tmcspsubarrayleafnodetest:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}tmcspsubarrayleafnodetest

    depends_on:
@@ -264,7 +264,7 @@ services: 
      - rsyslog-cbf:rw



  tmcspsubarrayleafnodetest2:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.1-7ec0bbf

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.5-2e83f4c

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}tmcspsubarrayleafnodetest2

    depends_on: