Modified Metapath as per #907

GSA · Nov 25, 2024 · 50d321a · 50d321a
1 parent 4fa7efa
commit 50d321a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/validations/constraints/content/ssp-all-VALID.xml b/src/validations/constraints/content/ssp-all-VALID.xml
@@ -328,13 +328,13 @@
       </remarks>
     </component>
 
-    <component uuid="77777777-0000-4000-9000-000000000007" type="system">
+    <component uuid="77777777-0000-4000-9000-000000000007" type="software">
       <title>Name of External System</title>
       <description>
           <p>Briefly describe the external system.</p>
       </description>
-      <prop name="inherited-uuid" value="11111111-0000-4000-9001-000000000001"/>
-      <prop name="implementation-point" value="external"/>
+      <prop name="asset-type" value="cli"/>
+      <prop name="direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
       <prop name="nature-of-agreement" ns="https://fedramp.gov/ns/oscal" value="isa"/>
       <status state="operational"/>
     </component>

diff --git a/src/validations/constraints/content/ssp-external-system-nature-of-agreement-INVALID.xml b/src/validations/constraints/content/ssp-external-system-nature-of-agreement-INVALID.xml
@@ -6,13 +6,13 @@
 
   <system-implementation>
 
-    <component uuid="77777777-0000-4000-9000-000000000007" type="system">
+    <component uuid="77777777-0000-4000-9000-000000000007" type="software">
       <title>Name of External System</title>
       <description>
           <p>Briefly describe the external system.</p>
       </description>
-      <prop name="inherited-uuid" value="11111111-0000-4000-9001-000000000001"/>
-      <prop name="implementation-point" value="external"/>
+      <prop name="asset-type" value="cli"/>
+      <prop name="direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
       <prop name="nature-of-agreement" ns="https://fedramp.gov/ns/oscal" value="invalid"/>
       <status state="operational"/>
     </component>

diff --git a/src/validations/constraints/fedramp-external-allowed-values.xml b/src/validations/constraints/fedramp-external-allowed-values.xml
@@ -127,7 +127,7 @@
                 <enum value="other">Other</enum>
             </allowed-values>
 
-            <allowed-values id="external-system-nature-of-agreement" target="system-implementation/component[@type='system'][not(prop[@name='leveraged-authorization-uuid'])][prop[@name='implementation-point' and @value='external']]/prop[@name='nature-of-agreement' and @ns='https://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="external-system-nature-of-agreement" target="system-implementation/component[(@type='service' and not(prop[@name='leveraged-authorization-uuid']) and prop[@name='implementation-point' and @value='external']) or (@type='interconnection') or (@type='service' and prop[@name='implementation-point' and @value='internal'] and prop[@name='direction']) or (@type='software' and prop[@name='asset-type' and @value='cli'] and prop[@name='direction'])]/prop[@name='nature-of-agreement' and @ns='https://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
                 <formal-name>Nature of Agreement for External Systems</formal-name>
                 <description>Identifies nature of agreement for external systems.</description>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#external-systems-and-services-not-having-fedramp-authorization"/>