diff --git a/CDB/integration_ConfigDb.json b/CDB/integration_ConfigDb.json index cf113340e1a87e670c814e2c5e8024a4a7c82375..a3e0bd8b0b993a6b0d21f20bdf15748d8bd59135 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 b0717d36e0a203ee27c5434d839f8540befdd9ef..1968028c88c1c078a42c929eed34364890a7a1b7 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 d4fea1a160f06f07552ae813f2adb2a49dd29e5d..23a9b734cf58d7c1836569533f13ba9cc7a9dd1e 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 d54163625541c13816bf0309c09a2713ce35add9..b2925b4085f3c684f3bb999ebdb2f4c387c760e5 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