Sprint24 model enhancements

[wendellpiez]

Committer Notes

Addressing #499 and #511.

All Submissions:

• Have you followed the guidelines in our Contributing document?
• Have you checked to ensure there aren't other open Pull Requests for the same update/change?
• Have you squashed any non-relevant commits and commit messages? [instructions]
• Do all automated CI/CD checks pass?

Changes to Core Features:

• Have you added an explanation of what your changes do and why you'd like us to include them? See Issues annotation field in profile //alter/add #499, Add targeting attributes to modify/alter/add in profile model #511
• Have you written new tests for your core changes, as applicable?
  n/a - all changes are backward-compatible
• Have you included examples of how to use your new feature(s)?
  n/a - self-explanatory
• Have you updated all OSCAL website and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the docs/content directory of your branch. docs will update

[david-waltermire]

These changes look right to me. I'd like to have @brianrufgsa also review before accepting this PR.

[david-waltermire]

@wendellpiez Please rebase this branch against master.

[wendellpiez]

Now rebased against latest this a.m.

[brian-ruf]

This appears to meet the minimum requirement of Issue #511 by adding the @id-ref attribute to the add assembly. It appears the @position attribute has also be constrained to "before", "after", "starting", "ending" (consistent with our documentation), and is still available in cooperation with the new @id-ref.

[wendellpiez]

@brianrufgsa can we confer on this? Not sure we are looking at the same thing. I see both add/@id-ref and add/@position with the enumerated values starting ending before and after. (I am looking at the metaschema and testing a sample against the generated XSD.)

[wendellpiez]

Oh I see, @brianrufgsa there's a typo in your comment I think we're actually okay.

Of course now I have pushed again we need to review the PR again (sorry). heads-up @david-waltermire-nist I added a bit more to the schema docs.

[wendellpiez]

This PR also addresses #499

[brian-ruf]

See comment from my review performed on 11/21.