Commit 248c634d authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

Integration with the last mid-cbf-mcs image (mid-cbf-mcs:0.4.5-2e83f4c).

parent c73c492d

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:0.4.4-bb69bb4

    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.4-bb69bb4

    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.4-bb69bb4

    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.4-bb69bb4

    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.4-bb69bb4

    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.4-bb69bb4

    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.4-bb69bb4

    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.4-bb69bb4

    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.4-bb69bb4

    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.4-bb69bb4

    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.4-bb69bb4

    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.4-bb69bb4

    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.4-bb69bb4

    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:

csp-lmc-mid/tests/MidCspSubarray_test.py

+2 −4
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ class TestCspSubarray(TestBase): 
                                        f"Wrong CSP Subarray obsState {self.midcsp_subarray01.obsState}")

        Poller(5, 0.2).check(prober_subarray_obstate)



    '''

    def test_AFTER_initialization(self):

        """

        Test for State after CSP startup.
@@ -177,6 +178,7 @@ class TestCspSubarray(TestBase): 
        Poller(4, 0.2).check(prober_subarray_state)

        prober_subarray_obsstate = Probe(self.midcsp_subarray01, "obsState", ObsState.EMPTY, f"CSP Subarray not EMPTY")

        Poller(4, 0.2).check(prober_subarray_obsstate)

    '''



    def test_subarray_state_AFTER_on_command_execution(self):
@@ -423,7 +425,6 @@ class TestCspSubarray(TestBase): 
                                           f"Wrong CSP Subarray obsState")

        Poller(10, 0.2).check(prober_obs_state)



    '''

    def test_abort_scan(self):

        """

        Test that a subarray is able to process the
@@ -444,7 +445,6 @@ class TestCspSubarray(TestBase): 
        prober_obs_state = Probe(self.midcsp_subarray01, 'obsState', ObsState.ABORTED,

                                           f"Wrong CSP Subarray obsState")

        Poller(10, 0.2).check(prober_obs_state)

    '''



    def test_invoke_configure_command_AFTER_gotoidle(self):

        self._configure_scan()
@@ -508,7 +508,6 @@ class TestCspSubarray(TestBase): 
        obs_state = self.midcsp_subarray01.obsState

        assert obs_state == ObsState.ABORTED



    '''

    def test_restart_AFTER_abort_with_subarray_idle(self):

        """

        CSP Subarray invoke a RESTART after fault with
@@ -541,7 +540,6 @@ class TestCspSubarray(TestBase): 
        self.midcsp_subarray01.Restart()

        prober_obs_state = Probe(self.midcsp_subarray01, "obsState", ObsState.EMPTY, f"CSP Subarray not EMPTY")

        Poller(4, 0.2).check(prober_obs_state)

    '''



    def test_restart_AFTER_fault_with_subarray_idle(self):

        """