From 1aa29614516485b6ed7e17f67901e4f4e086cb0f Mon Sep 17 00:00:00 2001
From: Eric Flumerfelt <eflumerf@fnal.gov>
Date: Thu, 29 Aug 2024 11:58:33 -0500
Subject: [PATCH 1/2] Use schema suggested by Giovanna and Alessandro

---
 schema/confmodel/dunedaq.schema.xml | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/schema/confmodel/dunedaq.schema.xml b/schema/confmodel/dunedaq.schema.xml
index c03421c..d7a702c 100644
--- a/schema/confmodel/dunedaq.schema.xml
+++ b/schema/confmodel/dunedaq.schema.xml
@@ -80,15 +80,11 @@
 
 <oks-schema>
 
-<info name="" type="" num-of-items="46" oks-format="schema" oks-version="862f2957270" created-by="jcfree" created-on="mu2edaq13.fnal.gov" creation-time="20230123T223700" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20240326T183809"/>
+<info name="" type="" num-of-items="48" oks-format="schema" oks-version="862f2957270" created-by="jcfree" created-on="mu2edaq13.fnal.gov" creation-time="20230123T223700" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20240829T165707"/>
 
  <class name="ActionPlan" description="A set of parallel steps for an application to carry out a command">
-   <relationship name="fsm" class-type="FSMCommand" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
-  <relationship name="steps" class-type="ActionStep" low-cc="zero" high-cc="many" is-composite="no" is-exclusive="no" is-dependent="no" ordered="yes"/>
- </class>
-
- <class name="ActionStep">
-   <attribute name="modules" type="class" is-multi-value="yes"/>
+  <relationship name="command" class-type="FSMCommand" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
+  <relationship name="steps" class-type="DaqModulesGroup" low-cc="zero" high-cc="many" is-composite="no" is-exclusive="no" is-dependent="no"/>
  </class>
 
  <class name="Application" description="A software executable" is-abstract="yes">
@@ -141,6 +137,19 @@
   <relationship name="used_resources" class-type="HostComponent" low-cc="zero" high-cc="many" is-composite="yes" is-exclusive="no" is-dependent="yes"/>
  </class>
 
+ <class name="DaqModulesGroup" description="Represents a group of DAQ Modules that can run commands in parallel as one of the steps of an ActionPlan." is-abstract="yes">
+ </class>
+
+ <class name="DaqModulesGroupById">
+  <superclass name="DaqModulesGroup"/>
+  <relationship name="modules" class-type="DaqModule" low-cc="one" high-cc="many" is-composite="no" is-exclusive="no" is-dependent="no"/>
+ </class>
+
+ <class name="DaqModulesGroupByType">
+  <superclass name="DaqModulesGroup"/>
+  <attribute name="modules" type="class" is-multi-value="yes"/>
+ </class>
+
  <class name="DetDataReceiver" is-abstract="yes">
   <superclass name="Resource"/>
  </class>
@@ -346,6 +355,11 @@
   </method>
  </class>
 
+ <class name="SmartActionPlan" description="A set of parallel steps for an application to carry out a command">
+  <superclass name="ActionPlan"/>
+  <relationship name="steps" class-type="DaqModulesGroupByType" low-cc="zero" high-cc="many" is-composite="no" is-exclusive="no" is-dependent="no"/>
+ </class>
+
  <class name="StorageDevice">
   <superclass name="HostComponent"/>
   <attribute name="storage" description="Amount of disk storage available for output data on this host in GB" type="u32" init-value="0" is-not-null="yes"/>

From fcbc257c0b34f6e8a6e4fcdde889bc0206be2eff Mon Sep 17 00:00:00 2001
From: Eric Flumerfelt <eflumerf@fnal.gov>
Date: Fri, 30 Aug 2024 12:20:25 -0500
Subject: [PATCH 2/2] Remove SmartActionPlan in favor of validation within
 appfwk. Add execution_policy attribute to ActionPlan that allows switching
 steps to serial execution (series of serial steps)

---
 schema/confmodel/dunedaq.schema.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/schema/confmodel/dunedaq.schema.xml b/schema/confmodel/dunedaq.schema.xml
index d7a702c..cb9a38e 100644
--- a/schema/confmodel/dunedaq.schema.xml
+++ b/schema/confmodel/dunedaq.schema.xml
@@ -83,6 +83,7 @@
 <info name="" type="" num-of-items="48" oks-format="schema" oks-version="862f2957270" created-by="jcfree" created-on="mu2edaq13.fnal.gov" creation-time="20230123T223700" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20240829T165707"/>
 
  <class name="ActionPlan" description="A set of parallel steps for an application to carry out a command">
+  <attribute name="execution_policy" type="enum" description="How the application should execute steps of the action plan" range="modules-in-parallel,modules-in-series" init-value="modules-in-parallel"/>
   <relationship name="command" class-type="FSMCommand" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
   <relationship name="steps" class-type="DaqModulesGroup" low-cc="zero" high-cc="many" is-composite="no" is-exclusive="no" is-dependent="no"/>
  </class>
@@ -355,11 +356,6 @@
   </method>
  </class>
 
- <class name="SmartActionPlan" description="A set of parallel steps for an application to carry out a command">
-  <superclass name="ActionPlan"/>
-  <relationship name="steps" class-type="DaqModulesGroupByType" low-cc="zero" high-cc="many" is-composite="no" is-exclusive="no" is-dependent="no"/>
- </class>
-
  <class name="StorageDevice">
   <superclass name="HostComponent"/>
   <attribute name="storage" description="Amount of disk storage available for output data on this host in GB" type="u32" init-value="0" is-not-null="yes"/>