diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8037f7db6aa3c201247f4268a35df4c16985d521..5c222a48dcd223050f203a69d7b4f4b4d99ccdb7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -529,6 +529,7 @@ unit_test:
- tangostationcontrol/.coverage
integration_test_docker:
stage: integration-tests
+ allow_failure: true
image: docker:latest
tags:
- privileged
@@ -551,6 +552,7 @@ integration_test_docker:
tag="$CI_COMMIT_REF_SLUG"
echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
fi
+ - apk update
- apk add --update make bash docker-compose
- apk add --update bind-tools
- apk add --update postgresql14-client gzip
diff --git a/CDB/stations/DTS_Outside_ConfigDb.json b/CDB/stations/DTS_Outside_ConfigDb.json
index 6f051755943d69ee16de650a16d86cdad6e2ebbc..96b58936feb2ca06b0f84a6c099603a968f84496 100644
--- a/CDB/stations/DTS_Outside_ConfigDb.json
+++ b/CDB/stations/DTS_Outside_ConfigDb.json
@@ -18,24 +18,24 @@
"Initialise_Hardware": [
"True"
],
- "Device_Names" : [
+ "Device_Names": [
"STAT/Docker/1",
- "STAT/PSOC/1",
- "STAT/PCON/1",
- "STAT/APSPU/1",
- "STAT/APSCT/1",
- "STAT/RECV/1",
- "STAT/UNB2/1",
- "STAT/SDP/1",
- "STAT/BST/1",
- "STAT/SST/1",
- "STAT/XST/1",
- "STAT/Beamlet/1",
- "STAT/AntennaField/1",
- "STAT/TileBeam/2",
- "STAT/DigitalBeam/1",
- "STAT/TemperatureManager/1"
- ]
+ "STAT/PSOC/1",
+ "STAT/PCON/1",
+ "STAT/APSPU/1",
+ "STAT/APSCT/1",
+ "STAT/RECV/1",
+ "STAT/UNB2/1",
+ "STAT/SDP/1",
+ "STAT/BST/1",
+ "STAT/SST/1",
+ "STAT/XST/1",
+ "STAT/Beamlet/1",
+ "STAT/AntennaField/1",
+ "STAT/TileBeam/2",
+ "STAT/DigitalBeam/1",
+ "STAT/TemperatureManager/1"
+ ]
}
}
}
@@ -92,19 +92,6 @@
}
}
},
- "DigitalBeam": {
- "STAT": {
- "DigitalBeam": {
- "STAT/DigitalBeam/1": {
- "properties": {
- "Tracking_enabled_RW_default": [
- "False"
- ]
- }
- }
- }
- }
- },
"Beamlet": {
"STAT": {
"Beamlet": {
@@ -165,32 +152,39 @@
"AntennaField": {
"STAT/AntennaField/2": {
"properties": {
- "RECV_devices": [
- "STAT/RECV/1"
- ],
+ "RECV_devices": [
+ "STAT/RECV/1"
+ ],
+ "Antenna_Names": [
+ "C0",
+ "C1",
+ "C2",
+ "C3",
+ "C4"
+ ],
"HBAT_Control_to_RECV_mapping": [
- "1", "27",
- "0", "-1",
- "0", "-1",
- "1", "28",
- "1", "29"
- ],
+ "1","27",
+ "0","-1",
+ "0","-1",
+ "1","28",
+ "1","29"
+ ],
"HBAT_Power_to_RECV_mapping": [
- "1", "24",
- "0", "-1",
- "0", "-1",
- "1", "25",
- "1", "26"
- ],
+ "1","24",
+ "0","-1",
+ "0","-1",
+ "1","25",
+ "1","26"
+ ],
"Antenna_Field_Reference_ETRS": [
- "3839371.416", "430339.901", "5057958.886"
+ "3839371.416","430339.901","5057958.886"
],
"HBAT_reference_ETRS": [
- "3839371.416", "430339.901", "5057958.886",
- "3839368.919", "430335.979", "5057961.1",
- "3839365.645", "430339.299", "5057963.288",
- "3839368.142", "430343.221", "5057961.074",
- "3839374.094", "430299.513", "5057960.017"
+ "3839371.416","430339.901","5057958.886",
+ "3839368.919","430335.979","5057961.1",
+ "3839365.645","430339.299","5057963.288",
+ "3839368.142","430343.221","5057961.074",
+ "3839374.094","430299.513","5057960.017"
],
"HBAT_PQR_rotation_angles_deg": [
"45.73",
@@ -200,52 +194,65 @@
"54.40"
],
"HBAT_PQR_to_ETRS_rotation_matrix": [
- "-0.11660087", "-0.79095632", "0.60065992",
- " 0.99317077", "-0.09529842", "0.06730545",
- " 0.00400627", " 0.60440575", "0.79666658"
+ "-0.11660087","-0.79095632","0.60065992",
+ " 0.99317077","-0.09529842","0.06730545",
+ " 0.00400627"," 0.60440575","0.79666658"
]
}
},
"STAT/AntennaField/1": {
"properties": {
- "RECV_devices": [
- "STAT/RECV/1"
- ],
+ "RECV_devices": [
+ "STAT/RECV/1"
+ ],
+ "Antenna_Names": [
+ "LBA1",
+ "LBA2",
+ "LBA3",
+ "LBA4",
+ "LBA5",
+ "LBA6",
+ "LBA7",
+ "LBA8",
+ "LBA9"
+ ],
"HBAT_Control_to_RECV_mapping": [
- "1", "1",
- "1", "3",
- "1", "5",
- "1", "7",
- "1", "9",
- "1", "11",
- "1", "13",
- "1", "15",
- "1", "17"
- ],
+ "1","1",
+ "1","3",
+ "1","5",
+ "1","7",
+ "1","9",
+ "1","11",
+ "1","13",
+ "1","15",
+ "1","17"
+ ],
"HBAT_Power_to_RECV_mapping": [
- "1", "1",
- "1", "3",
- "1", "5",
- "1", "7",
- "1", "9",
- "1", "11",
- "1", "13",
- "1", "15",
- "1", "17"
- ],
+ "1","1",
+ "1","3",
+ "1","5",
+ "1","7",
+ "1","9",
+ "1","11",
+ "1","13",
+ "1","15",
+ "1","17"
+ ],
"Antenna_Field_Reference_ETRS": [
- "3839358.189", "430354.482", "5057967.804"
+ "3839358.189",
+ "430354.482",
+ "5057967.804"
],
"HBAT_reference_ETRS": [
- "3839358.189", "430354.482", "5057967.804",
- "3839359.127", "430348.074", "5057967.607",
- "3839360.084", "430341.872", "5057967.379",
- "3839361.024", "430335.466", "5057967.180",
- "3839361.721", "430329.482", "5057967.130",
- "3839362.786", "430323.311", "5057966.818",
- "3839363.705", "430317.204", "5057966.611",
- "3839364.563", "430311.056", "5057966.454",
- "3839365.497", "430304.996", "5057966.232"
+ "3839358.189","430354.482","5057967.804",
+ "3839359.127","430348.074","5057967.607",
+ "3839360.084","430341.872","5057967.379",
+ "3839361.024","430335.466","5057967.180",
+ "3839361.721","430329.482","5057967.130",
+ "3839362.786","430323.311","5057966.818",
+ "3839363.705","430317.204","5057966.611",
+ "3839364.563","430311.056","5057966.454",
+ "3839365.497","430304.996","5057966.232"
]
}
}
@@ -263,7 +270,7 @@
"Input_to_Antenna_Mapping": [
"-1", "-1", "-1", "-1", "-1", "-1",
"-1", "-1", "-1", "-1", "-1", "-1",
- "0", "3", "4", "-1", "-1", "-1",
+ "0", "3", "4", "-1", "-1", "-1",
"-1", "-1", "-1", "-1", "-1", "-1",
"-1", "-1", "-1", "-1", "-1", "-1",
"-1", "-1", "-1", "-1", "-1", "-1",
@@ -286,8 +293,8 @@
"STAT/AntennaField/1"
],
"Input_to_Antenna_Mapping": [
- "0", "1", "2", "3", "4", "5",
- "6", "7", "8", "-1", "-1", "-1",
+ "0", "1", "2", "3", "4", "5",
+ "6", "7", "8", "-1", "-1", "-1",
"-1", "-1", "-1", "-1", "-1", "-1",
"-1", "-1", "-1", "-1", "-1", "-1",
"-1", "-1", "-1", "-1", "-1", "-1",
@@ -302,6 +309,9 @@
"-1", "-1", "-1", "-1", "-1", "-1",
"-1", "-1", "-1", "-1", "-1", "-1",
"-1", "-1", "-1", "-1", "-1", "-1"
+ ],
+ "Tracking_enabled_RW_default": [
+ "False"
]
}
}
@@ -332,9 +342,9 @@
"SDP": {
"STAT/SDP/1": {
"properties": {
- "AntennaType" : [
- "LBA"
- ],
+ "AntennaType": [
+ "LBA"
+ ],
"OPC_Server_Name": [
"10.99.0.250"
],
@@ -555,7 +565,9 @@
"PSOC": {
"STAT/PSOC/1": {
"properties": {
- "SNMP_host": ["10.87.2.145"],
+ "SNMP_host": [
+ "10.87.2.145"
+ ],
"PSOC_sockets": [
"ccd_socket",
"sdptr0_socket",
@@ -576,7 +588,9 @@
"PCON": {
"STAT/PCON/1": {
"properties": {
- "SNMP_host": ["10.151.225.5"]
+ "SNMP_host": [
+ "10.151.225.5"
+ ]
}
}
}
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index b3b736fc57a644ce05f4a8c11973be7042a7079f..7606e94abd344a9c255463664bf2f55d8e556b93 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -150,7 +150,8 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \
CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) \
COMPOSE_IGNORE_ORPHANS=true \
CONTAINER_EXECUTION_UID=$(shell id -u) \
- DOCKER_GID=$(DOCKER_GID)
+ DOCKER_GID=$(DOCKER_GID) \
+ TEST_MODULE=$(INTEGRATION_MODULE)
.PHONY: up down minimal context run integration start stop restart build build-nocache status clean pull help
@@ -174,7 +175,7 @@ run: minimal ## run a service using arguments and delete it afterwards
$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) run --no-deps --rm $(SERVICE) $(SERVICE_ARGS)
integration: minimal ## run a service using arguments and delete it afterwards
- TEST_MODULE=$(INTEGRATION_MODULE) $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) run --no-deps --rm integration-test $(INTEGRATION_ARGS)
+ $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) run --no-deps --rm integration-test $(INTEGRATION_ARGS)
down: ## stop all services and tear down the system
$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) down
diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh
index 30df5c7cf02be8a26b86c506299d64e0acfa45ef..65beb8bc65ef32c79d29794281e5f3da2023456a 100755
--- a/sbin/run_integration_test.sh
+++ b/sbin/run_integration_test.sh
@@ -24,12 +24,16 @@ function integration_test {
IFS=" " read -r -a restarts <<< "${2}"
IFS=" " read -r -a configs <<< "${3}"
for config in "${configs[@]}"; do
+ echo "Updating config ${config} ..."
bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${config}"
done
if [ ! -z "${2+x}" ]; then
+ # shellcheck disable=SC2145
+ echo "make restart ${restarts[@]} ..."
make restart "${restarts[@]}"
fi
sleep 5
+ echo "make integration ${1} ..."
make integration "${1}"
}
diff --git a/tangostationcontrol/requirements.txt b/tangostationcontrol/requirements.txt
index 9472aedca773bbc84e208b95aa96fabc025cc524..b058e7aa521056c9f74db04f22bf8a601ef7e539 100644
--- a/tangostationcontrol/requirements.txt
+++ b/tangostationcontrol/requirements.txt
@@ -2,7 +2,7 @@
# order of appearance. Changing the order has an impact on the overall
# integration process, which may cause wedges in the gate later.
-lofar-station-client@git+https://git.astron.nl/lofar2.0/lofar-station-client@0.4.0
+lofar-station-client@git+https://git.astron.nl/lofar2.0/lofar-station-client@0.6.0
asyncua >= 0.9.90 # LGPLv3
PyMySQL[rsa] >= 1.0.2 # MIT
psycopg2-binary >= 2.9.2 # LGPL
diff --git a/tangostationcontrol/tangostationcontrol/devices/antennafield.py b/tangostationcontrol/tangostationcontrol/devices/antennafield.py
index 4c39a6bdea1db44f52c87f2fd3a4e6add71e3d99..c7d43b9226de469e877cf6bfdc4c728a8afcfd0e 100644
--- a/tangostationcontrol/tangostationcontrol/devices/antennafield.py
+++ b/tangostationcontrol/tangostationcontrol/devices/antennafield.py
@@ -85,6 +85,14 @@ class AntennaField(lofar_device):
calculated, as well as the geohash.
"""
+ # ----- Antenna names
+
+ Antenna_Names = device_property(
+ doc="Name of each antenna",
+ dtype='DevVarStringArray',
+ mandatory=False
+ )
+
# ----- Antenna states
Antenna_Quality = device_property(
@@ -195,6 +203,8 @@ class AntennaField(lofar_device):
default_value = []
)
+ Antenna_Names_R = attribute(access=AttrWriteType.READ,
+ dtype=(str,), max_dim_x=MAX_NUMBER_OF_HBAT)
Antenna_Quality_R = attribute(access=AttrWriteType.READ,
dtype=(numpy.uint16,), max_dim_x=MAX_NUMBER_OF_HBAT)
Antenna_Use_R = attribute(access=AttrWriteType.READ,
@@ -247,6 +257,9 @@ class AntennaField(lofar_device):
doc='Number of HBAT in this field',
dtype=numpy.int32)
+ def read_Antenna_Names_R(self):
+ return self.Antenna_Names
+
def read_Antenna_Use_R(self):
return self.Antenna_Use
diff --git a/tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py b/tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py
index 96eb83300bec3352b1c0572653f38bf96a2e77d9..c567f476b21f05aa1806b454092c5a1660849ade 100644
--- a/tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py
+++ b/tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py
@@ -389,3 +389,11 @@ class TestAntennafieldDevice(device_base.DeviceTestCase):
antenna_properties = {'Antenna_Quality': antenna_qualities, 'Antenna_Use': antenna_use}
with DeviceTestContext(antennafield.AntennaField, properties={**self.AT_PROPERTIES, **antenna_properties}, process=True) as proxy:
numpy.testing.assert_equal(numpy.array([True] + [False] * 95), proxy.Antenna_Usage_Mask_R)
+
+ def test_read_Antenna_Names(self):
+ """ Verify if Antenna_Names_R is correctly retrieved """
+ antenna_names = ["C0","C1","C2","C3","C4"]
+ antenna_properties = {'Antenna_Names' : antenna_names}
+ with DeviceTestContext(antennafield.AntennaField, properties={**self.AT_PROPERTIES, **antenna_properties}, process=True) as proxy:
+ for i in range(len(antenna_names)):
+ self.assertTrue(proxy.Antenna_Names_R[i]==f"C{i}")
diff --git a/tangostationcontrol/tox.ini b/tangostationcontrol/tox.ini
index c87e4605816e3ea7ee22dfd9731d73c7912f85d8..9bd8b804bcfabb04d4caf630c926fdcbe30ef1f9 100644
--- a/tangostationcontrol/tox.ini
+++ b/tangostationcontrol/tox.ini
@@ -29,12 +29,14 @@ commands = {envpython} -m stestr run {posargs}
[testenv:integration]
; Warning running integration tests will make changes to your docker system!
; These tests should only be run by the integration-test docker container.
+allowlist_externals = echo
passenv = TANGO_HOST
setenv =
VIRTUAL_ENV={envdir}
TESTS_DIR=./tangostationcontrol/integration_test/{env:TEST_MODULE:default}
PYTHON={envpython} -m coverage run --source tangostationcontrol --parallel-mode
commands =
+ echo "Integration test directory configured for{env:TESTS_DIR} ({env:TEST_MODULE})"
{envpython} -m stestr run --serial {posargs}
{envpython} -m coverage combine
{envpython} -m coverage html --omit='*test*' -d cover