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

Merge branch 'master' of https://git.astron.nl/lofar2.0/tango into... 

Merge branch 'master' of https://git.astron.nl/lofar2.0/tango into L2SS-1220-expose-whether-opcua-hardware-can-be-reached
parents 035ebc56 58047a9d
Branches
Tags
1 merge request!576L2SS-1220 added connection test attribute
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 1058 additions and 30 deletions
.gitlab-ci.yml
+ 1
− 1
View file @ c5167959
......@@ -439,7 +439,7 @@ publish_on_gitlab:
- if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) || $CI_COMMIT_TAG
before_script:
- apt-get update
- apt-get install ansible -y
- apt-get install ansible openssh-client -y
# Use Gitlab protected variable to provide key
- echo "$DEPLOY_KEY" > id_rsa
- chmod 400 id_rsa
......
CDB/LOFAR_ConfigDb.json
+ 7
− 0
View file @ c5167959
......@@ -59,6 +59,13 @@
"STAT/RCU2H/1"
]
}
},
"STAT/AntennaField/LBA": {
"properties": {
"RECV_devices": [
"STAT/RCU2L/1"
]
}
}
}
}
......
CDB/README.md
+ 1
− 0
View file @ c5167959
......@@ -12,6 +12,7 @@ The following files are provided:
| File | Description | Usage |
|--------------------------------------------|-------------------------------------------------------------|---------------------|
| `LOFAR_ConfigDb.json` | Generic base configuration, registering all of the devices. | Always |
| `hierarchies/power.json` | Power Hierarchy configuration. | Always |
| `test_environment_ConfigDb.json` | Base delta for the unit- and integration test suites. | Tests & development |
| `stations/simulators_ConfigDb.json` | A "station" configuration that points to our simulators. | Tests & development |
| `stations/dummy_positions_ConfigDb.json` | An antenna configuration, just to have one (it's CS001). | Tests & development |
......
CDB/hierarchies/power.json 0 → 100644
+ 277
− 0
View file @ c5167959
{
"servers": {
"StationManager": {
"STAT": {
"StationManager": {
"STAT/StationManager/1": {
"properties": {
"Power_Children": [
"STAT/PSOC/1",
"STAT/PCON/1",
"STAT/Configuration/1",
"STAT/ObservationControl/1",
"STAT/TemperatureManager/1",
"STAT/Docker/1"
]
}
}
}
}
},
"PSOC": {
"STAT": {
"PSOC": {
"STAT/PSOC/1": {
"properties": {
"Power_Parent": [
"STAT/StationManager/1"
],
"Power_Children": [
"STAT/CCD/1",
"STAT/SDP/1"
]
}
}
}
}
},
"PCON": {
"STAT": {
"PCON": {
"STAT/PCON/1": {
"properties": {
"Power_Parent": [
"STAT/StationManager/1"
],
"Power_Children": [
"STAT/APSPU/1",
"STAT/AntennaField/HBA"
]
}
}
}
}
},
"APSCT": {
"STAT": {
"APSCT": {
"STAT/APSCT/1": {
"properties": {
"Power_Parent": [
"STAT/APSPU/1"
]
}
}
}
}
},
"CCD": {
"STAT": {
"CCD": {
"STAT/CCD/1": {
"properties": {
"Power_Parent": [
"STAT/PSOC/1"
]
}
}
}
}
},
"AntennaField": {
"STAT": {
"AntennaField": {
"STAT/AntennaField/HBA": {
"properties": {
"Power_Parent": [
"STAT/PCON/1"
]
}
}
}
}
},
"APSPU": {
"STAT": {
"APSPU": {
"STAT/APSPU/1": {
"properties": {
"Power_Parent": [
"STAT/PCON/1"
],
"Power_Children": [
"STAT/APSCT/1",
"STAT/UNB2/1",
"STAT/RCU2H/1",
"STAT/RCU2L/1"
]
}
}
}
}
},
"RCU2H": {
"STAT": {
"RCU2H": {
"STAT/RCU2H/1": {
"properties": {
"Power_Parent": [
"STAT/APSPU/1"
]
}
}
}
}
},
"RCU2L": {
"STAT": {
"RCU2L": {
"STAT/RCU2L/1": {
"properties": {
"Power_Parent": [
"STAT/APSPU/1"
]
}
}
}
}
},
"SDP": {
"STAT": {
"SDP": {
"STAT/SDP/1": {
"properties": {
"Power_Parent": [
"STAT/PSOC/1"
],
"Power_Children": [
"STAT/Beamlet/1",
"STAT/BST/1",
"STAT/SST/1",
"STAT/XST/1"
]
}
}
}
}
},
"UNB2": {
"STAT": {
"UNB2": {
"STAT/UNB2/1": {
"properties": {
"Power_Parent": [
"STAT/APSPU/1"
]
}
}
}
}
},
"Beamlet": {
"STAT": {
"Beamlet": {
"STAT/Beamlet/1": {
"properties": {
"Power_Parent": [
"STAT/SDP/1"
]
}
}
}
}
},
"BST": {
"STAT": {
"BST": {
"STAT/BST/1": {
"properties": {
"Power_Parent": [
"STAT/SDP/1"
]
}
}
}
}
},
"SST": {
"STAT": {
"SST": {
"STAT/SST/1": {
"properties": {
"Power_Parent": [
"STAT/SDP/1"
]
}
}
}
}
},
"XST": {
"STAT": {
"XST": {
"STAT/XST/1": {
"properties": {
"Power_Parent": [
"STAT/SDP/1"
]
}
}
}
}
},
"Configuration": {
"STAT": {
"Configuration": {
"STAT/Configuration/1": {
"properties": {
"Power_Parent": [
"STAT/StationManager/1"
]
}
}
}
}
},
"ObservationControl": {
"STAT": {
"ObservationControl": {
"STAT/ObservationControl/1": {
"properties": {
"Power_Parent": [
"STAT/StationManager/1"
]
}
}
}
}
},
"TemperatureManager": {
"STAT": {
"TemperatureManager": {
"STAT/TemperatureManager/1": {
"properties": {
"Power_Parent": [
"STAT/StationManager/1"
]
}
}
}
}
},
"Docker": {
"STAT": {
"Docker": {
"STAT/Docker/1": {
"properties": {
"Power_Parent": [
"STAT/StationManager/1"
]
}
}
}
}
}
}
}
\ No newline at end of file
CDB/stations/DTS_ConfigDb.json
+ 749
− 27
View file @ c5167959
This diff is collapsed.
README.md
+ 6
− 1
View file @ c5167959
......@@ -115,6 +115,11 @@ Next change the version in the following places:
# Release Notes
* 0.16.2 Add Power_Parent and Parent_Children properties in LOFAR devices
* 0.16.1 AntennaField: Do not put device in FAULT if an attribute cannot be read/written.
AntennaField: Avoid archiving HBA-specific attributes for LBA fields.
* 0.16.0 Observation: Removed antenna mask from specification
DigitalBeam: Removed beamlet and antenna selection
* 0.15.0 Split `recv` device into `rcu2h` and `rcu2l` and
split `recv-sim` translator into `rcu2h-sim` and `rcu2l-sim`
* 0.14.0 Create async device base and make tilebeam and digitalbeam async device servers,
......
docker-compose/Makefile
+ 1
− 0
View file @ c5167959
......@@ -223,6 +223,7 @@ bootstrap: pull build # first start, initialise from scratch
$(MAKE) start dsconfig # boot up containers to load configurations
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/hierarchies/power.json # load power hierarchy
../sbin/update_ConfigDb.sh ../CDB/stations/simulators_ConfigDb.json # by default, use simulators
start: up ## start a service (usage: make start <servicename>)
......
docker-compose/apsct-sim.yml
+ 1
− 0
View file @ c5167959
......@@ -15,6 +15,7 @@ services:
args:
- LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
- LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR}
hostname: apsct-sim
container_name: apsct-sim
logging:
driver: "json-file"
......
docker-compose/apspu-sim.yml
+ 1
− 0
View file @ c5167959
......@@ -15,6 +15,7 @@ services:
args:
- LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
- LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR}
hostname: apspu-sim
container_name: apspu-sim
logging:
driver: "json-file"
......
docker-compose/ccd-sim.yml
+ 1
− 0
View file @ c5167959
......@@ -15,6 +15,7 @@ services:
args:
- LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
- LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR}
hostname: ccd-sim
container_name: ccd-sim
logging:
driver: "json-file"
......
docker-compose/device-antennafield.yml
+ 1
− 0
View file @ c5167959
......@@ -18,6 +18,7 @@ version: '2.1'
services:
device-antennafield:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
hostname: device-antennafield
container_name: device-antennafield
logging:
driver: "json-file"
......
docker-compose/device-apsct.yml
+ 1
− 0
View file @ c5167959
......@@ -17,6 +17,7 @@ version: '2.1'
services:
device-apsct:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
hostname: device-apsct
container_name: device-apsct
logging:
driver: "json-file"
......
docker-compose/device-apspu.yml
+ 1
− 0
View file @ c5167959
......@@ -17,6 +17,7 @@ version: '2.1'
services:
device-apspu:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
hostname: device-apspu
container_name: device-apspu
logging:
driver: "json-file"
......
docker-compose/device-beamlet.yml
+ 1
− 0
View file @ c5167959
......@@ -17,6 +17,7 @@ version: '2.1'
services:
device-beamlet:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
hostname: device-beamlet
container_name: device-beamlet
logging:
driver: "json-file"
......
docker-compose/device-boot.yml
+ 1
− 0
View file @ c5167959
......@@ -16,6 +16,7 @@ version: '2.1'
services:
device-boot:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
hostname: device-boot
container_name: device-boot
logging:
driver: "json-file"
......
docker-compose/device-bst.yml
+ 4
− 1
View file @ c5167959
......@@ -17,6 +17,7 @@ version: '2.1'
services:
device-bst:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
hostname: device-bst
container_name: device-bst
logging:
driver: "json-file"
......@@ -27,8 +28,10 @@ services:
- control
- data
ports:
- "5003:5003/udp" # port to receive SST UDP packets on
- "5003:5003/udp" # port to receive SST UDP packets on (first antennafield)
- "5103:5103/tcp" # port to emit SST TCP packets on
- "5013:5013/udp" # port to receive SST UDP packets on (second antennafield)
- "5113:5113/tcp" # port to emit SST TCP packets on
- "5717:5717" # unique port for this DS
- "5817:5817" # ZeroMQ event port
- "5917:5917" # ZeroMQ heartbeat port
......
docker-compose/device-calibration.yml
+ 1
− 0
View file @ c5167959
......@@ -17,6 +17,7 @@ version: '2.1'
services:
device-calibration:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
hostname: device-calibration
container_name: device-calibration
logging:
driver: "json-file"
......
docker-compose/device-ccd.yml
+ 1
− 0
View file @ c5167959
......@@ -17,6 +17,7 @@ version: '2.1'
services:
device-ccd:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
hostname: device-ccd
container_name: device-ccd
logging:
driver: "json-file"
......
docker-compose/device-configuration.yml
+ 1
− 0
View file @ c5167959
......@@ -17,6 +17,7 @@ version: '2.1'
services:
device-configuration:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
hostname: device-configuration
container_name: device-configuration
logging:
driver: "json-file"
......
docker-compose/device-digitalbeam.yml
+ 1
− 0
View file @ c5167959
......@@ -17,6 +17,7 @@ version: '2.1'
services:
device-digitalbeam:
image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
hostname: device-digitalbeam
container_name: device-digitalbeam
logging:
driver: "json-file"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment