From 30f910449b9efaae99777a042376f2a633271b10 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 20 Jul 2023 07:33:01 +0000
Subject: [PATCH] CS001 CDB fixes
---
CDB/stations/cs001.json | 192 ++++++++++++++++++-------------------
CDB/stations/hba_core.json | 24 ++---
CDB/stations/lba.json | 12 +--
3 files changed, 114 insertions(+), 114 deletions(-)
diff --git a/CDB/stations/cs001.json b/CDB/stations/cs001.json
index 22cffb72d..569bb889b 100644
--- a/CDB/stations/cs001.json
+++ b/CDB/stations/cs001.json
@@ -200,40 +200,40 @@
"53263"
],
"FPGA_beamlet_output_hdr_eth_destination_mac_RW_default": [
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81"
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1"
],
"FPGA_beamlet_output_hdr_ip_destination_address_RW_default": [
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150"
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1"
],
"FPGA_beamlet_output_hdr_udp_destination_port_RW_default": [
"10010",
@@ -312,40 +312,40 @@
"53263"
],
"FPGA_beamlet_output_hdr_eth_destination_mac_RW_default": [
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81"
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1"
],
"FPGA_beamlet_output_hdr_ip_destination_address_RW_default": [
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150"
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1"
],
"FPGA_beamlet_output_hdr_udp_destination_port_RW_default": [
"10011",
@@ -424,40 +424,40 @@
"53263"
],
"FPGA_beamlet_output_hdr_eth_destination_mac_RW_default": [
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81"
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1",
+ "e4:43:4b:3e:5d:a1"
],
"FPGA_beamlet_output_hdr_ip_destination_address_RW_default": [
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150",
- "10.168.160.150"
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1",
+ "10.168.165.1"
],
"FPGA_beamlet_output_hdr_udp_destination_port_RW_default": [
"10012",
diff --git a/CDB/stations/hba_core.json b/CDB/stations/hba_core.json
index 446a2be23..72f36c9bb 100644
--- a/CDB/stations/hba_core.json
+++ b/CDB/stations/hba_core.json
@@ -43,7 +43,7 @@
"STAT/SDP/HBA0"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-hba0"
],
"OPC_Server_Port": [
"4842"
@@ -77,7 +77,7 @@
"STAT/SDP/HBA1"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-hba1"
],
"OPC_Server_Port": [
"4844"
@@ -171,7 +171,7 @@
"STAT/XST/HBA0"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-hba0"
],
"OPC_Server_Port": [
"4842"
@@ -197,7 +197,7 @@
"STAT/XST/HBA1"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-hba1"
],
"OPC_Server_Port": [
"4844"
@@ -216,7 +216,7 @@
"STAT/SDP/HBA0": {
"properties": {
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-hba0"
],
"OPC_Server_Port": [
"4842"
@@ -301,7 +301,7 @@
"STAT/SDP/HBA1": {
"properties": {
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-hba1"
],
"OPC_Server_Port": [
"4844"
@@ -398,7 +398,7 @@
"5113"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-hba0"
],
"OPC_Server_Port": [
"4842"
@@ -453,7 +453,7 @@
"5123"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-hba1"
],
"OPC_Server_Port": [
"4844"
@@ -514,7 +514,7 @@
"5111"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-hba0"
],
"OPC_Server_Port": [
"4842"
@@ -569,7 +569,7 @@
"5121"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-hba1"
],
"OPC_Server_Port": [
"4844"
@@ -630,7 +630,7 @@
"5112"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-hba0"
],
"OPC_Server_Port": [
"4842"
@@ -703,7 +703,7 @@
"5122"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-hba1"
],
"OPC_Server_Port": [
"4844"
diff --git a/CDB/stations/lba.json b/CDB/stations/lba.json
index af4d8c9e2..fefd73fc5 100644
--- a/CDB/stations/lba.json
+++ b/CDB/stations/lba.json
@@ -22,7 +22,7 @@
"STAT/SDP/LBA"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-lba"
],
"OPC_Server_Port": [
"4840"
@@ -96,7 +96,7 @@
"STAT/XST/LBA"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-lba"
],
"OPC_Server_Port": [
"4840"
@@ -115,7 +115,7 @@
"STAT/SDP/LBA": {
"properties": {
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-lba"
],
"OPC_Server_Port": [
"4840"
@@ -212,7 +212,7 @@
"5103"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-lba"
],
"OPC_Server_Port": [
"4840"
@@ -273,7 +273,7 @@
"5101"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-lba"
],
"OPC_Server_Port": [
"4840"
@@ -334,7 +334,7 @@
"5102"
],
"OPC_Server_Name": [
- "10.99.0.250"
+ "sdptr-lba"
],
"OPC_Server_Port": [
"4840"
--
GitLab