Commit 3d19ed2e authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

CT69-integration-with-cbf: New config file for tests. 

Small change to CspSubarray to have correct mocking of the
subscribing.
parent 389b51af

csp-lmc-common/csp_lmc_common/CspSubarray.py

+5 −4
Original line number Diff line number Diff line
@@ -391,7 +391,8 @@ class CspSubarray(SKASubarray): 
        try:

            log_msg = "Trying connection to " + str(fqdn) + " device"

            self.logger.info(log_msg)

            device_proxy = tango.DeviceProxy(fqdn)

            # to mock the DeviceProxy for tests we need to call DeviceProxy and not tango.DeviceProxy

            device_proxy = DeviceProxy(fqdn)

            # Note: The DeviceProxy is initialized even if the sub-component

            # device is not running (but defined into the TANGO DB! If not defined in the

            # TANGO DB a exception is throw).
@@ -1938,13 +1939,13 @@ class CspSubarray(SKASubarray): 
            self._scan_id = int(argin[0])

        except ValueError as val_err:



            self.logging.error("Invalid argument:{}".format(str(val_err)))

            self.logger.error("Invalid argument:{}".format(str(val_err)))

            tango.Except.throw_exception("Command failed",

                                         str(val_err),

                                         "Scan execution",

                                         tango.ErrSeverity.ERR)

        except Exception as err:

            self.logging.error("Invalid argument:{}".format(str(err)))

            self.logger.error("Invalid argument:{}".format(str(err)))

            tango.Except.throw_exception("Command failed",

                                         str(err),

                                         "Scan execution",
@@ -1966,7 +1967,7 @@ class CspSubarray(SKASubarray): 
            except tango.DevFailed as tango_err:

                self.logger.info(tango_err.args[0].desc)

            try:

                proxy.command_inout_asynch("Scan", argin[0], self._cmd_ended_cb)

                proxy.command_inout_asynch("Scan", int(argin[0]), self._cmd_ended_cb)

            except tango.DevFailed as tango_err:

                self.logger.info(tango_err.args[0].desc)

                # TODO: add check on the failed device. If CBF

csp-lmc-mid/tests/acceptance_tests/test_ConfigureScan_invalid_cbf_json.json

0 → 100644
+63 −0
Original line number Diff line number Diff line 
{

    "id": "sbi-mvp01-20200325-00001-science_A",

    "frequencyBand": "6",

    "delayModelSubscriptionPoint": "ska_mid/tm_leaf_node/csp_subarray_01/delayModel",



    "fsp": [

        {

            "fspID": 1,

            "functionMode": "CORR",

            "frequencySliceID": 1,

            "corrBandwidth": 0,

            "integrationTime": 140,

            "fspChannelOffset": 0,

            "channelAveragingMap": [

                [0, 1],

                [744, 1],

                [1488, 1],

                [2232, 1],

                [2976, 1],

                [3720, 1],

                [4464, 1],

		[5208, 1],

                [5952, 1],

                [6696, 1],

                [7440, 1],

                [8184, 1],

                [8928, 1],

                [9672, 1],

                [10416, 1],

                [11160, 1],

                [11904, 1],

                [12648, 1],

                [13392, 1],

                [14136, 1]

            ],

            "outputLinkMap": [

                [0, 4],

                [744, 8],

                [1480, 12],

                [2234, 16],

                [2978, 20],

                [3722, 24],

                [4466, 28],

                [5208, 32],

		[5952, 36],

                [6696, 40],

                [7440, 44],

                [8184, 48],

                [8928, 52],

                [9672, 56],

                [10416, 60],

                [11160, 64],

                [11904, 68],

                [12648, 72],

                [13392, 76],

                [14136, 80]

      ],

      "outputHost": [[0, "192.168.0.1"], [8184, "192.168.0.2"]],

      "outputMac": [[0, "06-00-00-00-00-01"]],

      "outputPort": [[0, 9000, 1], [8184, 9000, 1]]

      }

    ]

}