Skip to content
Snippets Groups Projects
Commit a093b491 authored by Jan David Mol's avatar Jan David Mol
Browse files

Merge branch 'L2SS-616-cleanup-CDB' into 'master' 

Resolve L2SS-616 "Cleanup cdb"

Closes L2SS-616

See merge request !238
parents 18812e00 47b39206
No related branches found
No related tags found
1 merge request!238Resolve L2SS-616 "Cleanup cdb"
Show whitespace changes
Inline Side-by-side
CDB/LOFAR_ConfigDb.json
+ 0
− 726
View file @ a093b491
...@@ -7,13 +7,6 @@ ...@@ -7,13 +7,6 @@
} }
} }
}, },
"Femto": {
"CS999": {
"Femto": {
"opc-ua/test-femto/1": {}
}
}
},
"ObservationControl": { "ObservationControl": {
"STAT": { "STAT": {
"ObservationControl": { "ObservationControl": {
...@@ -59,511 +52,7 @@ ...@@ -59,511 +52,7 @@
"STAT": { "STAT": {
"RECV": { "RECV": {
"STAT/RECV/1": { "STAT/RECV/1": {
"attribute_properties": {
"Ant_mask_RW": {
"archive_period": [
"600000"
]
},
"CLK_Enable_PWR_R": {
"archive_period": [
"600000"
]
},
"CLK_I2C_STATUS_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"CLK_PLL_error_R": {
"archive_period": [
"600000"
]
},
"CLK_PLL_locked_R": {
"archive_period": [
"600000"
]
},
"CLK_monitor_rate_RW": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"CLK_translator_busy_R": {
"archive_period": [
"600000"
]
},
"HBA_element_LNA_pwr_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"HBA_element_LNA_pwr_RW": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"HBA_element_beamformer_delays_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"HBA_element_beamformer_delays_RW": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"HBA_element_led_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"HBA_element_led_RW": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"HBA_element_pwr_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"HBA_element_pwr_RW": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"RCU_ADC_lock_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"RCU_I2C_STATUS_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"RCU_ID_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"RCU_LED0_R": {
"archive_period": [
"600000"
]
},
"RCU_LED0_RW": {
"archive_period": [
"600000"
]
},
"RCU_LED1_R": {
"archive_period": [
"600000"
]
},
"RCU_LED1_RW": {
"archive_period": [
"600000"
]
},
"RCU_Pwr_dig_R": {
"archive_period": [
"600000"
]
},
"RCU_attenuator_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"RCU_attenuator_RW": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"RCU_band_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"RCU_band_RW": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"RCU_mask_RW": {
"archive_period": [
"600000"
]
},
"RCU_monitor_rate_RW": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1.0",
"1.0"
],
"rel_change": [
"-1.0",
"1.0"
]
},
"RCU_temperature_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1.0",
"1.0"
],
"rel_change": [
"-1.0",
"1.0"
]
},
"RCU_translator_busy_R": {
"archive_period": [
"600000"
]
},
"RCU_version_R": {
"archive_period": [
"600000"
]
},
"State": {
"archive_period": [
"600000"
],
"event_period": [
"0"
]
},
"Status": {
"archive_period": [
"600000"
],
"event_period": [
"0"
]
}
},
"properties": {
"polled_attr": [
"state",
"1000",
"status",
"1000",
"ant_mask_rw",
"1000",
"rcu_adc_lock_r",
"1000",
"rcu_attenuator_r",
"1000",
"rcu_attenuator_rw",
"1000",
"rcu_band_r",
"1000",
"rcu_band_rw",
"1000",
"rcu_id_r",
"1000",
"rcu_led0_r",
"1000",
"rcu_led0_rw",
"1000",
"rcu_mask_rw",
"1000",
"rcu_monitor_rate_rw",
"1000",
"rcu_pwr_dig_r",
"1000",
"rcu_temperature_r",
"1000",
"rcu_version_r",
"1000",
"hba_element_beamformer_delays_r",
"1000",
"hba_element_beamformer_delays_rw",
"1000",
"hba_element_led_r",
"1000",
"hba_element_led_rw",
"1000",
"hba_element_pwr_r",
"1000",
"hba_element_pwr_rw",
"1000",
"clk_enable_pwr_r",
"1000",
"clk_i2c_status_r",
"1000",
"clk_monitor_rate_rw",
"1000",
"clk_pll_error_r",
"1000",
"clk_pll_locked_r",
"1000",
"clk_translator_busy_r",
"1000",
"hba_element_lna_pwr_r",
"1000",
"hba_element_lna_pwr_rw",
"1000",
"rcu_i2c_status_r",
"1000",
"rcu_led1_r",
"1000",
"rcu_led1_rw",
"1000",
"rcu_translator_busy_r",
"1000"
]
}
}
}
}
},
"random_data": {
"STAT": {
"Random_Data": {
"STAT/random_data/1": {
"properties": {
"polled_attr": [
"rnd1",
"1000",
"rnd2",
"1000",
"rnd3",
"1000",
"rnd4",
"1000",
"rnd5",
"1000",
"rnd6",
"1000",
"rnd7",
"1000",
"rnd8",
"1000",
"rnd9",
"1000",
"rnd10",
"1000",
"rnd11",
"1000",
"rnd12",
"1000",
"rnd13",
"1000",
"rnd14",
"1000",
"rnd15",
"1000",
"rnd16",
"1000",
"rnd17",
"1000",
"rnd18",
"1000",
"rnd19",
"1000",
"rnd20",
"1000",
"rnd21",
"1000",
"state",
"1000",
"status",
"1000"
]
}
},
"STAT/random_data/2": {
"properties": { "properties": {
"polled_attr": [
"rnd1",
"100",
"rnd2",
"100",
"rnd3",
"100",
"rnd4",
"100",
"rnd5",
"100",
"rnd6",
"100",
"rnd7",
"100",
"rnd8",
"100",
"rnd9",
"100",
"rnd10",
"100",
"rnd11",
"100",
"rnd12",
"100",
"rnd13",
"100",
"rnd14",
"100",
"rnd15",
"100",
"rnd16",
"100",
"rnd17",
"100",
"rnd18",
"100",
"rnd19",
"100",
"rnd20",
"100"
]
} }
} }
} }
...@@ -573,170 +62,7 @@ ...@@ -573,170 +62,7 @@
"STAT": { "STAT": {
"SDP": { "SDP": {
"STAT/SDP/1": { "STAT/SDP/1": {
"attribute_properties": {
"SDP_mask_RW": {
"event_period": [
"60000"
]
},
"State": {
"archive_period": [
"600000"
]
},
"Status": {
"archive_period": [
"600000"
]
},
"fpga_mask_RW": {
"archive_period": [
"600000"
]
},
"fpga_scrap_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"fpga_scrap_RW": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"fpga_status_R": {
"archive_period": [
"600000"
]
},
"fpga_temp_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"fpga_version_R": {
"archive_period": [
"600000"
]
},
"fpga_weights_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"fpga_weights_RW": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"tr_busy_R": {
"archive_period": [
"600000"
]
},
"tr_reload_RW": {
"archive_period": [
"600000"
]
},
"tr_tod_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"tr_uptime_R": {
"archive_period": [
"600000"
],
"archive_rel_change": [
"-3600",
"3600"
],
"rel_change": [
"-10",
"10"
]
}
},
"properties": { "properties": {
"polled_attr": [
"fpga_temp_r",
"1000",
"state",
"1000",
"status",
"1000",
"fpga_mask_rw",
"1000",
"fpga_scrap_r",
"1000",
"fpga_scrap_rw",
"1000",
"fpga_status_r",
"1000",
"fpga_version_r",
"1000",
"fpga_weights_r",
"1000",
"fpga_weights_rw",
"1000",
"tr_busy_r",
"1000",
"tr_reload_rw",
"1000",
"tr_tod_r",
"1000",
"tr_uptime_r",
"1000"
]
} }
} }
} }
...@@ -819,58 +145,6 @@ ...@@ -819,58 +145,6 @@
} }
} }
} }
},
"StatsCrosslet": {
"CS997": {
"StatsCrosslet": {
"opc-ua/test-crossletstats/1": {
"attribute_properties": {
"visibilities_imag": {
"archive_rel_change": [
"-0.1",
"0.1"
],
"rel_change": [
"-0.1",
"0.1"
]
},
"visibilities_real": {
"archive_rel_change": [
"-0.1",
"0.1"
],
"rel_change": [
"-0.1",
"0.1"
]
}
},
"properties": {
"polled_attr": [
"integration_time",
"0",
"pause_time",
"0",
"rcu_modes",
"0",
"state",
"0",
"status",
"0",
"subband",
"0",
"time_stamp",
"0",
"visibilities_imag",
"0",
"visibilities_real",
"0"
]
}
}
}
}
} }
} }
} }
CDB/MAXIV-ConfigDb.json deleted 100644 → 0
+ 0
− 24
View file @ 18812e00
{
"servers": {
"Femto": {
"TangoRestServer": {
"tango-rest": {
"TangoRestServer": {
"tango-rest/rest/0": {
"properties": {
"TANGO_DB": [
"tango://databaseds:10000/sys/database/2"
],
"TOMCAT_AUTH_METHOD": [
"plain"
],
"TOMCAT_PORT": [
"8080"
]
}
}
}
}
}
}
}
CDB/test_ConfigDb.json deleted 100644 → 0
+ 0
− 75
View file @ 18812e00
{
"servers": {
"RECV": {
"1": {
"RECV": {
"STAT/RECV/1": {
"properties": {
"OPC_Server_Name": [
"ltspi.astron.nl"
]
}
}
}
}
},
"SDP": {
"1": {
"SDP": {
"STAT/SDP/1": {
"properties": {
"OPC_Server_Name": [
"dop36.astron.nl"
]
}
}
}
}
},
"APSCTL": {
"1": {
"APSCTL": {
"STAT/APSCTL/1": {
"properties": {
"OPC_Server_Name": [
"ltspi.astron.nl"
],
"OPC_Server_Port": [
"4844"
],
"OPC_Time_Out": [
"5.0"
]
}
}
}
}
},
"test_device": {
"1": {
"test_device": {
"STAT/test_device/1": {
"attribute_properties": {
"Ant_mask_RW": {
"archive_period": [
"600000"
]
}
},
"properties": {
"OPC_Server_Name": [
"host.docker.internal"
],
"OPC_Server_Port": [
"4842"
],
"OPC_Time_Out": [
"5.0"
]
}
}
}
}
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment