Merge branch 'L2SS-472-fix-devices' into 'master'

Resolve L2SS-472 "Fix devices"

Closes L2SS-472

See merge request !181

CDB/LOFAR_ConfigDb.json

 {
     "servers": {
-        "docker_device": {
+        "Docker": {
             "STAT": {
                 "Docker": {
                     "STAT/Docker/1": {}
@@ -14,7 +14,7 @@
                 }
             }
         },
-        "observation_control": {
+        "ObservationControl": {
             "STAT": {
                 "ObservationControl": {
                     "STAT/ObservationControl/1": {}

CDB/stations/simulators_ConfigDb.json

@@ -28,7 +28,7 @@
                                 "apspu-sim"
                             ],
                             "OPC_Server_Port": [
-                                "4843"
+                                "4842"
                             ],
                             "OPC_Time_Out": [
                                 "5.0"

docker-compose/device-apsct.yml

@@ -37,5 +37,5 @@ services:
       - bin/start-ds.sh
       # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
       # can't know about our Docker port forwarding
-      - l2ss-apspu Apsct STAT -v  -v -ORBendPoint giop:tcp:0:5709 -ORBendPointPublish giop:tcp:${HOSTNAME}:5709
+      - l2ss-apsct Apsct STAT -v  -v -ORBendPoint giop:tcp:0:5709 -ORBendPointPublish giop:tcp:${HOSTNAME}:5709
     restart: on-failure

tangostationcontrol/tangostationcontrol/common/lofar_logging.py

@@ -150,7 +150,7 @@ def configure_logger(logger: logging.Logger=None, log_extra=None, debug=False):
         from logstash_async.handler import AsynchronousLogstashHandler, LogstashFormatter
 
         # log to the tcp_input of logstash in our ELK stack
-        handler = AsynchronousLogstashHandler("elk", 5959, database_path='pending_log_messages.db')
+        handler = AsynchronousLogstashHandler("elk", 5959, database_path='/tmp/lofar_pending_log_messages.db')
 
         # configure log messages
         formatter = LogstashFormatter(extra=log_extra, tags=["python", "lofar"])

tangostationcontrol/tangostationcontrol/devices/apsct.py

@@ -14,7 +14,7 @@
 # PyTango imports
 from tango import DebugIt
 from tango.server import run, command
-from tango import AttrWriteType
+from tango import AttrWriteType, DevState
 import numpy
 # Additional import
 

tangostationcontrol/tangostationcontrol/devices/boot.py

@@ -21,9 +21,9 @@ from tango import AttrWriteType, DeviceProxy, DevState
 # Additional import
 import numpy
 
-from device_decorators import *
+from tangostationcontrol.devices.device_decorators import *
 
-from tangostationcontrol.common.entry import entry
+from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.devices.lofar_device import lofar_device
 from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions
 

tangostationcontrol/tangostationcontrol/devices/docker_device.py

@@ -19,7 +19,7 @@ import numpy
 import asyncio
 # Additional import
 
-from device_decorators import *
+from tangostationcontrol.devices.device_decorators import *
 
 # Additional import
 from tangostationcontrol.common.entrypoint import entry

tangostationcontrol/tangostationcontrol/devices/recv.py

@@ -15,7 +15,7 @@
 from tango import DebugIt
 from tango.server import run, command
 from tango.server import device_property, attribute
-from tango import AttrWriteType
+from tango import AttrWriteType, DevState
 import numpy
 
 # Additional import

tangostationcontrol/tangostationcontrol/devices/unb2.py

@@ -14,7 +14,7 @@
 # PyTango imports
 from tango.server import run, command
 from tango.server import device_property, attribute
-from tango import AttrWriteType, DebugIt
+from tango import AttrWriteType, DebugIt, DevState
 # Additional import
 
 from tangostationcontrol.common.entrypoint import entry