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

AT5-382: Updated dsconfig and docker-compose configuration files to reflect 

the decoupling of the mid-cbf-mcs and csp-lmc devices during test execution
(TmCspSubarrayLeafNode does no more subscribes on the CspSubarray
forwarded attribute outputLink but directly to the CbfSubarray
attribute outputLinksDistribution)
parent 4b6cacd8

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

+2 −2
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ services: 
      - TANGO_HOST=${TANGO_HOST}

    command: >

      sh -c "wait-for-it.sh ${TANGO_HOST} --timeout=60 --strict --

             retry --max=10 -- tango_admin --ping-device mid_csp/elt/subarray_01 &&

             retry --max=10 -- tango_admin --ping-device mid_csp_cbf/sub-elt/subarray_01 &&

             /venv/bin/python /app/tangods/TmCspSubarrayLeafNodeTest/TmCspSubarrayLeafNodeTest.py tm"

    volumes_from:

      - rsyslog-cbf:rw
@@ -275,7 +275,7 @@ services: 
      - TANGO_HOST=${TANGO_HOST}

    command: >

      sh -c "wait-for-it.sh ${TANGO_HOST} --timeout=60 --strict --

             retry --max=10 -- tango_admin --ping-device mid_csp/elt/subarray_02 &&

             retry --max=10 -- tango_admin --ping-device mid_csp_cbf/sub-elt/subarray_02 &&

             /venv/bin/python /app/tangods/TmCspSubarrayLeafNodeTest/TmCspSubarrayLeafNodeTest.py tm2"

    volumes_from:

      - rsyslog-cbf:rw

csp-lmc-mid/docker/config/midcbf_dsconfig.json

+59 −2
Original line number Diff line number Diff line
@@ -138,6 +138,9 @@ 
                            "SW2Address": [

                                "mid_csp_cbf/sw2/01"

                            ],

                            "PssConfigAddress": [

                                "mid_csp_cbf/pssconfig/01"

                            ],

                            "SubID": [

                                "1"

                            ],
@@ -177,6 +180,36 @@ 
                "SearchWindow": {

                    "mid_csp_cbf/sw1/01": {}, 

                    "mid_csp_cbf/sw2/01": {}

                },

                "CbfSubarrayPssConfig": {

                    "mid_csp_cbf/pssConfig/01": {

                        "properties": {

                            "FSP": [

                                "mid_csp_cbf/fsp/01",

                                "mid_csp_cbf/fsp/02",

                                "mid_csp_cbf/fsp/03",

                                "mid_csp_cbf/fsp/04"

                            ],

                            "FspSubarray": [

                                "mid_csp_cbf/fspSubarray/01_02",

                                "mid_csp_cbf/fspSubarray/02_02",

                                "mid_csp_cbf/fspSubarray/03_02",

                                "mid_csp_cbf/fspSubarray/04_02"

                            ],

                            "CbfMasterAddress": [

                                "mid_csp_cbf/sub_elt/master"

                            ]

                        }

                    }

                },

                "SendConfig": {

                    "mid_csp_cbf/SendConfig/01": {

                        "properties": {

                            "SubarrayAddress": [

                                "mid_csp_cbf/sub_elt/subarray_01"

                            ]

                        }

                    }

                }

            }, 

            "cbfSubarray-02": {
@@ -230,6 +263,9 @@ 
                            "SW2Address": [

                                "mid_csp_cbf/sw2/02"

                            ],

                            "PssConfigAddress": [

                                "mid_csp_cbf/pssconfig/02"

                            ],

                            "SubID": [

                                "2"

                            ],
@@ -269,6 +305,27 @@ 
                "SearchWindow": {

                    "mid_csp_cbf/sw1/02": {}, 

                    "mid_csp_cbf/sw2/02": {}

                },

                "CbfSubarrayPssConfig": {

                    "mid_csp_cbf/pssConfig/02": {

                        "properties": {

                            "FSP": [

                                "mid_csp_cbf/fsp/01",

                                "mid_csp_cbf/fsp/02",

                                "mid_csp_cbf/fsp/03",

                                "mid_csp_cbf/fsp/04"

                            ],

                            "FspSubarray": [

                                "mid_csp_cbf/fspSubarray/01_02",

                                "mid_csp_cbf/fspSubarray/02_02",

                                "mid_csp_cbf/fspSubarray/03_02",

                                "mid_csp_cbf/fspSubarray/04_02"

                            ],

                            "CbfMasterAddress": [

                                "mid_csp_cbf/sub_elt/master"

                            ]

                        }

                    }

                }

            }

        },

csp-lmc-mid/docker/config/midcsplmc_dsconfig.json

+579 −952

File changed.

Preview size limit exceeded, changes collapsed.

csp-lmc-mid/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:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    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:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    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:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    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:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    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:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    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:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    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:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    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:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    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:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    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:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    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:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    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:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}tmcspsubarrayleafnodetest

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



  tmcspsubarrayleafnodetest2:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:0.4.0

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}tmcspsubarrayleafnodetest2

    depends_on: