Skip to content

JCF: DUNE-DAQ/daq-deliverables#216: reflect name change in confmodel … #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jcfreeman2 wants to merge 5 commits into
base: prep-release/fddaq-v5.7.0
Choose a base branch
from
Draft

JCF: DUNE-DAQ/daq-deliverables#216: reflect name change in confmodel … #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01de112
JCF: DUNE-DAQ/daq-deliverables#216: reflect name change in confmodel …
Aug 19, 2026
eb585bd
JCF: DUNE-DAQ/daq-deliverables#216: correct the relation name from di…
Aug 20, 2026
58926f5
JCF: DUNE-DAQ/daq-deliverables#216: change trigger_bitwords_test.py t…
Aug 22, 2026
1394e1d
Merge remote-tracking branch 'origin/develop' into johnfreeman/daq-de…
Aug 22, 2026
84255b4
Merge pull request #339 from DUNE-DAQ/prep-release/fddaq-v5.7.0
mroda88 Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions config/daqsystemtest/example-configs.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<attr name="data_rate_slowdown_factor" type="u32" val="1"/>
<attr name="controller_log_level" type="enum" val="INFO"/>
<attr name="log_path" type="string" val="/log"/>
<rel name="disabled">
<rel name="excluded">
<ref class="DFApplication" id="df-02"/>
<ref class="DFApplication" id="df-03"/>
<ref class="ReadoutApplication" id="ru-02"/>
Expand Down Expand Up @@ -155,7 +155,7 @@
<attr name="data_request_timeout_ms" type="u32" val="1000"/>
<attr name="data_rate_slowdown_factor" type="u32" val="1"/>
<attr name="controller_log_level" type="enum" val="INFO"/>
<rel name="disabled">
<rel name="excluded">
<ref class="DFApplication" id="df-02"/>
<ref class="DFApplication" id="df-03"/>
<ref class="TPStreamWriterApplication" id="tp-stream-writer"/>
Expand All @@ -177,7 +177,7 @@
<attr name="data_request_timeout_ms" type="u32" val="1000"/>
<attr name="data_rate_slowdown_factor" type="u32" val="1"/>
<attr name="controller_log_level" type="enum" val="INFO"/>
<rel name="disabled">
<rel name="excluded">
<ref class="DFApplication" id="df-02"/>
<ref class="DFApplication" id="df-03"/>
<ref class="ReadoutApplication" id="ru-02"/>
Expand Down Expand Up @@ -214,7 +214,7 @@
<attr name="data_request_timeout_ms" type="u32" val="1000"/>
<attr name="data_rate_slowdown_factor" type="u32" val="1"/>
<attr name="controller_log_level" type="enum" val="INFO"/>
<rel name="disabled">
<rel name="excluded">
<ref class="DFApplication" id="df-02"/>
<ref class="DFApplication" id="df-03"/>
<ref class="TPStreamWriterApplication" id="tp-stream-writer"/>
Expand All @@ -236,7 +236,7 @@
<attr name="data_request_timeout_ms" type="u32" val="1000"/>
<attr name="data_rate_slowdown_factor" type="u32" val="1"/>
<attr name="controller_log_level" type="enum" val="INFO"/>
<rel name="disabled">
<rel name="excluded">
<ref class="DFApplication" id="df-02"/>
<ref class="DFApplication" id="df-03"/>
<ref class="TPStreamWriterApplication" id="tp-stream-writer"/>
Expand Down
38 changes: 19 additions & 19 deletions config/daqsystemtest/hosts.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,47 +80,47 @@

<obj class="PhysicalHost" id="localhost">
<rel name="contains">
<ref class="ProcessingResource" id="localhost_cpus"/>
<ref class="HostCores" id="localhost_cpus"/>
</rel>
</obj>

<obj class="PhysicalHost" id="np04-srv-021">
<rel name="contains">
<ref class="ProcessingResource" id="np04-srv-021_cpus"/>
<ref class="HostCores" id="np04-srv-021_cpus"/>
</rel>
</obj>

<obj class="PhysicalHost" id="np04-srv-022">
<rel name="contains">
<ref class="ProcessingResource" id="np04-srv-022_cpus"/>
<ref class="HostCores" id="np04-srv-022_cpus"/>
</rel>
</obj>

<obj class="PhysicalHost" id="np04-srv-028">
<rel name="contains">
<ref class="ProcessingResource" id="np04-srv-028_cpus"/>
<ref class="HostCores" id="np04-srv-028_cpus"/>
</rel>
</obj>

<obj class="PhysicalHost" id="np04-srv-029">
<rel name="contains">
<ref class="ProcessingResource" id="np04-srv-029_cpus"/>
<ref class="HostCores" id="np04-srv-029_cpus"/>
</rel>
</obj>

<obj class="PhysicalHost" id="monkafka.cern.ch">
<rel name="contains">
<ref class="ProcessingResource" id="localhost_cpus"/>
<ref class="HostCores" id="localhost_cpus"/>
</rel>
</obj>

<obj class="PhysicalHost" id="pocket-host">
<rel name="contains">
<ref class="ProcessingResource" id="localhost_cpus"/>
<ref class="HostCores" id="localhost_cpus"/>
</rel>
</obj>

<obj class="ProcessingResource" id="localhost_cpus">
<obj class="HostCores" id="localhost_cpus">
<attr name="cpu_cores" type="u16">
<data val="0"/>
<data val="1"/>
Expand All @@ -129,7 +129,7 @@
</attr>
</obj>

