From 6ec0c11b9915c34173cff91d5ac54c2e21d68c93 Mon Sep 17 00:00:00 2001 From: toor Date: Tue, 11 Aug 2020 11:38:32 +0200 Subject: [PATCH 1/5] fix-problem-integration-ADR8: Fix bug in CSP.LMC subarray events generation. --- csp-lmc-common/HISTORY | 4 ++++ csp-lmc-common/csp_lmc_common/CspSubarray.py | 6 ++++-- csp-lmc-common/csp_lmc_common/release.py | 2 +- csp-lmc-common/docker/.release | 6 +++--- csp-lmc-mid/HISTORY | 4 ++++ csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py | 5 ++--- csp-lmc-mid/csp_lmc_mid/release.py | 2 +- csp-lmc-mid/docker/.release | 6 +++--- csp-lmc-mid/setup.py | 2 +- 9 files changed, 23 insertions(+), 14 deletions(-) diff --git a/csp-lmc-common/HISTORY b/csp-lmc-common/HISTORY index e80e094..06a6404 100644 --- a/csp-lmc-common/HISTORY +++ b/csp-lmc-common/HISTORY @@ -1,3 +1,7 @@ +0.6.8: +- Removed the CspSubarrayStateModel: no more used. This state model was not correct becuase it + did not register the callback to push events on obsState attribute + 0.6.7: - Fixed a bug in re-configuration process. diff --git a/csp-lmc-common/csp_lmc_common/CspSubarray.py b/csp-lmc-common/csp_lmc_common/CspSubarray.py index 1c30d28..d81b535 100644 --- a/csp-lmc-common/csp_lmc_common/CspSubarray.py +++ b/csp-lmc-common/csp_lmc_common/CspSubarray.py @@ -46,6 +46,7 @@ from . import release # PROTECTED REGION END # // CspSubarray.additionnal_import __all__ = ["CspSubarray", "main"] +''' class CspSubarrayStateModel(SKASubarrayStateModel): _subarray_transitions = { ('READY', 'goto_idle_succeeded'): ( @@ -68,6 +69,7 @@ class CspSubarrayStateModel(SKASubarrayStateModel): dev_state_callback=dev_state_callback, ) self.update_transitions(self._subarray_transitions) +''' class CspSubarray(SKASubarray): """ @@ -1768,7 +1770,7 @@ class CspSubarray(SKASubarray): # ---------------- # Class private methods # ---------------- - + ''' def _init_state_model(self): """ Sets up the state model for the device @@ -1776,7 +1778,7 @@ class CspSubarray(SKASubarray): self.state_model = CspSubarrayStateModel( dev_state_callback=self._update_state, ) - + ''' def init_command_objects(self): """ Sets up the command objects diff --git a/csp-lmc-common/csp_lmc_common/release.py b/csp-lmc-common/csp_lmc_common/release.py index 943c7ab..a8b93fa 100755 --- a/csp-lmc-common/csp_lmc_common/release.py +++ b/csp-lmc-common/csp_lmc_common/release.py @@ -10,7 +10,7 @@ """Release information for Python Package""" name = """csp-lmc-common""" -version = "0.6.7" +version = "0.6.8" version_info = version.split(".") description = """SKA CSP.LMC Common Software""" author = "INAF-OAA" diff --git a/csp-lmc-common/docker/.release b/csp-lmc-common/docker/.release index e1074bc..244ea64 100644 --- a/csp-lmc-common/docker/.release +++ b/csp-lmc-common/docker/.release @@ -9,7 +9,7 @@ """Release information for Python Package""" name = """csplmc-common""" -version = "0.6.7" +version = "0.6.8" 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.7 -tag=csp-lmc-common-0.6.7 +release=0.6.8 +tag=csp-lmc-common-0.6.8 diff --git a/csp-lmc-mid/HISTORY b/csp-lmc-mid/HISTORY index 6535293..0905778 100644 --- a/csp-lmc-mid/HISTORY +++ b/csp-lmc-mid/HISTORY @@ -1,3 +1,7 @@ +0.6.8: +- use csp-lmc-common version 0.6.8. +- removed import of CspSubarrayStateModel + 0.6.7: - use csp-lmc-common version 0.6.7 diff --git a/csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py b/csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py index 65d6421..f8da937 100644 --- a/csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py +++ b/csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py @@ -38,15 +38,14 @@ from tango import AttrQuality, EventType, DevState from tango import AttrWriteType, DeviceProxy # Additional import # PROTECTED REGION ID(MidCspSubarray.additional_import) ENABLED START # -#from ska.base import SKAMaster from ska.base import SKASubarray, SKASubarrayStateModel from ska.base.commands import ActionCommand, ResponseCommand, ResultCode from ska.base.faults import CapabilityValidationError from ska.base.control_model import HealthState, AdminMode, ObsState # import CSP.LMC Common package from csp_lmc_common.utils.cspcommons import CmdExecState -#from csp_lmc_common.utils.decorators import AdminModeCheck, ObsStateCheck, SubarrayRejectCmd -from csp_lmc_common.CspSubarray import CspSubarray, CspSubarrayStateModel +#from csp_lmc_common.CspSubarray import CspSubarray, CspSubarrayStateModel +from csp_lmc_common.CspSubarray import CspSubarray from csp_lmc_mid.receptors import Receptors # PROTECTED REGION END # // MidCspSubarrayBase.additionnal_import diff --git a/csp-lmc-mid/csp_lmc_mid/release.py b/csp-lmc-mid/csp_lmc_mid/release.py index 182b64f..ad82a6e 100755 --- a/csp-lmc-mid/csp_lmc_mid/release.py +++ b/csp-lmc-mid/csp_lmc_mid/release.py @@ -10,7 +10,7 @@ """Release information for Python Package""" name = """mid-csp-lmc""" -version = "0.6.7" +version = "0.6.8" version_info = version.split(".") description = """SKA MID CSP.LMC""" author = "INAF-OAA" diff --git a/csp-lmc-mid/docker/.release b/csp-lmc-mid/docker/.release index 8ea3ee6..232c1db 100644 --- a/csp-lmc-mid/docker/.release +++ b/csp-lmc-mid/docker/.release @@ -9,7 +9,7 @@ """Release information for Python Package""" name = """MID CSP.LMC""" -version = "0.6.7" +version = "0.6.8" version_info = version.split(".") description = """SKA MID CSP.LMC Classes""" author = "E.G" @@ -18,5 +18,5 @@ license = """BSD-3-Clause""" url = """www.tango-controls.org""" copyright = """""" -release=0.6.7 -tag=mid-csp-lmc-0.6.7 +release=0.6.8 +tag=mid-csp-lmc-0.6.8 diff --git a/csp-lmc-mid/setup.py b/csp-lmc-mid/setup.py index 6bd6066..e53d0c6 100644 --- a/csp-lmc-mid/setup.py +++ b/csp-lmc-mid/setup.py @@ -38,7 +38,7 @@ setup( install_requires = [ 'pytango >=9.3.1', 'future', - 'csp-lmc-common>=0.6.7' + 'csp-lmc-common>=0.6.8' ], setup_requires=[ 'pytest-runner', -- GitLab From 8cb481ca79d77755266ad6b7780ae2532999be63 Mon Sep 17 00:00:00 2001 From: softir Date: Mon, 17 Aug 2020 10:43:04 +0200 Subject: [PATCH 2/5] fix-problem-integration-ADR8: use lmcbaseclasses-0.6.5. Fix bug in Mid CspSubarray (access to VCC info). --- csp-lmc-common/HISTORY | 2 ++ csp-lmc-common/csp_lmc_common/release.py | 2 +- csp-lmc-common/docker/.release | 6 +++--- csp-lmc-common/setup.py | 2 +- csp-lmc-mid/HISTORY | 4 ++++ csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py | 2 +- csp-lmc-mid/csp_lmc_mid/release.py | 2 +- csp-lmc-mid/docker/.release | 6 +++--- csp-lmc-mid/setup.py | 2 +- 9 files changed, 17 insertions(+), 11 deletions(-) diff --git a/csp-lmc-common/HISTORY b/csp-lmc-common/HISTORY index 06a6404..e2cb2ec 100644 --- a/csp-lmc-common/HISTORY +++ b/csp-lmc-common/HISTORY @@ -1,3 +1,5 @@ +0.6.9: + - use lmcbaseclasses 0.6.5 0.6.8: - Removed the CspSubarrayStateModel: no more used. This state model was not correct becuase it did not register the callback to push events on obsState attribute diff --git a/csp-lmc-common/csp_lmc_common/release.py b/csp-lmc-common/csp_lmc_common/release.py index a8b93fa..dd592c5 100755 --- a/csp-lmc-common/csp_lmc_common/release.py +++ b/csp-lmc-common/csp_lmc_common/release.py @@ -10,7 +10,7 @@ """Release information for Python Package""" name = """csp-lmc-common""" -version = "0.6.8" +version = "0.6.9" version_info = version.split(".") description = """SKA CSP.LMC Common Software""" author = "INAF-OAA" diff --git a/csp-lmc-common/docker/.release b/csp-lmc-common/docker/.release index 244ea64..c854229 100644 --- a/csp-lmc-common/docker/.release +++ b/csp-lmc-common/docker/.release @@ -9,7 +9,7 @@ """Release information for Python Package""" name = """csplmc-common""" -version = "0.6.8" +version = "0.6.9" 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.8 -tag=csp-lmc-common-0.6.8 +release=0.6.9 +tag=csp-lmc-common-0.6.9 diff --git a/csp-lmc-common/setup.py b/csp-lmc-common/setup.py index 60e4213..f0281d5 100644 --- a/csp-lmc-common/setup.py +++ b/csp-lmc-common/setup.py @@ -38,7 +38,7 @@ setup( install_requires = [ 'pytango >9.3.1', 'future', - 'lmcbaseclasses==0.6.3' + 'lmcbaseclasses==0.6.5+221be16f' ], setup_requires=[ 'pytest-runner', diff --git a/csp-lmc-mid/HISTORY b/csp-lmc-mid/HISTORY index 0905778..4de4f75 100644 --- a/csp-lmc-mid/HISTORY +++ b/csp-lmc-mid/HISTORY @@ -1,3 +1,7 @@ +0.6.9: +- use csp-lmc-common 0.6.9 +- fix bug in receptor class + 0.6.8: - use csp-lmc-common version 0.6.8. - removed import of CspSubarrayStateModel diff --git a/csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py b/csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py index f8da937..21e65a4 100644 --- a/csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py +++ b/csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py @@ -758,7 +758,7 @@ class MidCspSubarrayBase(CspSubarray): assigned_receptors = self._receptors.assigned_to_subarray(self.SubID) # NOTE: if receptors attribute is empty, assigned_receptors is an empty numpy array # and it will just be skipped by the for loop - receptor_to_vcc_map = self._receptors.receptor_to_vcc_map + receptor_to_vcc_map = self._receptors.receptor_vcc_map() for receptor_id in assigned_receptors: vcc_id = receptor_to_vcc_map[receptor_id] self._assigned_vcc.append(vcc_id) diff --git a/csp-lmc-mid/csp_lmc_mid/release.py b/csp-lmc-mid/csp_lmc_mid/release.py index ad82a6e..102b81e 100755 --- a/csp-lmc-mid/csp_lmc_mid/release.py +++ b/csp-lmc-mid/csp_lmc_mid/release.py @@ -10,7 +10,7 @@ """Release information for Python Package""" name = """mid-csp-lmc""" -version = "0.6.8" +version = "0.6.9" version_info = version.split(".") description = """SKA MID CSP.LMC""" author = "INAF-OAA" diff --git a/csp-lmc-mid/docker/.release b/csp-lmc-mid/docker/.release index 232c1db..f5a4952 100644 --- a/csp-lmc-mid/docker/.release +++ b/csp-lmc-mid/docker/.release @@ -9,7 +9,7 @@ """Release information for Python Package""" name = """MID CSP.LMC""" -version = "0.6.8" +version = "0.6.9" version_info = version.split(".") description = """SKA MID CSP.LMC Classes""" author = "E.G" @@ -18,5 +18,5 @@ license = """BSD-3-Clause""" url = """www.tango-controls.org""" copyright = """""" -release=0.6.8 -tag=mid-csp-lmc-0.6.8 +release=0.6.9 +tag=mid-csp-lmc-0.6.9 diff --git a/csp-lmc-mid/setup.py b/csp-lmc-mid/setup.py index e53d0c6..34a15bd 100644 --- a/csp-lmc-mid/setup.py +++ b/csp-lmc-mid/setup.py @@ -38,7 +38,7 @@ setup( install_requires = [ 'pytango >=9.3.1', 'future', - 'csp-lmc-common>=0.6.8' + 'csp-lmc-common>=0.6.9' ], setup_requires=[ 'pytest-runner', -- GitLab From f50ff73140c695a52508819079a854a81859f93d Mon Sep 17 00:00:00 2001 From: softir Date: Wed, 16 Sep 2020 08:01:53 +0200 Subject: [PATCH 3/5] fix-problem-integration-ADR8: modified test for Abort during Resetting (now it's allowed). --- csp-lmc-mid/tests/unit/midcspsubarray_unit_test.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/csp-lmc-mid/tests/unit/midcspsubarray_unit_test.py b/csp-lmc-mid/tests/unit/midcspsubarray_unit_test.py index 64be280..db56b1d 100644 --- a/csp-lmc-mid/tests/unit/midcspsubarray_unit_test.py +++ b/csp-lmc-mid/tests/unit/midcspsubarray_unit_test.py @@ -717,12 +717,8 @@ def test_midcspsubarray_obsstate_WHEN_abort_invoked_in_resetting(): tango_context.device.ObsReset() prober_obs_state = Probe(tango_context.device, 'obsState', ObsState.RESETTING, f"Wrong CspSubarray state") Poller(3, 0.1).check(prober_obs_state) - with pytest.raises(tango.DevFailed) as df: - tango_context.device.Abort() - if df: - err_msg = str(df.value.args[0].desc) - assert "Error executing command AbortCommand" in err_msg - prober_obs_state = Probe(tango_context.device, 'obsState', ObsState.FAULT, f"Wrong CspSubarray state") + tango_context.device.Abort() + prober_obs_state = Probe(tango_context.device, 'obsState', ObsState.ABORTING, f"Wrong CspSubarray state") Poller(3, 0.1).check(prober_obs_state) def test_midcspsubarray_obsstate_WHEN_restart_invoked_after_cspsubarray_aborted(): -- GitLab From 6462f1119f0745f9faf7e77f7e9043f6d05079bc Mon Sep 17 00:00:00 2001 From: softir Date: Wed, 16 Sep 2020 08:14:43 +0200 Subject: [PATCH 4/5] fix-problem-integration-ADR8: updated pipeline configuration files to use python3. --- csp-lmc-common/.gitlab-ci.yml | 6 +++--- csp-lmc-mid/.gitlab-ci.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/csp-lmc-common/.gitlab-ci.yml b/csp-lmc-common/.gitlab-ci.yml index 53278dd..0be7f45 100644 --- a/csp-lmc-common/.gitlab-ci.yml +++ b/csp-lmc-common/.gitlab-ci.yml @@ -20,13 +20,13 @@ dependencies: [] script: - cd $COMMON_BUILD_PATH - - python setup.py egg_info -b+dev.$CI_COMMIT_SHORT_SHA sdist bdist_wheel + - python3 setup.py egg_info -b+dev.$CI_COMMIT_SHORT_SHA sdist bdist_wheel .build_python_release_common: extends: .build_python_common script: - cd $COMMON_BUILD_PATH - - python setup.py egg_info -b+$CI_COMMIT_SHORT_SHA sdist bdist_wheel + - python3 setup.py egg_info -b+$CI_COMMIT_SHORT_SHA sdist bdist_wheel build:csp-lmc-common_pkg_dev: # Executed on a commit extends: .build_python_dev_common @@ -107,7 +107,7 @@ linting:csp-lmc-common: tags: - docker-executor before_script: - - pip install twine + - python3 -m pip install twine .publish_python_dev_common: extends: .publish_python_common diff --git a/csp-lmc-mid/.gitlab-ci.yml b/csp-lmc-mid/.gitlab-ci.yml index 32d1d5c..1b8306a 100644 --- a/csp-lmc-mid/.gitlab-ci.yml +++ b/csp-lmc-mid/.gitlab-ci.yml @@ -19,13 +19,13 @@ dependencies: [] script: - cd $BUILD_PATH - - python setup.py egg_info -b+dev.$CI_COMMIT_SHORT_SHA sdist bdist_wheel + - python3 setup.py egg_info -b+dev.$CI_COMMIT_SHORT_SHA sdist bdist_wheel .build_python_release: extends: .build_python script: - cd $BUILD_PATH - - python setup.py egg_info -b+$CI_COMMIT_SHORT_SHA sdist bdist_wheel + - python3 setup.py egg_info -b+$CI_COMMIT_SHORT_SHA sdist bdist_wheel build:csp-lmc-mid_pkg_dev: # Executed on a commit extends: .build_python_dev @@ -122,7 +122,7 @@ linting:csp-lmc-mid: tags: - docker-executor before_script: - - pip install twine + - python3 -m pip install twine .publish_python_dev: extends: .publish_python -- GitLab From d413bfa2537468078cdfc838e2dc3b5b7f878ada Mon Sep 17 00:00:00 2001 From: softir Date: Wed, 16 Sep 2020 08:42:24 +0200 Subject: [PATCH 5/5] fix-problem-integration-ADR8: updated main CI/CD configuration file. Modified test send_abort_WHILE_configuring (removed the sleep). --- .gitlab-ci.yml | 4 ++-- csp-lmc-mid/tests/MidCspSubarray_test.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b04c8d..3a4366d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,9 +70,9 @@ pages: MIDCSP_PATH: csp-lmc-mid/docker script: - pwd - - pip3 install junitparser + - python3 -m pip install junitparser #update coverage o the last release - - pip3 install --upgrade coverage + - python3 -m pip install --upgrade coverage - ls -lR # copy the content of packages folders in public # path to all files is relative to the repository diff --git a/csp-lmc-mid/tests/MidCspSubarray_test.py b/csp-lmc-mid/tests/MidCspSubarray_test.py index 4be0328..fa9713b 100755 --- a/csp-lmc-mid/tests/MidCspSubarray_test.py +++ b/csp-lmc-mid/tests/MidCspSubarray_test.py @@ -530,7 +530,7 @@ class TestCspSubarray(TestBase): f = open(file_path + "/acceptance_tests/test_ConfigureScan_ADR4.json") (result_code, msg) = self.midcsp_subarray01.Configure(f.read().replace("\n", "")) f.close() - time.sleep(0.1) + #time.sleep(0.1) self.midcsp_subarray01.Abort() # check prober_subarray_obstate = Probe(self.midcsp_subarray01, 'obsState', ObsState.ABORTED, -- GitLab