Merge pull request #889 from lsst-ts/tickets/DM-45686

DM-45686: Add support for test execution metadata to script and block execution.
lsst-ts · Aug 15, 2024 · 24bb115 · 24bb115
2 parents 0189c80 + 4bbcd6d
commit 24bb115
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 0 deletions.
diff --git a/doc/news/interface_changes/DM-45686.scheduler.rst b/doc/news/interface_changes/DM-45686.scheduler.rst
@@ -0,0 +1 @@
+Add support for execution id.
diff --git a/doc/news/interface_changes/DM-45686.script.rst b/doc/news/interface_changes/DM-45686.script.rst
@@ -0,0 +1 @@
+Add support for execution id.
diff --git a/doc/news/interface_changes/DM-45686.scriptqueue.rst b/doc/news/interface_changes/DM-45686.scriptqueue.rst
@@ -0,0 +1 @@
+Add support for execution id.
diff --git a/python/lsst/ts/xml/data/sal_interfaces/Scheduler/Scheduler_Commands.xml b/python/lsst/ts/xml/data/sal_interfaces/Scheduler/Scheduler_Commands.xml
@@ -48,6 +48,14 @@
       <Units>unitless</Units>
       <Count>1</Count>
     </item>
+    <item>
+      <EFDB_Name>executionId</EFDB_Name>
+      <Description>ID generated by the OCS for the block execution.</Description>
+      <IDL_Type>string</IDL_Type>
+      <IDL_Size>1</IDL_Size>
+      <Units>unitless</Units>
+      <Count>1</Count>
+    </item>
     <item>
       <EFDB_Name>override</EFDB_Name>
       <Description>Override information in the block with those provided here.</Description>

diff --git a/python/lsst/ts/xml/data/sal_interfaces/Script/Script_Commands.xml b/python/lsst/ts/xml/data/sal_interfaces/Script/Script_Commands.xml
@@ -44,6 +44,14 @@
       <Units>unitless</Units>
       <Count>1</Count>
     </item>
+    <item>
+      <EFDB_Name>executionId</EFDB_Name>
+      <Description>ID generated by the OCS when running a script as part of a test execution (optional).</Description>
+      <IDL_Type>string</IDL_Type>
+      <IDL_Size>1</IDL_Size>
+      <Units>unitless</Units>
+      <Count>1</Count>
+    </item>
   </SALCommand>
   <SALCommand>
     <Subsystem>Script</Subsystem>

diff --git a/python/lsst/ts/xml/data/sal_interfaces/Script/Script_Events.xml b/python/lsst/ts/xml/data/sal_interfaces/Script/Script_Events.xml
@@ -223,5 +223,13 @@
       <Units>unitless</Units>
       <Count>1</Count>
     </item>
+    <item>
+      <EFDB_Name>executionId</EFDB_Name>
+      <Description>ID generated by the OCS when running a script as part of a test execution (optional).</Description>
+      <IDL_Type>string</IDL_Type>
+      <IDL_Size>1</IDL_Size>
+      <Units>unitless</Units>
+      <Count>1</Count>
+    </item>
   </SALEvent>
 </SALEventSet>
diff --git a/python/lsst/ts/xml/data/sal_interfaces/ScriptQueue/ScriptQueue_Commands.xml b/python/lsst/ts/xml/data/sal_interfaces/ScriptQueue/ScriptQueue_Commands.xml
@@ -147,6 +147,13 @@
       <Units>unitless</Units>
       <Count>1</Count>
     </item>
+    <item>
+      <EFDB_Name>executionId</EFDB_Name>
+      <Description>The script execution ID. This is a metadata generated by the OCS when running a script as part of a test execution.</Description>
+      <IDL_Type>string</IDL_Type>
+      <Units>unitless</Units>
+      <Count>1</Count>
+    </item>
   </SALCommand>
   <SALCommand>
     <Subsystem>ScriptQueue</Subsystem>

diff --git a/python/lsst/ts/xml/data/sal_interfaces/ScriptQueue/ScriptQueue_Events.xml b/python/lsst/ts/xml/data/sal_interfaces/ScriptQueue/ScriptQueue_Events.xml
@@ -292,6 +292,14 @@
       <Units>unitless</Units>
       <Count>1</Count>
     </item>
+    <item>
+      <EFDB_Name>executionId</EFDB_Name>
+      <Description>ID generated by the OCS when running a script as part of a test execution (optional).</Description>
+      <IDL_Type>string</IDL_Type>
+      <IDL_Size>1</IDL_Size>
+      <Units>unitless</Units>
+      <Count>1</Count>
+    </item>
   </SALEvent>
   <SALEvent>
     <Subsystem>ScriptQueue</Subsystem>