From bdecdf19c6595875a9187bc294742dd409608fe0 Mon Sep 17 00:00:00 2001 From: "A.J. Stein" Date: Wed, 19 Feb 2025 15:54:15 -0500 Subject: [PATCH 1/4] Align inventory and component type names for #2092 --- ...oscal_implementation-common_metaschema.xml | 19 ------------------- ...component_inventory-item_property-name.ent | 7 +++++++ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/metaschema/oscal_implementation-common_metaschema.xml b/src/metaschema/oscal_implementation-common_metaschema.xml index b4def97907..61165dc4b3 100644 --- a/src/metaschema/oscal_implementation-common_metaschema.xml +++ b/src/metaschema/oscal_implementation-common_metaschema.xml @@ -567,25 +567,6 @@ The media access control (MAC) address for the asset. The physical location of the asset's hardware (e.g., Data Center ID, Cage#, Rack#, or other meaningful location identifiers). is the asset subjected to network scans? (yes/no) - - - - - The model number of the hardware used by the asset. - - The name of the operating system used by the asset. - - The version of the operating system used by the asset. - - The software product name used by the asset. - - The software product version used by the asset. - - The software product patch level used by the asset. - - - - &allowed-values-component_inventory-item_property-name; diff --git a/src/metaschema/shared-constraints/allowed-values-component_inventory-item_property-name.ent b/src/metaschema/shared-constraints/allowed-values-component_inventory-item_property-name.ent index cf26a06ffe..75927ba766 100644 --- a/src/metaschema/shared-constraints/allowed-values-component_inventory-item_property-name.ent +++ b/src/metaschema/shared-constraints/allowed-values-component_inventory-item_property-name.ent @@ -11,3 +11,10 @@ The name of the baseline configuration for the asset. Can the asset be check with an authenticated scan? (yes/no) The function provided by the asset for the system. +**(deprecated)** Use 'model' instead. +The model of system used by the asset. +The name of the operating system used by the asset. +The version of the operating system used by the asset. +The software product name used by the asset. +The software product version used by the asset. +The software product patch level used by the asset. From 2d8d0ff05a7f9956d5249a56fc9ee512d107491f Mon Sep 17 00:00:00 2001 From: "A.J. Stein" Date: Wed, 19 Feb 2025 16:32:24 -0500 Subject: [PATCH 2/4] Add explicit xmlns for network component entity list for #2092 --- .../allowed-values-property-name-networked-components.ent | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/metaschema/shared-constraints/allowed-values-property-name-networked-components.ent b/src/metaschema/shared-constraints/allowed-values-property-name-networked-components.ent index d6bcbbf67c..45e0c8b3e8 100644 --- a/src/metaschema/shared-constraints/allowed-values-property-name-networked-components.ent +++ b/src/metaschema/shared-constraints/allowed-values-property-name-networked-components.ent @@ -1,4 +1,4 @@ -The Internet Protocol Version 4 address is for an interconnection, service, or software component. -The Internet Protocol Version 6 address is for an interconnection, service, or software component. -The direction categorizes the network connectivity of an interconnection, service, or software component. -A Uniform Resource Identifier (URI) is for an interconnection, service, or software component. +The Internet Protocol Version 4 address is for an interconnection, service, or software component. +The Internet Protocol Version 6 address is for an interconnection, service, or software component. +The direction categorizes the network connectivity of an interconnection, service, or software component. +A Uniform Resource Identifier (URI) is for an interconnection, service, or software component. From 460c62c17f2c05f4b53e64946edbea7d74fb813d Mon Sep 17 00:00:00 2001 From: "A.J. Stein" Date: Wed, 19 Feb 2025 16:33:00 -0500 Subject: [PATCH 3/4] Add fqdn to network component entity list to align values for #2092 --- .../allowed-values-property-name-networked-components.ent | 1 + 1 file changed, 1 insertion(+) diff --git a/src/metaschema/shared-constraints/allowed-values-property-name-networked-components.ent b/src/metaschema/shared-constraints/allowed-values-property-name-networked-components.ent index 45e0c8b3e8..d33e8c0dcf 100644 --- a/src/metaschema/shared-constraints/allowed-values-property-name-networked-components.ent +++ b/src/metaschema/shared-constraints/allowed-values-property-name-networked-components.ent @@ -2,3 +2,4 @@ The Internet Protocol Version 6 address is for an interconnection, service, or software component. The direction categorizes the network connectivity of an interconnection, service, or software component. A Uniform Resource Identifier (URI) is for an interconnection, service, or software component. +The full-qualified domain name (FQDN) of the asset. From 811df5c531057c7059d98dacc9cdeac712f6284d Mon Sep 17 00:00:00 2001 From: "A.J. Stein" Date: Wed, 19 Feb 2025 16:56:45 -0500 Subject: [PATCH 4/4] Also align direction prop to resolve #2086 --- src/metaschema/oscal_implementation-common_metaschema.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/metaschema/oscal_implementation-common_metaschema.xml b/src/metaschema/oscal_implementation-common_metaschema.xml index 61165dc4b3..34206f4f4d 100644 --- a/src/metaschema/oscal_implementation-common_metaschema.xml +++ b/src/metaschema/oscal_implementation-common_metaschema.xml @@ -193,7 +193,7 @@ The name of the remote interconnected system. &allowed-values-property-name-networked-components; - + &allowed-values-property-name-networked-components;