Profile alter model adjustments (#1418)

David Waltermire · aj-stein-nist · commit b972ec3f98b5 · 2023-07-10T15:29:09.000-04:00
* - Adjusted the profile metaschema to refactor the alter assemblies in a backwards-compatible way.
  - Enumerated the set of target item types for remove.
  - Fixed references to use current `by-` syntax.
- Adjusted unit tests to support better add/remove testing.
* Updated to latest metaschema development version
* added default value `ending` for `add/@position`.
diff --git a/src/metaschema/oscal_profile_metaschema.xml b/src/metaschema/oscal_profile_metaschema.xml
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-simple_catalog.xml b/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-simple_catalog.xml
@@ -20,7 +20,7 @@
          </param>
          <prop name="label" value="first"/>
          <part name="statement" id="a1-stmt">
-            <p>A1 aaaaa aaaaaaaaaa</p>
+            <p>A1 aaaaa <insert type="param" id-ref="a1_prm1"/> aaaaaaaaaa</p>
          </part>
       </control>
       <control id="a2">
@@ -37,7 +37,7 @@
          </param>
          <prop name="label" value="third"/>
          <part name="statement" id="a3-stmt">
-            <p>A3 aaaaa aaaaaaaaaa</p>
+            <p>A3 aaaaa <insert type="param" id-ref="a3_prm1"/> aaaaaaaaaa</p>
          </part>
       </control>
    </group>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/modify-adds_profile.xml b/src/specifications/profile-resolution/profile-resolution-examples/modify-adds_profile.xml
@@ -34,16 +34,35 @@
             </description>
          </constraint>
       </set-parameter>
-      <alter control-id="a1">
+      <alter control-id="a1"><!-- OK control -->
          <add position="starting" by-id="a1">
             <prop name="CORE" ns="https://fedramp.gov/ns/oscal" value="core"/>
          </add>
-         <add position="starting" by-id="a1-stmt">
+         <add position="starting" by-id="a1_prm1"><!-- OK parameter -->
+            <prop name="annotated" ns="https://fedramp.gov/ns/oscal" value="param-prop"/>
+         </add>
+         <add position="before" by-id="a1_prm1"><!-- parameter child -->
+         	<param id="new_prm">
+         	   <prop name="annotated" ns="https://fedramp.gov/ns/oscal" value="new-param"/>
+         	   <label>A1 Parameter New</label>
+         	</param>
+         </add>
+         <add position="starting" by-id="a1-stmt"><!-- part -->
             <prop name="conformity"
                   ns="https://fedramp.gov/ns/oscal"
                   value="assessment-objective"/>
             <prop name="method" class="fedramp" value="EXAMINE"/>
          </add>
+         <add position="after" by-id="a1-stmt"><!-- part child -->
+         	<part name="statement" id="new-part">
+         	   <p>A1 bbbbb <insert type="param" id-ref="new_prm"/> bbbbb</p>
+         	</part>
+         </add>
+         <add position="ending" by-id="a1-stmt"><!-- part child -->
+            <part name="statement" id="new-part2">
+	           <p>A1 ccc <insert type="param" id-ref="new_prm"/> ccc</p>
+	        </part>
+	     </add>
       </alter>
    </modify>
    <back-matter>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml
@@ -11,9 +11,12 @@
    </metadata>
    <control id="a1">
       <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
       <prop name="label" value="first"/>
       <part name="statement" id="a1-stmt">
-         <p>A1 aaaaa aaaaaaaaaa</p>
+         <p>A1 aaaaa <insert type="param" id-ref="a1_prm1"/> aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base2-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base2-test_profile_RESOLVED.xml
@@ -11,9 +11,12 @@
    </metadata>
    <control id="a1">
       <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
       <prop name="label" value="first"/>
       <part name="statement" id="a1-stmt">
-         <p>A1 aaaaa aaaaaaaaaa</p>
+         <p>A1 aaaaa <insert type="param" id-ref="a1_prm1"/> aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml
@@ -18,9 +18,12 @@
    </control>
    <control id="a3">
       <title>Control A3</title>
+      <param id="a3_prm1">
+         <label>A3 Parameter 1</label>
+      </param>
       <prop name="label" value="third"/>
       <part name="statement" id="a3-stmt">
-         <p>A3 aaaaa aaaaaaaaaa</p>
+         <p>A3 aaaaa <insert type="param" id-ref="a3_prm1"/> aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/import-twice_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/import-twice_profile_RESOLVED.xml
@@ -11,9 +11,12 @@
    </metadata>
    <control id="a1">
       <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
       <prop name="label" value="first"/>
       <part name="statement" id="a1-stmt">
-         <p>A1 aaaaa aaaaaaaaaa</p>
+         <p>A1 aaaaa <insert type="param" id-ref="a1_prm1"/> aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-call-with-children-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-call-with-children-test_profile_RESOLVED.xml
@@ -11,9 +11,12 @@
    </metadata>
    <control id="a1">
       <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
       <prop name="label" value="first"/>
       <part name="statement" id="a1-stmt">
-         <p>A1 aaaaa aaaaaaaaaa</p>
+         <p>A1 aaaaa <insert type="param" id-ref="a1_prm1"/> aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-implicit-keep_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-implicit-keep_profile_RESOLVED.xml
@@ -11,9 +11,12 @@
    </metadata>
    <control id="a1">
       <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
       <prop name="label" value="first"/>
       <part name="statement" id="a1-stmt">
-         <p>A1 aaaaa aaaaaaaaaa</p>
+         <p>A1 aaaaa <insert type="param" id-ref="a1_prm1"/> aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
@@ -25,9 +28,12 @@
    </control>
    <control id="a1">
       <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
       <prop name="label" value="first"/>
       <part name="statement" id="a1-stmt">
-         <p>A1 aaaaa aaaaaaaaaa</p>
+         <p>A1 aaaaa <insert type="param" id-ref="a1_prm1"/> aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/modify-adds_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/modify-adds_profile_RESOLVED.xml
@@ -13,7 +13,12 @@
       <title>Group A of C</title>
       <control id="a1">
          <title>Control A1</title>
+         <param id="new_prm">
+            <prop name="annotated" ns="https://fedramp.gov/ns/oscal" value="new-param"/>
+            <label>A1 Parameter New</label>
+       	 </param>
          <param id="a1_prm1">
+            <prop name="annotated" ns="https://fedramp.gov/ns/oscal" value="param-prop"/>
             <label>A1 Parameter 1</label>
             <constraint>
                <description>
@@ -22,13 +27,19 @@
             </constraint>
          </param>
          <prop name="CORE" ns="https://fedramp.gov/ns/oscal" value="core"/>
-         <prop name="place" value="first"/>
+         <prop name="label" value="first"/>
          <part name="statement" id="a1-stmt">
             <prop name="conformity"
                   ns="https://fedramp.gov/ns/oscal"
                   value="assessment-objective"/>
             <prop name="method" class="fedramp" value="EXAMINE"/>
-            <p>A1 aaaaa aaaaaaaaaa</p>
+            <p>A1 aaaaa <insert type="param" id-ref="a1_prm1"/> aaaaaaaaaa</p>
+            <part name="statement" id="new-part2">
+	           <p>A1 ccc <insert type="param" id-ref="new_prm"/> ccc</p>
+	        </part>
+         </part>
+         <part name="statement" id="new-part">
+            <p>A1 bbbbb <insert type="param" id-ref="new_prm"/> bbbbb</p>
          </part>
       </control>
       <control id="a3">
@@ -41,9 +52,9 @@
                </description>
             </constraint>
          </param>
-         <prop name="place" value="third"/>
+         <prop name="label" value="third"/>
          <part name="statement" id="a3-stmt">
-            <p>A3 aaaaa aaaaaaaaaa</p>
+            <p>A3 aaaaa <insert type="param" id-ref="a3_prm1"/> aaaaaaaaaa</p>
          </part>
       </control>
    </group>
diff --git a/src/specifications/profile-resolution/profile-resolution-specml.xml b/src/specifications/profile-resolution/profile-resolution-specml.xml
@@ -1055,9 +1055,9 @@ intermediate:
           <p><req level="must" id="req-modify-set-param-objects1">For the following objects inside the source: class, depends-on, label, usage, values, select; the object MUST be copied into the target from the source, first removing any existing objects with the same name.</req></p>
         </li>
         <li>
-          <p><req level="must" id="req-modify-set-param-objects2">For the following objects inside the source: props, <src>links</src>, <src>constraints</src>, <src>guidelines</src>; the contents of the object MUST be added to the contents of the target object of the same name. If no such object exists in the target, it is created.</req></p>
+          <p><req level="must" id="req-modify-set-param-objects2">For the following objects inside the source: <src>prop</src>, <src>link</src>, <src>constraint</src>, <src>guideline</src>; the contents of the object MUST be added to the contents of the target object of the same name. If no such object exists in the target, it is created.</req></p>
         </li>
-        <li> <p><req level="must" id="req-modify-set-param-objects3">For the following objects inside the source: <src>prop</src>, <src>link</src>; the object MUST be copied into the target from the source, first removing any existing objects with the same distinctive ID. (<xref rid="id"></xref>).</req></p></li>
+        <li> <p><req level="must" id="req-modify-set-param-objects3">For the following objects inside the source: <src>prop</src>, <src>link</src>; the object MUST be copied into the target from the source, first removing any existing objects with the same distinctive ID. (<xref rid="id"/>).</req></p></li>
         <li>
           <p><req level="must" id="req-modify-param-multi">If more than one
             <src>set-parameter</src> directive is given for the same parameter, all MUST BE applied, in the sequence given in the profile.</req>