<obj class="ProcessingResource" id="np04-srv-021_cpus">
<obj class="HostCores" id="np04-srv-021_cpus">
<attr name="cpu_cores" type="u16">
<data val="0"/>
<data val="1"/>
Expand All @@ -138,7 +138,7 @@
</attr>
</obj>

<obj class="ProcessingResource" id="np04-srv-022_cpus">
<obj class="HostCores" id="np04-srv-022_cpus">
<attr name="cpu_cores" type="u16">
<data val="0"/>
<data val="1"/>
Expand All @@ -147,7 +147,7 @@
</attr>
</obj>

<obj class="ProcessingResource" id="np04-srv-028_cpus">
<obj class="HostCores" id="np04-srv-028_cpus">
<attr name="cpu_cores" type="u16">
<data val="0"/>
<data val="1"/>
Expand All @@ -156,7 +156,7 @@
</attr>
</obj>

<obj class="ProcessingResource" id="np04-srv-029_cpus">
<obj class="HostCores" id="np04-srv-029_cpus">
<attr name="cpu_cores" type="u16">
<data val="0"/>
<data val="1"/>
Expand All @@ -167,49 +167,49 @@

<obj class="VirtualHost" id="kafka-cern-vhost">
<rel name="uses">
<ref class="ProcessingResource" id="localhost_cpus"/>
<ref class="HostCores" id="localhost_cpus"/>
</rel>
<rel name="runs_on" class="PhysicalHost" id="monkafka.cern.ch"/>
</obj>

<obj class="VirtualHost" id="kafka-pocket-vhost">
<rel name="uses">
<ref class="ProcessingResource" id="localhost_cpus"/>
<ref class="HostCores" id="localhost_cpus"/>
</rel>
<rel name="runs_on" class="PhysicalHost" id="pocket-host"/>
</obj>

<obj class="VirtualHost" id="vlocalhost">
<rel name="uses">
<ref class="ProcessingResource" id="localhost_cpus"/>
<ref class="HostCores" id="localhost_cpus"/>
</rel>
<rel name="runs_on" class="PhysicalHost" id="localhost"/>
</obj>

<obj class="VirtualHost" id="vnp04-srv-021">
<rel name="uses">
<ref class="ProcessingResource" id="np04-srv-021_cpus"/>
<ref class="HostCores" id="np04-srv-021_cpus"/>
</rel>
<rel name="runs_on" class="PhysicalHost" id="np04-srv-021"/>
</obj>

<obj class="VirtualHost" id="vnp04-srv-022">
<rel name="uses">
<ref class="ProcessingResource" id="np04-srv-022_cpus"/>
<ref class="HostCores" id="np04-srv-022_cpus"/>
</rel>
<rel name="runs_on" class="PhysicalHost" id="np04-srv-022"/>
</obj>

<obj class="VirtualHost" id="vnp04-srv-028">
<rel name="uses">
<ref class="ProcessingResource" id="np04-srv-028_cpus"/>
<ref class="HostCores" id="np04-srv-028_cpus"/>
</rel>
<rel name="runs_on" class="PhysicalHost" id="np04-srv-028"/>
</obj>

<obj class="VirtualHost" id="vnp04-srv-029">
<rel name="uses">
<ref class="ProcessingResource" id="np04-srv-029_cpus"/>
<ref class="HostCores" id="np04-srv-029_cpus"/>
</rel>
<rel name="runs_on" class="PhysicalHost" id="np04-srv-029"/>
</obj>
Expand Down
2 changes: 1 addition & 1 deletion config/daqsystemtest/ru-segment.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<attr name="lcore_sleep_us" type="u32" val="10"/>
<attr name="source_to_rx_queue_multiplexing" type="s16" val="1"/>
<rel name="used_lcores">
<ref class="ProcessingResource" id="localhost_cpus"/>
<ref class="HostCores" id="localhost_cpus"/>
</rel>
</obj>

Expand Down
12 changes: 6 additions & 6 deletions integtest/trigger_bitwords_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@
# Prep to turn off tp-stream-writer
local_conf = db.get_dal(class_name="Session", uid="local-1x1-config")
tpstream_writer = db.get_dal(class_name="TPStreamWriterApplication", uid="tp-stream-writer")
# Append the TPStreamWriter to the disabled list
local_conf.disabled.append(tpstream_writer)
disabled_list = [db.get_dal(class_name=obj.className(), uid=obj.id) for obj in local_conf.disabled]
# Append the TPStreamWriter to the excluded list
local_conf.excluded.append(tpstream_writer)
excluded_list = [db.get_dal(class_name=obj.className(), uid=obj.id) for obj in local_conf.excluded]
onebyone_local_conf.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="Session",
obj_id="local-1x1-config",
updates={"disabled": []},
updates={"excluded": []},
)
)
# Disable TC merging
Expand Down Expand Up @@ -125,11 +125,11 @@
series_bitword_conf,
coincidence_bitword_conf]

# Actually disable tp-stream-writer
# Actually exclude tp-stream-writer
for conf in configs:
for sub in conf.config_substitutions:
if sub.obj_id == "local-1x1-config":
sub.updates["disabled"] = disabled_list
sub.updates["excluded"] = excluded_list

### Bitwords configs
# Prescale
Expand Down
Loading