Skip to content
Snippets Groups Projects
Commit ebbb04da authored by Jan David Mol's avatar Jan David Mol
Browse files

L2SS-358: Load simulators by default, and describe how to load different stock... 

L2SS-358: Load simulators by default, and describe how to load different stock station configurations
parent f426d37e
No related branches found
No related tags found
1 merge request!157L2SS-358: Get ready for Darkrai
Hide whitespace changes
Inline Side-by-side
CDB/apsct-sim-config.json deleted 100644 → 0
+ 0
− 23
View file @ f426d37e
{
"servers": {
"APSCT": {
"LTS": {
"APSCT": {
"LTS/APSCT/1": {
"properties": {
"OPC_Server_Name": [
"apsct-sim"
],
"OPC_Server_Port": [
"4843"
],
"OPC_Time_Out": [
"5.0"
]
}
}
}
}
}
}
}
CDB/apspu-sim-config.json deleted 100644 → 0
+ 0
− 23
View file @ f426d37e
{
"servers": {
"APSPU": {
"LTS": {
"APSPU": {
"LTS/APSPU/1": {
"properties": {
"OPC_Server_Name": [
"apspu-sim"
],
"OPC_Server_Port": [
"4843"
],
"OPC_Time_Out": [
"5.0"
]
}
}
}
}
}
}
}
CDB/recv-sim-config.json deleted 100644 → 0
+ 0
− 23
View file @ f426d37e
{
"servers": {
"RECV": {
"LTS": {
"RECV": {
"LTS/RECV/1": {
"properties": {
"OPC_Server_Name": [
"recv-sim"
],
"OPC_Server_Port": [
"4840"
],
"OPC_Time_Out": [
"5.0"
]
}
}
}
}
}
}
}
CDB/sdp-sim-config.json → CDB/stations/simulators_configDb.json
+ 137
− 0
View file @ ebbb04da
{ {
"servers": { "servers": {
"APSCT": {
"LTS": {
"APSCT": {
"LTS/APSCT/1": {
"properties": {
"OPC_Server_Name": [
"apsct-sim"
],
"OPC_Server_Port": [
"4843"
],
"OPC_Time_Out": [
"5.0"
]
}
}
}
}
},
"APSPU": {
"LTS": {
"APSPU": {
"LTS/APSPU/1": {
"properties": {
"OPC_Server_Name": [
"apspu-sim"
],
"OPC_Server_Port": [
"4843"
],
"OPC_Time_Out": [
"5.0"
]
}
}
}
}
},
"RECV": {
"LTS": {
"RECV": {
"LTS/RECV/1": {
"properties": {
"OPC_Server_Name": [
"recv-sim"
],
"OPC_Server_Port": [
"4840"
],
"OPC_Time_Out": [
"5.0"
]
}
}
}
}
},
"SDP": { "SDP": {
"LTS": { "LTS": {
"SDP": { "SDP": {
...@@ -56,6 +113,25 @@ ...@@ -56,6 +113,25 @@
} }
} }
} }
},
"UNB2": {
"LTS": {
"UNB2": {
"LTS/UNB2/1": {
"properties": {
"OPC_Server_Name": [
"unb2-sim"
],
"OPC_Server_Port": [
"4841"
],
"OPC_Time_Out": [
"5.0"
]
}
}
}
}
} }
} }
} }
CDB/unb2-sim-config.json deleted 100644 → 0
+ 0
− 23
View file @ f426d37e
{
"servers": {
"UNB2": {
"LTS": {
"UNB2": {
"LTS/UNB2/1": {
"properties": {
"OPC_Server_Name": [
"unb2-sim"
],
"OPC_Server_Port": [
"4841"
],
"OPC_Time_Out": [
"5.0"
]
}
}
}
}
}
}
}
docker-compose/Makefile
+ 1
− 0
View file @ ebbb04da
...@@ -159,6 +159,7 @@ bootstrap: pull build # first start, initialise from scratch ...@@ -159,6 +159,7 @@ bootstrap: pull build # first start, initialise from scratch
$(MAKE) start dsconfig # boot up containers to load configurations $(MAKE) start dsconfig # boot up containers to load configurations
sleep 5 # wait for dsconfig container to come up sleep 5 # wait for dsconfig container to come up
../sbin/update_ConfigDb.sh ../CDB/LOFAR_ConfigDb.json # load default configuration ../sbin/update_ConfigDb.sh ../CDB/LOFAR_ConfigDb.json # load default configuration
../sbin/update_ConfigDb.sh ../CDB/simulators_ConfigDb.json # by default, use simulators
start: up ## start a service (usage: make start <servicename>) start: up ## start a service (usage: make start <servicename>)
if [ $(UNAME_S) = Linux ]; then touch ~/.Xauthority; chmod a+r ~/.Xauthority; fi if [ $(UNAME_S) = Linux ]; then touch ~/.Xauthority; chmod a+r ~/.Xauthority; fi
......
docs/source/configure_station.rst
+ 7
− 1
View file @ ebbb04da
Enter your LOFAR2.0 Hardware Configuration Enter your LOFAR2.0 Hardware Configuration
=========================================== ===========================================
The software will need to be told various aspects of your station configuration, for example, the hostnames of the station hardware to control. The following settings are installation specific, and are stored as *properties* in the :ref:`tangodb`. The format used here is ``device.property``: The software will need to be told various aspects of your station configuration, for example, the hostnames of the station hardware to control. The following settings are installation specific, and are stored as *properties* in the :ref:`tangodb`.
Stock configurations are provided for several stations, as well as using simulators to simulate the station's interface (which is the default after bootstrapping a station). These are provided in the ``CDB/stations/`` directory, and can be loaded using for example::
sbin/update_ConfigDb.sh CDB/stations/LTS_ConfigDb.json
The following sections describe the settings that are station dependent, and thus must or can be set.
Mandatory settings Mandatory settings
------------------- -------------------
......
docs/source/installation.rst
+ 1
− 7
View file @ ebbb04da
...@@ -20,13 +20,7 @@ Next, we bootstrap the system. This will build our docker images, start key ones ...@@ -20,13 +20,7 @@ Next, we bootstrap the system. This will build our docker images, start key ones
cd docker-compose cd docker-compose
make bootstrap make bootstrap
If you lack access to LOFAR station hardware, load additional configurations to use the simulators instead:: If you do have access to LOFAR station hardware, you must upload its configuration to the configuration database. See :doc:`configure_station`.
for sim in ../CDB/*-sim-config.json; do
../sbin/update_ConfigDb.sh ../CDB${sim}-config.json
done
If you do have access to LOFAR station hardware, you will have to :doc:`configure_station`.
Now we are ready to start the other containers:: Now we are ready to start the other containers::
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment