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

fix-problem-integration-ADR8: fixing issue on re-configuration.

parent 248c634d

csp-lmc-common/HISTORY

+3 −0
Original line number Diff line number Diff line 
0.6.7:

- Fixed a bug in re-configuration process.



0.6.6:

- Added Restart and Reset

csp-lmc-common/csp_lmc_common/CspSubarray.py

+13 −6
Original line number Diff line number Diff line
@@ -403,13 +403,13 @@ class CspSubarray(SKASubarray): 
                                             "Configure",

                                             tango.ErrSeverity.ERR)

            target_device._reconfiguring = False

            if target_device.state_model._obs_state == ObsState.READY:

               target_device._reconfiguring = True

            # Forward the Configure command to the sub-elements

            # components (subarrays, pst beams)

            for device in target_device._sc_subarray_assigned_fqdn:

                # reset the command progress counter for each

                # sub-array component

                if target_device._sc_subarray_obs_state[device] == ObsState.READY:

                    target_device._reconfiguring = True

                target_device._sc_subarray_cmd_progress[device]['configurescan'] = 0

                target_device._failure_message['configurescan'] = ''

                # NOTE: what happens if a sub-element subarray/PSt beam TANGO
@@ -549,8 +549,9 @@ class CspSubarray(SKASubarray): 
                    # if the sub-component execution flag is no more RUNNING, the command has

                    # ended with or without success. Go to check next device state.

                    self.logger.info("Wait for final obsState = {}".format(ObsState(dev_successful_state).name))

                    self.logger.info("current device {} state:{}".format(device, 

                                              ObsState(target_device._sc_subarray_obs_state[device]).name))

                    self.logger.info("current device {} state:{} reconfiguring: {}".format(device, 

                                              ObsState(target_device._sc_subarray_obs_state[device]).name,

                                              target_device._reconfiguring))

                    if target_device._sc_subarray_obs_state[device] == dev_successful_state:

                        if not target_device._reconfiguring:

                            self.logger.info("Command {} ended with success on device {}.".format(cmd_name,
@@ -595,8 +596,9 @@ class CspSubarray(SKASubarray): 
                                                                       target_device._sc_subarray_cmd_exec_state[device][cmd_name]))

                target_device._cmd_progress[cmd_name] = command_progress

                if any(target_device._sc_subarray_obs_state[device] == ObsState.CONFIGURING for device in device_list):

                    self.logger.info("reconfiguring is:{}".format(target_device._reconfiguring))

                    target_device._reconfiguring = False

                    #target_device._reconfiguring = False

                    self.logger.info("device {} is in {}: reconfiguring is:{}".format(device, ObsState(target_device._sc_subarray_obs_state[device]).name,

                                                                                      target_device._reconfiguring))

                if all(value == True for value in device_done.values()):

                    self.logger.info("All devices have been handled!")

                    break
@@ -1471,9 +1473,14 @@ class CspSubarray(SKASubarray): 
                    if evt.argout[0] == ResultCode.STARTED:

                        self.logger.info("Device {} is processing the command {}".format(evt.device.dev_name(),

                                                                                      evt.cmd_name))

                        if evt.cmd_name.lower() == 'configurescan':

                            self._reconfiguring = False

                    if evt.argout[0] == ResultCode.OK:

                        self.logger.info("Device {} successfully processed the command {}".format(evt.device.dev_name(),

                                                                                               evt.cmd_name))

                        if evt.cmd_name.lower() == 'configurescan':

                            self._reconfiguring = False

                            self.logger.info("Subarray is in reconfiguring...")

                    if evt.argout[0] == ResultCode.FAILED:

                        self.logger.info("Failure in Device {} while processing the command {}".format(evt.device.dev_name(),

                                                                                               evt.cmd_name))

csp-lmc-common/csp_lmc_common/release.py

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
"""Release information for Python Package"""



name = """csp-lmc-common"""

version = "0.6.6"

version = "0.6.7"

version_info = version.split(".")

description = """SKA CSP.LMC Common Software"""

author = "INAF-OAA"

csp-lmc-common/docker/.release

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
"""Release information for Python Package"""



name = """csplmc-common"""

version = "0.6.6"

version = "0.6.7"

version_info = version.split(".")

description = """SKA CSP.LMC Common Classe"""

author = "E.G"
@@ -18,5 +18,5 @@ license = """BSD-3-Clause""" 
url = """www.tango-controls.org"""

copyright = """"""



release=0.6.6

tag=csp-lmc-common-0.6.6
 
release=0.6.7

tag=csp-lmc-common-0.6.7

csp-lmc-mid/HISTORY

+3 −0
Original line number Diff line number Diff line 
0.6.7:

- use csp-lmc-common version 0.6.7



0.6.6:

- use csp-lmc-common version 0.6.6

- remove polling on VCC state attribute in MID.CBF DB configuration