From 7a3b70bb078e30b706221a7ed54ce62323f10ba5 Mon Sep 17 00:00:00 2001
From: Carlo Baffa <baffa@arcetri.astro.it>
Date: Mon, 6 Apr 2020 09:23:58 +0200
Subject: [PATCH] Deleted the inherited and unnecessary Makefile. Some
comments.
---
Makefile | 27 ---------------------------
cspse/lmc/release.py | 2 +-
cspse/lmc/subelement_master.py | 8 +++++++-
3 files changed, 8 insertions(+), 29 deletions(-)
delete mode 100644 Makefile
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 462303c..0000000
--- a/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Use bash shell with pipefail option enabled so that the return status of a
-# piped command is the value of the last (rightmost) commnand to exit with a
-# non-zero status. This lets us pipe output into tee but still exit on test
-# failures.
-SHELL = /bin/bash
-.SHELLFLAGS = -o pipefail -c
-
-all: test lint
-
-# The following steps copy across useful output to this volume which can
-# then be extracted to form the CI summary for the test procedure.
-test:
-
- python setup.py test | tee ./build/setup_py_test.stdout; \
- mv coverage.xml ./build/reports/code-coverage.xml;
-
-# The following steps copy across useful output to this volume which can
-# then be extracted to form the CI summary for the test procedure.
-lint:
-
- # FIXME pylint needs to run twice since there is no way go gather the text and junit xml output at the same time
- pip3 install pylint2junit; \
- pylint --output-format=parseable ska_python_skeleton | tee ./build/code_analysis.stdout; \
- pylint --output-format=pylint2junit.JunitReporter ska_python_skeleton > ./build/reports/linting.xml;
-
-
-.PHONY: all test lint
diff --git a/cspse/lmc/release.py b/cspse/lmc/release.py
index 4e495d0..9e0117b 100755
--- a/cspse/lmc/release.py
+++ b/cspse/lmc/release.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# This file is part of the CentralNode project
+# This file is part of the CspSubElementMaster project
#
#
#
diff --git a/cspse/lmc/subelement_master.py b/cspse/lmc/subelement_master.py
index f20a0c0..8b1493e 100644
--- a/cspse/lmc/subelement_master.py
+++ b/cspse/lmc/subelement_master.py
@@ -241,7 +241,6 @@ class CspSubElementMaster(SKAMaster):
SKAMaster.init_device(self)
self.set_state(tango.DevState.INIT)
# PROTECTED REGION ID(CspSubElementMaster.init_device) ENABLED START #
- # PROTECTED REGION ID(CspSubElementMaster.init_device) ENABLED START #
# _cmd_execution_state: implement the execution state of a long-running
# command for the whole CSP. Setting this attribute prevent the execution
# of the same command while it is already running.
@@ -512,6 +511,9 @@ class CspSubElementMaster(SKAMaster):
The command is executed if the *AdminMode* is ONLINE or *MAINTENANCE*.
If the AdminMode is *OFFLINE*, *NOT-FITTED* or *RESERVED*, the method throws an
exception.
+ The CSP sub-element components can be organized as tango-groups or controlled
+ by some tango device drivers which actas as 'cache'. We call these devices
+ 'racks', even if they can contro a different phisical arrangement.
:param argin: 'DevVarStringArray'
The list of sub-element components FQDNs to switch-on or an empty list to switch-on the whole
@@ -542,6 +544,10 @@ class CspSubElementMaster(SKAMaster):
Switch-off the CSP sub-element components specified by the input argument.
If no argument is specified, the command is issued to all the CSP
sub-element components.
+ The CSP sub-element components can be organized as tango-groups or controlled
+ by some tango device drivers which actas as 'cache'. We call these devices
+ 'racks', even if they can contro a different phisical arrangement.
+
:param argin: 'DevVarStringArray'
If the array length is 0, the command applies to the whole
--
GitLab