Skip to content
Snippets Groups Projects
Commit f70e5499 authored by Taya Snijder's avatar Taya Snijder
Browse files

more renaming

parent 550a3c03
No related branches found
No related tags found
Loading
......@@ -41,10 +41,10 @@
}
}
},
"PDU": {
"PSOC": {
"STAT": {
"PDU": {
"STAT/PDU/1": {
"PSOC": {
"STAT/PSOC/1": {
"properties": {
"SNMP_host": ["10.87.2.145"],
"SNMP_community": ["public"],
......
......@@ -8,8 +8,8 @@ volumes:
iers-data: {}
services:
device-pdu:
image: device-pdu
device-psoc:
image: device-psoc
# build explicitly, as docker-compose does not understand a local image
# being shared among services.
build:
......@@ -17,7 +17,7 @@ services:
dockerfile: docker-compose/lofar-device-base/Dockerfile
args:
SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}device-pdu
container_name: ${CONTAINER_NAME_PREFIX}device-psoc
logging:
driver: "json-file"
options:
......@@ -38,5 +38,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-pdu PDU STAT -v -ORBendPoint giop:tcp:device-pdu:5714 -ORBendPointPublish giop:tcp:${HOSTNAME}:5714
- l2ss-psoc PSOC STAT -v -ORBendPoint giop:tcp:device-psoc:5714 -ORBendPointPublish giop:tcp:${HOSTNAME}:5714
restart: unless-stopped
......@@ -9,7 +9,7 @@ xst = DeviceProxy("STAT/XST/1")
unb2 = DeviceProxy("STAT/UNB2/1")
boot = DeviceProxy("STAT/Boot/1")
tilebeam = DeviceProxy("STAT/TileBeam/1")
pdu = DeviceProxy("STAT/PDU/1")
psoc = DeviceProxy("STAT/PSOC/1")
beamlet = DeviceProxy("STAT/Beamlet/1")
digitalbeam = DeviceProxy("STAT/DigitalBeam/1")
antennafield = DeviceProxy("STAT/AntennaField/1")
......
......@@ -29,7 +29,7 @@
},
"STAT/Docker/1": {
},
"STAT/PDU/1": {
"STAT/PSOC/1": {
},
"STAT/RECV/1": {
"include": [
......
......@@ -69,7 +69,7 @@ sleep 1 # dsconfig container must be up and running...
# shellcheck disable=SC2016
echo '/usr/local/bin/wait-for-it.sh ${TANGO_HOST} --strict --timeout=300 -- true' | make run dsconfig bash -
DEVICES="device-boot device-apsct device-apspu device-sdp device-recv device-bst device-sst device-unb2 device-xst device-beamlet device-digitalbeam device-tilebeam device-pdu device-antennafield device-temperature-manager device-observation"
DEVICES="device-boot device-apsct device-apspu device-sdp device-recv device-bst device-sst device-unb2 device-xst device-beamlet device-digitalbeam device-tilebeam device-psoc device-antennafield device-temperature-manager device-observation"
SIMULATORS="sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim"
# Build only the required images, please do not build everything that makes CI
......
.. _pdu:
.. _psoc:
PDU
PSOC
====================
The ``pdu == DeviceProxy("STAT/PDU/1")`` device controls the Power Distribution
Unit (PDU)
The ``psoc == DeviceProxy("STAT/PSOC/1")`` device controls the Power Distribution
Unit (PSOC)
......@@ -25,7 +25,7 @@ Even without having access to any LOFAR2.0 hardware, you can install the full st
devices/antennafield
devices/boot
devices/docker
devices/pdu
devices/psoc
devices/recv
devices/sdp
devices/bst-sst-xst
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment