Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tango
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Commits
9e06b036
Commit
9e06b036
authored
3 years ago
by
Taya Snijder
Browse files
Options
Downloads
Patches
Plain Diff
small changes and updated the port number in more places
parent
f628d43b
No related branches found
No related tags found
1 merge request
!276
Resolve L2SS-655 "Add digitalbeam device"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CDB/stations/simulators_ConfigDb.json
+2
-2
2 additions, 2 deletions
CDB/stations/simulators_ConfigDb.json
docker-compose/device-digitalbeam.yml
+1
-1
1 addition, 1 deletion
docker-compose/device-digitalbeam.yml
sbin/run_integration_test.sh
+1
-1
1 addition, 1 deletion
sbin/run_integration_test.sh
with
4 additions
and
4 deletions
CDB/stations/simulators_ConfigDb.json
+
2
−
2
View file @
9e06b036
...
@@ -112,10 +112,10 @@
...
@@ -112,10 +112,10 @@
"STAT/DigitalBeam/1"
:
{
"STAT/DigitalBeam/1"
:
{
"properties"
:
{
"properties"
:
{
"OPC_Server_Name"
:
[
"OPC_Server_Name"
:
[
"d
i
be-sim"
"dbe
am
-sim"
],
],
"OPC_Server_Port"
:
[
"OPC_Server_Port"
:
[
"485
1
"
"485
2
"
],
],
"OPC_Time_Out"
:
[
"OPC_Time_Out"
:
[
"5.0"
"5.0"
...
...
This diff is collapsed.
Click to expand it.
docker-compose/device-digitalbeam.yml
+
1
−
1
View file @
9e06b036
...
@@ -43,5 +43,5 @@ services:
...
@@ -43,5 +43,5 @@ services:
-
bin/start-ds.sh
-
bin/start-ds.sh
# configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
# 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
# can't know about our Docker port forwarding
-
l2ss-digitalbeam DigitalBeam STAT -v -ORBendPoint giop:tcp:0:571
2
-ORBendPointPublish giop:tcp:${HOSTNAME}:571
2
-
l2ss-digitalbeam DigitalBeam STAT -v -ORBendPoint giop:tcp:0:571
3
-ORBendPointPublish giop:tcp:${HOSTNAME}:571
3
restart
:
unless-stopped
restart
:
unless-stopped
This diff is collapsed.
Click to expand it.
sbin/run_integration_test.sh
+
1
−
1
View file @
9e06b036
...
@@ -14,7 +14,7 @@ cd "$LOFAR20_DIR/docker-compose" || exit 1
...
@@ -14,7 +14,7 @@ cd "$LOFAR20_DIR/docker-compose" || exit 1
# Build only the required images, please do not build everything that makes CI
# Build only the required images, please do not build everything that makes CI
# take really long to finish, especially grafana / jupyter / prometheus.
# take really long to finish, especially grafana / jupyter / prometheus.
# jupyter is physically large > 2.5gb and overlayfs is really slow.
# 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-
tile
beam device-
digital
beam
make build device-sdp device-recv device-sst device-unb2 device-xst device-beamlet device-
digital
beam device-
tile
beam
make build sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim
make build sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim
make build databaseds dsconfig elk integration-test
make build databaseds dsconfig elk integration-test
make build archiver-timescale hdbppts-cm hdbppts-es
make build archiver-timescale hdbppts-cm hdbppts-es
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment