From ddc05fe0e7b8d8e07026beacada029083d587f7b Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Tue, 21 Sep 2021 19:48:37 +0000
Subject: [PATCH] L2SS-340: Add SST device to integration tests
---
CDB/integration_ConfigDb.json | 59 ++++++++++++++++++++-
devices/clients/udp_receiver.py | 2 +-
devices/devices/sdp/statistics_collector.py | 2 +-
sbin/run_integration_test.sh | 2 +-
4 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/CDB/integration_ConfigDb.json b/CDB/integration_ConfigDb.json
index cf113340e..a3e0bd8b0 100644
--- a/CDB/integration_ConfigDb.json
+++ b/CDB/integration_ConfigDb.json
@@ -91,9 +91,12 @@
"SST": {
"LTS/SST/1": {
"properties": {
- "SST_Client_Port": [
+ "Statistics_Client_UDP_Port": [
"5001"
],
+ "Statistics_Client_TCP_Port": [
+ "5002"
+ ],
"OPC_Server_Name": [
"sdptr-sim"
],
@@ -102,6 +105,60 @@
],
"OPC_Time_Out": [
"5.0"
+ ],
+ "FPGA_sst_offload_hdr_eth_destination_mac_RW_default": [
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de",
+ "6c:2b:59:97:cb:de"
+ ],
+ "FPGA_sst_offload_hdr_ip_destination_address_RW_default": [
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250",
+ "10.99.250.250"
+ ],
+ "FPGA_sst_offload_hdr_udp_destination_port_RW_default": [
+ "5001",
+ "5001",
+ "5001",
+ "5001",
+ "5001",
+ "5001",
+ "5001",
+ "5001",
+ "5001",
+ "5001",
+ "5001",
+ "5001",
+ "5001",
+ "5001",
+ "5001",
+ "5001"
]
}
}
diff --git a/devices/clients/udp_receiver.py b/devices/clients/udp_receiver.py
index b0717d36e..1968028c8 100644
--- a/devices/clients/udp_receiver.py
+++ b/devices/clients/udp_receiver.py
@@ -6,7 +6,7 @@ import logging
import socket
import time
-from devices.clients.statistics_client_thread import StatisticsClientThread
+from clients.statistics_client_thread import StatisticsClientThread
logger = logging.getLogger()
diff --git a/devices/devices/sdp/statistics_collector.py b/devices/devices/sdp/statistics_collector.py
index d4fea1a16..23a9b734c 100644
--- a/devices/devices/sdp/statistics_collector.py
+++ b/devices/devices/sdp/statistics_collector.py
@@ -4,7 +4,7 @@ import logging
import numpy
from .statistics_packet import SSTPacket
-from ...clients.statistics_client_thread import StatisticsClientThread
+from clients.statistics_client_thread import StatisticsClientThread
logger = logging.getLogger()
diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh
index d54163625..b2925b408 100755
--- a/sbin/run_integration_test.sh
+++ b/sbin/run_integration_test.sh
@@ -8,7 +8,7 @@ fi
# Start all required containers
cd "$LOFAR20_DIR/docker-compose" || exit 1
-make start databaseds dsconfig device-sdp device-pcc jupyter elk sdptr-sim pypcc-sim
+make start databaseds dsconfig device-sdp device-pcc device-sst jupyter elk sdptr-sim pypcc-sim
# Update the dsconfig
cd "$TANGO_LOFAR_LOCAL_DIR" || exit 1
--
GitLab