Merge branch 'master' into 2021-04-16-Branched_from_master-state_bug_fix

CDB/thomas_arm64_ConfigDb.json

+{
+    "servers": {
+        "PCC": {
+            "LTS": {
+                "PCC": {
+                    "LTS/PCC/1": {
+                        "properties": {
+                            "OPC_Server_Name": [
+                                "arm2"
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "SDP": {
+            "LTS": {
+                "SDP": {
+                    "LTS/SDP/1": {
+                        "properties": {
+                            "OPC_Server_Name": [
+                                "okeanos"
+                            ]
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

docker-compose/device-pcc.yml

@@ -21,7 +21,6 @@ services:
         - ${TANGO_LOFAR_CONTAINER_MOUNT}
     environment:
       - TANGO_HOST=${TANGO_HOST}
-    user: ${CONTAINER_EXECUTION_UID}
     entrypoint:
       - /usr/local/bin/wait-for-it.sh
       - ${TANGO_HOST}

docker-compose/device-sdp.yml

@@ -21,7 +21,6 @@ services:
         - ${TANGO_LOFAR_CONTAINER_MOUNT}
     environment:
       - TANGO_HOST=${TANGO_HOST}
-    user: ${CONTAINER_EXECUTION_UID}
     entrypoint:
       - /usr/local/bin/wait-for-it.sh
       - ${TANGO_HOST}

docker-compose/itango.yml

@@ -28,7 +28,6 @@ services:
       - TANGO_HOST=${TANGO_HOST}
       - XAUTHORITY=${XAUTHORITY}
       - DISPLAY=${DISPLAY}
-    user: ${CONTAINER_EXECUTION_UID}
     stdin_open: true
     tty: true
     entrypoint:

lib/archiver.py

+#! /usr/bin/env python3
+
+from .lofar2_config import configure_logging
+from tango import DeviceProxy
+
+
+def add_attribute_to_archiver(attribute: str, polling_period: float, event_period: float, archive_manager: str = 'archiving/hdbpp/confmanager01', archiver: str = 'archiving/hdbpp/eventsubscriber01'):
+    am = DeviceProxy(archive_manager)
+    am.write_attribute('SetAttributeName', attribute)
+    am.write_attribute('SetArchiver', archiver)
+    am.write_attribute('SetStrategy', 'ALWAYS')
+    am.write_attribute('SetPollingPeriod', int(polling_period))
+    am.write_attribute('SetPeriodEvent', int(event_period))
+    am.AttributeAdd()
+    am.AttributeStart(attribute)
+
+def remove_attribute_from_archiver(attribute: str, archive_manager: str = 'archiving/hdbpp/confmanager01'):
+    am = DeviceProxy(archive_manager)
+    am.AttributeStop(attribute)
+    am.AttributeRemove(attribute)