From 9e06b036bfd61e1b6151076bf0a8b56a89b20a0d Mon Sep 17 00:00:00 2001 From: thijs snijder <snijder@astron.nl> Date: Tue, 22 Mar 2022 09:00:52 +0100 Subject: [PATCH] small changes and updated the port number in more places --- CDB/stations/simulators_ConfigDb.json | 4 ++-- docker-compose/device-digitalbeam.yml | 2 +- sbin/run_integration_test.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CDB/stations/simulators_ConfigDb.json b/CDB/stations/simulators_ConfigDb.json index da2615b50..9ebc8a9d8 100644 --- a/CDB/stations/simulators_ConfigDb.json +++ b/CDB/stations/simulators_ConfigDb.json @@ -112,10 +112,10 @@ "STAT/DigitalBeam/1": { "properties": { "OPC_Server_Name": [ - "dibe-sim" + "dbeam-sim" ], "OPC_Server_Port": [ - "4851" + "4852" ], "OPC_Time_Out": [ "5.0" diff --git a/docker-compose/device-digitalbeam.yml b/docker-compose/device-digitalbeam.yml index ad7901452..81930a0f2 100644 --- a/docker-compose/device-digitalbeam.yml +++ b/docker-compose/device-digitalbeam.yml @@ -43,5 +43,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-digitalbeam DigitalBeam STAT -v -ORBendPoint giop:tcp:0:5712 -ORBendPointPublish giop:tcp:${HOSTNAME}:5712 + - l2ss-digitalbeam DigitalBeam STAT -v -ORBendPoint giop:tcp:0:5713 -ORBendPointPublish giop:tcp:${HOSTNAME}:5713 restart: unless-stopped diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh index c758b89ab..780faa73f 100755 --- a/sbin/run_integration_test.sh +++ b/sbin/run_integration_test.sh @@ -14,7 +14,7 @@ cd "$LOFAR20_DIR/docker-compose" || exit 1 # Build only the required images, please do not build everything that makes CI # take really long to finish, especially grafana / jupyter / prometheus. # jupyter is physically large > 2.5gb and overlayfs is really slow. -make build device-sdp device-recv device-sst device-unb2 device-xst device-beamlet device-tilebeam device-digitalbeam +make build device-sdp device-recv device-sst device-unb2 device-xst device-beamlet device-digitalbeam device-tilebeam make build sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim make build databaseds dsconfig elk integration-test make build archiver-timescale hdbppts-cm hdbppts-es -- GitLab