Skip to content

Commit

Permalink
1797 allow local definition of asset type prop values (#1821)
Browse files Browse the repository at this point in the history
* adjusted asset-type value

* Apply suggestions from code review

---------

Co-authored-by: A.J. Stein <[email protected]>
  • Loading branch information
Arminta-Jenkins-NIST and aj-stein-nist authored Jul 11, 2023
1 parent 2b848fa commit bc7efd3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/metaschema/oscal_component_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
&allowed-values-responsible-roles-component-production;
</allowed-values>

<allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value">
<allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value" allow-other="yes">
&allowed-values-property-name-asset-type-values;
</allowed-values>

Expand Down
4 changes: 2 additions & 2 deletions src/metaschema/oscal_implementation-common_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
&allowed-values-responsible-roles-component-production;
</allowed-values>

<allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value">
<allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value" allow-other="yes">
&allowed-values-property-name-asset-type-values;
</allowed-values>

Expand Down Expand Up @@ -579,7 +579,7 @@
&allowed-values-component_inventory-item_property-name;

</allowed-values>
<allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value">
<allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='asset-type']/@value" allow-other="yes">
&allowed-values-property-name-asset-type-values;
</allowed-values>

Expand Down

0 comments on commit bc7efd3

Please sign in to comment.