Final wrap-up of constraint IDs to complete #2088

usnistgov · Feb 9, 2025 · 7a98248 · 7a98248
1 parent f4c5d1e
commit 7a98248
Show file tree

Hide file tree

Showing 6 changed files with 229 additions and 232 deletions.
diff --git a/src/metaschema/oscal_assessment-common_metaschema.xml b/src/metaschema/oscal_assessment-common_metaschema.xml
diff --git a/src/metaschema/oscal_implementation-common_metaschema.xml b/src/metaschema/oscal_implementation-common_metaschema.xml
diff --git a/src/metaschema/oscal_metadata_metaschema.xml b/src/metaschema/oscal_metadata_metaschema.xml
diff --git a/src/metaschema/oscal_poam_metaschema.xml b/src/metaschema/oscal_poam_metaschema.xml
@@ -84,7 +84,7 @@
             <field ref="remarks" in-xml="WITH_WRAPPER" min-occurs="0" max-occurs="1"/>
         </model>
         <constraint>
-            <is-unique id="unique-poam-local-definitions-component" target="component">
+            <is-unique id="oscal-unique-poam-local-definitions-component" target="component">
                 <key-field target="@uuid"/>
                 <remarks>
                     <p>Since multiple <code>component</code> entries can be provided, each component must have a unique <code>uuid</code>.</p>
@@ -172,7 +172,7 @@
             <field ref="remarks" in-xml="WITH_WRAPPER" min-occurs="0" max-occurs="1"/>
         </model>
         <constraint>
-            <expect level="WARNING" target="." test="@uuid">
+            <expect id="oscal-poam-item-uuid" level="WARNING" target="." test="@uuid">
                 <message>It is a best practice to provide a UUID.</message>
             </expect>
         </constraint>

diff --git a/src/metaschema/oscal_profile_metaschema.xml b/src/metaschema/oscal_profile_metaschema.xml
@@ -118,7 +118,7 @@
                               <description>Declare how clashing controls should be
                                     handled.</description>
                               <constraint>
-                                    <allowed-values>
+                                    <allowed-values id="oscal-profile-merge-combine-method-values">
                                           <enum value="use-first">Use the first definition - the first control with a given ID is used; subsequent ones are discarded</enum>
                                           <enum value="merge" deprecated="1.0.1"
                                                   >**(<i>deprecated</i>)** **(<i>unspecified</i>)**
@@ -129,7 +129,7 @@
                               </constraint>
                         </define-flag>
                         <constraint>
-                              <expect id="req-merge-combine" target="." test="not(@method='merge')"/>
+                              <expect id="oscal-profile-req-merge-combine" target="." test="not(@method='merge')"/>
                         </constraint>
                   </define-assembly>
                   <choice>
@@ -316,7 +316,7 @@
                                                   <code>title</code> or
                                                 <code>prop</code>.</description>
                                           <constraint>
-                                                <allowed-values>
+                                                <allowed-values id="oscal-profile-alter-by-item-name-values">
                                                       <enum value="param">A descendant parameter and all of its descendants.</enum>
                                                       <enum value="prop">A descendant property and all of its descendants.</enum>
                                                       <enum value="link">A descendant link and all of its descendants.</enum>
@@ -346,7 +346,7 @@
                                                 the targeted element (beside it or inside
                                                 it).</description>
                                           <constraint>
-                                                <allowed-values>
+                                                <allowed-values id="oscal-alter-position-values">
                                                       <enum value="before">Preceding the by-id target</enum>
                                                       <enum value="after">Following the by-id target</enum>
                                                       <enum value="starting">Inside the control or by-id target, at the start</enum>
@@ -377,7 +377,7 @@
                                           </assembly>
                                     </model>
                                     <constraint>
-                                          <allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@name">
+                                          <allowed-values id="oscal-profile-modify-alter-prop-name-values" target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@name">
                                                 &allowed-values-control-group-property-name;
                                           </allowed-values>
                                     </constraint>
@@ -395,7 +395,7 @@
                   </define-assembly>
             </model>
             <constraint>
-                  <is-unique id="unique-profile-modify-set-parameter" target="set-parameter">
+                  <is-unique id="oscal-unique-profile-modify-set-parameter" target="set-parameter">
                         <key-field target="@param-id"/>
                         <remarks>
                               <p>Since multiple <code>set-parameter</code> entries can be provided, each parameter must be set only once.</p>
@@ -411,7 +411,7 @@
                   <formal-name>Order</formal-name>
                   <description>A designation of how a selection of controls in a profile is to be ordered.</description>
                   <constraint>
-                        <allowed-values>
+                        <allowed-values id="oscal-profile-insert-controls-order-values">
                               <enum value="keep">Use the order of their appearance, using a depth-first traversal of the source profile's imports.</enum>
                               <enum value="ascending">Sort all selected controls into ascending alphanumeric order by their ID.</enum>
                               <enum value="descending">Sort all selected controls into descending alphanumeric order by their ID.</enum>
@@ -459,7 +459,7 @@
             <formal-name>Include Contained Controls with Control</formal-name>
             <description>When a control is included, whether its child (dependent) controls are also included.</description>
             <constraint>
-                  <allowed-values>
+                  <allowed-values id="oscal-profile-with-child-controls-values">
                         <enum value="yes">Include child controls with an included control.</enum>
                         <enum value="no">When importing a control, only include child controls that are also explicitly called.</enum>
                   </allowed-values>