Commit 5d2617fd 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 c2c1c5df

csp-lmc-mid/docker/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ endif 
	#docker pull $(DOCKER_REGISTRY_HOST)/$(DOCKER_REGISTRY_USER)/mid-cbf-mcs:latest

	$(DOCKER_COMPOSE_ARGS) docker-compose -f mid-csp-tangodb.yml up -d

	# put a sleep to wait TANGO DB 

	@sleep 10

	@sleep 20

	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) up -d 



piplock: build  ## overwrite Pipfile.lock with the image version

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

+8 −8
Original line number Diff line number Diff line
@@ -1127,11 +1127,11 @@ 
                            } 

                        }, 

                        "properties": {

			    "CspMasterAddress": [

		                "mid_csp/elt/master"

			    "CbfMasterAddress": [

		                "mid_csp-cbf/sub-elt/master"

			    ],

			    "CspSubarrayAddress": [

		                "mid_csp/elt/subarray_01"

			    "CbfSubarrayAddress": [

		                "mid_csp_cbf/sub-elt/subarray_01"

			    ],



                            "polled_attr": [
@@ -1158,11 +1158,11 @@ 
                            } 

                        }, 

                        "properties": {

			    "CspMasterAddress": [

		                "mid_csp/elt/master"

			    "CbfMasterAddress": [

		                "mid_csp_cbf/sub-elt/master"

			    ],

			    "CspSubarrayAddress": [

		                "mid_csp/elt/subarray_02"

			    "CbfSubarrayAddress": [

		                "mid_csp_cbf/sub-elt/subarray_02"

			    ],



                            "polled_attr": [

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

+2 −2
Original line number Diff line number Diff line
@@ -259,7 +259,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
@@ -276,7 +276,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