Merge branch 'L2SS-2120-fixed-stingray-ip-port' into 'master'

Resolve L2SS-2120 "Static stingray ip port"

Closes L2SS-2120

See merge request !1039

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"
               ],

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"
               ],

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"
               ],

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)

infra/station/cni/statisticsnet.conflist

+{
+    "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"
+        }
+    ]
+}

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

tangostationcontrol/VERSION

-0.45.8
+0.45.9

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