diff --git a/CDB/stations/hba_core.json b/CDB/stations/hba_core.json
index f42b1840873808d3aa1a6ad3f2b60c0af1b63bc6..32fd2fb13a503bb6502f64b087984ed026cd87b1 100644
--- a/CDB/stations/hba_core.json
+++ b/CDB/stations/hba_core.json
@@ -561,9 +561,6 @@
"BST": {
"STAT/BST/HBA0": {
"properties": {
- "Statistics_Client_UDP_Port": [
- "5113"
- ],
"Statistics_Client_Hostname": [
"stingray-hba0-bst-udp.service.consul"
],
@@ -598,9 +595,6 @@
},
"STAT/BST/HBA1": {
"properties": {
- "Statistics_Client_UDP_Port": [
- "5123"
- ],
"Statistics_Client_Hostname": [
"stingray-hba1-bst-udp.service.consul"
],
@@ -641,9 +635,6 @@
"SST": {
"STAT/SST/HBA0": {
"properties": {
- "Statistics_Client_UDP_Port": [
- "5111"
- ],
"Statistics_Client_Hostname": [
"stingray-hba0-sst-udp.service.consul"
],
@@ -660,9 +651,6 @@
},
"STAT/SST/HBA1": {
"properties": {
- "Statistics_Client_UDP_Port": [
- "5121"
- ],
"Statistics_Client_Hostname": [
"stingray-hba1-sst-udp.service.consul"
],
@@ -685,9 +673,6 @@
"XST": {
"STAT/XST/HBA0": {
"properties": {
- "Statistics_Client_UDP_Port": [
- "5112"
- ],
"Statistics_Client_Hostname": [
"stingray-hba0-xst-udp.service.consul"
],
@@ -722,9 +707,6 @@
},
"STAT/XST/HBA1": {
"properties": {
- "Statistics_Client_UDP_Port": [
- "5122"
- ],
"Statistics_Client_Hostname": [
"stingray-hba1-xst-udp.service.consul"
],
diff --git a/CDB/stations/hba_remote.json b/CDB/stations/hba_remote.json
index 4799755570c5c94a73fc009da5705f8b906d8c35..62ea9ce99db250079d1df3904c4bbcbf78838375 100644
--- a/CDB/stations/hba_remote.json
+++ b/CDB/stations/hba_remote.json
@@ -327,9 +327,6 @@
"BST": {
"STAT/BST/HBA": {
"properties": {
- "Statistics_Client_UDP_Port": [
- "5113"
- ],
"Statistics_Client_Hostname": [
"stingray-hba-bst-udp.service.consul"
],
@@ -370,9 +367,6 @@
"SST": {
"STAT/SST/HBA": {
"properties": {
- "Statistics_Client_UDP_Port": [
- "5111"
- ],
"Statistics_Client_Hostname": [
"stingray-hba-sst-udp.service.consul"
],
@@ -395,9 +389,6 @@
"XST": {
"STAT/XST/HBA": {
"properties": {
- "Statistics_Client_UDP_Port": [
- "5112"
- ],
"Statistics_Client_Hostname": [
"stingray-hba-xst-udp.service.consul"
],
diff --git a/CDB/stations/lba.json b/CDB/stations/lba.json
index a58a7b938a7f6737991748a87391ca91ca5f98fc..05b838381c90a04eef9f55284522249875984a83 100644
--- a/CDB/stations/lba.json
+++ b/CDB/stations/lba.json
@@ -354,9 +354,6 @@
"BST": {
"STAT/BST/LBA": {
"properties": {
- "Statistics_Client_UDP_Port": [
- "5103"
- ],
"Statistics_Client_Hostname": [
"stingray-lba-bst-udp.service.consul"
],
@@ -397,9 +394,6 @@
"SST": {
"STAT/SST/LBA": {
"properties": {
- "Statistics_Client_UDP_Port": [
- "5101"
- ],
"Statistics_Client_Hostname": [
"stingray-lba-sst-udp.service.consul"
],
@@ -422,9 +416,6 @@
"XST": {
"STAT/XST/LBA": {
"properties": {
- "Statistics_Client_UDP_Port": [
- "5102"
- ],
"Statistics_Client_Hostname": [
"stingray-lba-xst-udp.service.consul"
],
diff --git a/README.md b/README.md
index 69f4e7123cfa9627a7b8033e4a0f85850682130b..4b1b954a98c93de7701bb106faf61d33bb6d01ff 100644
--- a/README.md
+++ b/README.md
@@ -150,6 +150,7 @@ Next change the version in the following places:
through [https://git.astron.nl/lofar2.0/tango/-/tags](Deploy Tags)
# Release Notes
+* 0.45.9 Support static IPs for Stingray jobs to receive UDP packets on
* 0.45.8 Fix timestamp timezone in metadata JSON
* 0.45.7 Fix casacore building by version pinning
* 0.45.6 Add Added Reflection to be used with grpcui (use grpcui -plaintext localhost:50051)
diff --git a/infra/station/cni/statisticsnet.conflist b/infra/station/cni/statisticsnet.conflist
new file mode 100644
index 0000000000000000000000000000000000000000..6b9ce489a10b5ab87176e2ae1a90a046727c3aa5
--- /dev/null
+++ b/infra/station/cni/statisticsnet.conflist
@@ -0,0 +1,27 @@
+{
+ "cniVersion": "0.4.0",
+ "name": "statistics",
+ "plugins": [
+ {
+ "type": "ovs",
+ "bridge": "br0",
+ "configuration_path": "/opt/cni/net.d/ovs.d/ovs.conf",
+ "isDefaultGateway": true,
+ "ipMasq": true,
+ "hairpinMode": true,
+ "vlan": 999,
+ "mtu": 9000,
+ "ipam": {
+ "type": "static",
+ "addresses": [
+ ],
+ "routes": [
+ { "dst": "0.0.0.0/0" }
+ ]
+ }
+ },
+ {
+ "type": "firewall"
+ }
+ ]
+}
diff --git a/infra/station/nomad.yml b/infra/station/nomad.yml
index 5f9154b397524d39db3b49535fe7d3404954aacf..a079e0208cfb8df119ff0b67e98829152da41542 100644
--- a/infra/station/nomad.yml
+++ b/infra/station/nomad.yml
@@ -76,6 +76,9 @@
- ansible.builtin.copy:
src: cni/stationnet.conflist
dest: /opt/cni/config/stationnet.conflist
+ - ansible.builtin.copy:
+ src: cni/stastisticsnet.conflist
+ dest: /opt/cni/config/statisticsnet.conflist
- ansible.builtin.copy:
src: cni/ovs.conf
dest: /opt/cni/net.d/ovs.d/ovs.conf
diff --git a/tangostationcontrol/VERSION b/tangostationcontrol/VERSION
index 9d7e3b32c9ad306479b83008a11142c4167520b4..631073f6bf1082b80b87bb9cab63c2eac8e765c5 100644
--- a/tangostationcontrol/VERSION
+++ b/tangostationcontrol/VERSION
@@ -1 +1 @@
-0.45.8
+0.45.9
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/statistics.py b/tangostationcontrol/tangostationcontrol/devices/sdp/statistics.py
index 116021c9d9a2154561bba4c842a19f9fed56ba8c..bff5e860be1d67eb352d4b8d0be6cd701138c028 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/statistics.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/statistics.py
@@ -37,7 +37,9 @@ class Statistics(OPCUADevice):
# Device Properties
# -----------------
- Statistics_Client_UDP_Port = device_property(dtype="DevUShort", mandatory=True)
+ Statistics_Client_UDP_Port = device_property(
+ dtype="DevUShort", mandatory=False, default_value=5001
+ )
Statistics_Client_ZMQ_Port = device_property(
dtype="DevUShort", mandatory=False, default_value=6001