L2SS-358: Added APSCT and APSPU devices, their simulators. Added a common base...

L2SS-358: Added APSCT and APSPU devices, their simulators. Added a common base image for the pypcc2 simulators. Separated station-dependend configs into separate CDB files. Added OPC-UA node path prefix to support instances with different paths to their nodes.

docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py

 # Create shortcuts for our devices
+apsct = DeviceProxy("LTS/APSCT/1")
+apspu = DeviceProxy("LTS/APSPU/1")
 recv = DeviceProxy("LTS/RECV/1")
 sdp = DeviceProxy("LTS/SDP/1")
 sst = DeviceProxy("LTS/SST/1")
@@ -8,4 +10,4 @@ boot = DeviceProxy("LTS/Boot/1")
 docker = DeviceProxy("LTS/Docker/1")
 
 # Put them in a list in case one wants to iterate
-devices = [recv, sdp, sst, xst, unb2, boot, docker]
+devices = [apsct, apspu, ecv, sdp, sst, xst, unb2, boot, docker]

docker-compose/recv-sim.yml

@@ -9,12 +9,9 @@ version: '2'
 services:
   recv-sim:
     build:
-        context: recv-sim
+        context: pypcc-sim-base
     container_name: ${CONTAINER_NAME_PREFIX}recv-sim
     networks:
       - control
-    volumes:
-        - ${HOME}:/hosthome
-    ports:
-        - "4843:4843"
-    restart: unless-stopped
+    entrypoint: python3 pypcc2.py --simulator --port 4840 --config RECVTR
+    restart: on-failure

docker-compose/recv-sim/Dockerfile

-FROM ubuntu:20.04
-
-COPY requirements.txt /requirements.txt
-
-RUN apt-get update && apt-get install -y python3 python3-pip python3-yaml git && \
-    pip3 install -r requirements.txt && \
-    git clone --depth 1 --branch master https://git.astron.nl/lofar2.0/pypcc
-
-WORKDIR /pypcc
-CMD ["python3","pypcc2.py","--simulator","--port","4843"]

docker-compose/recv-sim/requirements.txt

-opcua
-numpy
-recordclass>=0.16,<0.16.1
\ No newline at end of file

docker-compose/sdptr-sim.yml

@@ -13,6 +13,4 @@ services:
     container_name: ${CONTAINER_NAME_PREFIX}sdptr-sim
     networks:
       - control
-    ports:
-        - "4840:4840"
     restart: unless-stopped

docker-compose/unb2-sim.yml

@@ -9,12 +9,9 @@ version: '2'
 services:
   unb2-sim:
     build:
-        context: unb2-sim
+        context: pypcc-sim-base
     container_name: ${CONTAINER_NAME_PREFIX}unb2-sim
     networks:
       - control
-    volumes:
-        - ${HOME}:/hosthome
-    ports:
-        - "4844:4844"
-    restart: unless-stopped
+    entrypoint: python3 pypcc2.py --simulator --port 4841 --config UNB2
+    restart: on-failure

docker-compose/unb2-sim/Dockerfile

-FROM ubuntu:20.04
-
-COPY requirements.txt /requirements.txt
-
-RUN apt-get update && apt-get install -y python3 python3-pip python3-yaml git && \
-    pip3 install -r requirements.txt && \
-    git clone --depth 1 --branch master https://git.astron.nl/lofar2.0/pypcc
-
-WORKDIR /pypcc
-CMD ["python3","pypcc2.py","--simulator", "--port=4844", "--config=UNB2"]

docker-compose/unb2-sim/requirements.txt

-#check if this file is necessary
-opcua
-numpy
-recordclass>=0.16,<0.16.1
\ No newline at end of file

sbin/run_integration_test.sh

@@ -11,7 +11,7 @@ fi
 
 # Start and stop sequence
 cd "$LOFAR20_DIR/docker-compose" || exit 1
-make stop device-sdp device-recv device-sst device-unb2 device-xst sdptr-sim recv-sim unb2-sim
+make stop device-sdp device-recv device-sst device-unb2 device-xst sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim
 make start databaseds dsconfig jupyter elk
 
 # Give dsconfig and databaseds time to start
@@ -21,7 +21,7 @@ sleep 15
 "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/integration_ConfigDb.json
 
 cd "$LOFAR20_DIR/docker-compose" || exit 1
-make start sdptr-sim recv-sim unb2-sim
+make start sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim
 
 # Give the simulators time to start
 sleep 5