Merge pull request #39 from DUNE-DAQ/eflumerf/ActionPlans_DaqModulesG…

…roup

Use schema suggested by Giovanna and Alessandro

schema/confmodel/dunedaq.schema.xml

@@ -80,15 +80,12 @@
 
 <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="no"/>
- </class>
-
- <class name="ActionStep">
-   <attribute name="modules" type="class" is-multi-value="yes"/>
+  <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>
 
  <class name="Application" description="A software executable" is-abstract="yes">
@@ -141,6 +138,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>