Commit b595ec7d authored by Gianluca Marotta's avatar Gianluca Marotta
Browse files

CT-214 fixed cspsubarray_unit_test.py, MidCspSubarray_test.py, MidCspSubarrayBase.py

parent 36a1560d

csp-lmc-common/tests/unit/cspsubarray_unit_test.py

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ def test_cspsubarray_transaction_id_in_log(capsys): 
        pss_subarray_device_proxy_mock.On.side_effect = return_ok

        tango_context.device.On()

        assert tango_context.device.State() == DevState.ON

        tango_context.device.AssignResources('{"example":"band"}')

        tango_context.device.AssignResources('{"subarrayID":1,"dish":{"receptorIDList":["0001","0002"]}}')

        dummy_event = create_dummy_obs_event(cbf_subarray_fqdn, ObsState.IDLE)

        event_subscription_map[cbf_subarray_state_attr](dummy_event)

        assert tango_context.device.obsState == ObsState.IDLE

csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py

+6 −6
Original line number Diff line number Diff line
@@ -100,11 +100,11 @@ class MidCspSubarrayBase(CspSubarray): 
            #return (ResultCode.OK, "On command completed OK")



    class AssignResourcesCommand(CspSubarray.AssignResourcesCommand):



        #TODO: aggiungere logica riconoscimento sottoelementi

        def do(self, argin):

            super().do(argin)

            config = json.loads(argin)

            receptor_list = config['receptorIDList']

            receptor_list = list(map(int, config['receptorIDList']))

            self.addReceptors(receptor_list)



        def addReceptors(self, argin):
@@ -451,7 +451,7 @@ class MidCspSubarrayBase(CspSubarray): 
    '''



    def _monitor_add_receptors(self, receptors_to_be_added, args_dict=None):

        cmd_name = 'addreceptors'

        cmd_name = 'assignresources'

        device = self.CbfSubarray

        self._num_dev_completed_task[cmd_name] = 0

        self._list_dev_completed_task[cmd_name] = []
@@ -510,10 +510,10 @@ class MidCspSubarrayBase(CspSubarray): 
        self.logger.info("CspSubarray failure flag:{}".format(self._failure_raised))

        self.logger.info("CspSubarray timeout flag:{}".format(self._timeout_expired))

        if self._timeout_expired or self._failure_raised:

            return self._addreceptors_cmd_obj.failed()

            return self._assignresources_cmd_obj.failed()

        # reset the command execution state

        self.logger.info("AddReceptors ends with success")

        return self._addreceptors_cmd_obj.succeeded()

        self.logger.info("AssignResources ends with success")

        return self._assignresources_cmd_obj.succeeded()



     # PROTECTED REGION END #    //  MidCspSubarrayBase.private_methods

csp-lmc-mid/tests/integration/MidCspSubarray_test.py

+5 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ class TestCspSubarray(TestBase): 


        param = {

            'subarrayID': 1,

            'dish': {'receptorIDList': receptor_list.tolist()}}

            'dish': {'receptorIDList': list(map(str, receptor_list.tolist()))}}

        json_config = json.dumps(param)

        self.midcsp_subarray01.AssignResources(json_config)
@@ -219,9 +219,10 @@ class TestCspSubarray(TestBase): 
                invalid_receptor_to_assign.append(id_num)

            if len(invalid_receptor_to_assign) > 3:

                break



        param = {

            'subarrayID': 1,

            'dish': { 'receptorIDList': invalid_receptor_to_assign}}

            'dish': { 'receptorIDList': list(map(str, invalid_receptor_to_assign))}}

        json_config = json.dumps(param)

        self.midcsp_subarray01.AssignResources(json_config)
@@ -255,7 +256,7 @@ class TestCspSubarray(TestBase): 
        # Exercise the system: issue the AddREceptors command

        param = {

            'subarrayID': 1,

            'dish': {'receptorIDList': receptor_list}}

            'dish': {'receptorIDList': list(map(str, receptor_list))}}

        json_config = json.dumps(param)

        self.midcsp_subarray01.AssignResources(json_config)

        # check the final subarray obstate
@@ -281,7 +282,7 @@ class TestCspSubarray(TestBase): 
        LOGGER.info(f"Try to assign receptor:{assigned_receptors[0]}")

        param = {

            'subarrayID': 1,

            'dish': {'receptorIDList': [assigned_receptors[0],]}}

            'dish': {'receptorIDList': list(map(str, [assigned_receptors[0],]))}}

        json_config = json.dumps(param)

        self.midcsp_subarray01.AssignResources(json_config)

        # check