Merge branch 'develop' into add-interconnection-component-linked-has-…

…protocol

features/fedramp_extensions.feature

@@ -38,6 +38,7 @@ Examples:
   | cia-impact-has-selected |
   | cloud-service-model |
   | component-has-authentication-method |
+  | component-has-diagram-label |
   | component-has-non-provider-responsible-role |
   | component-has-provider-responsible-role |
   | component-has-used-by-link |
@@ -125,11 +126,15 @@ Examples:
   | interconnection-security |
   | inventory-item-allows-authenticated-scan |
   | inventory-item-and-component-has-public |
+  | inventory-item-has-asset-type |
+  | inventory-item-has-diagram-label |
   | inventory-item-has-function |
+  | inventory-item-has-is-scanned |
   | inventory-item-has-scan-type |
   | inventory-item-has-valid-mac-address |
   | inventory-item-has-vendor-name |
   | inventory-item-or-component-has-asset-id |
+  | inventory-item-or-component-has-virtual |
   | inventory-item-public |
   | inventory-item-virtual |
   | last-accessed-is-datetime |
@@ -217,6 +222,8 @@ Examples:
   | cloud-service-model-PASS.yaml |
   | component-has-authentication-method-FAIL.yaml |
   | component-has-authentication-method-PASS.yaml |
+  | component-has-diagram-label-FAIL.yaml |
+  | component-has-diagram-label-PASS.yaml |
   | component-has-non-provider-responsible-role-FAIL.yaml |
   | component-has-non-provider-responsible-role-PASS.yaml |
   | component-has-used-by-link-FAIL.yaml |
@@ -391,8 +398,14 @@ Examples:
   | inventory-item-allows-authenticated-scan-PASS.yaml |
   | inventory-item-and-component-has-public-FAIL.yaml |
   | inventory-item-and-component-has-public-PASS.yaml |
+  | inventory-item-has-asset-type-FAIL.yaml |
+  | inventory-item-has-asset-type-PASS.yaml |
+  | inventory-item-has-diagram-label-FAIL.yaml |
+  | inventory-item-has-diagram-label-PASS.yaml |
   | inventory-item-has-function-FAIL.yaml |
   | inventory-item-has-function-PASS.yaml |
+  | inventory-item-has-is-scanned-FAIL.yaml |
+  | inventory-item-has-is-scanned-PASS.yaml |
   | inventory-item-has-scan-type-FAIL.yaml |
   | inventory-item-has-scan-type-PASS.yaml |
   | inventory-item-has-valid-mac-address-FAIL.yaml |
@@ -405,6 +418,8 @@ Examples:
   | inventory-item-public-PASS.yaml |
   | inventory-item-virtual-FAIL.yaml |
   | inventory-item-virtual-PASS.yaml |
+  | iventory-item-or-component-has-virtual-FAIL.yaml |
+  | iventory-item-or-component-has-virtual-PASS.yaml |
   | last-accessed-is-datetime-FAIL.yaml |
   | last-accessed-is-datetime-PASS.yaml |
   | leveraged-authorization-has-authorization-type-FAIL.yaml |

src/validations/constraints/content/ssp-component-has-diagram-label-INVALID.xml

@@ -0,0 +1,10 @@
+<system-security-plan xmlns="http://csrc.nist.gov/ns/oscal/1.0" uuid="11111111-2222-4000-8000-000000000000">
+  <system-implementation>
+    <component uuid="11111111-2222-4000-8000-009000000007" type="hardware">
+      <!-- <prop name='diagram-label' ns='http://fedramp.gov/ns/oscal' value='label'/> Missing "diagram-label" prop. -->
+    </component>
+    <inventory-item uuid="11111111-2222-4000-8000-011000000001">
+      <implemented-component component-uuid="11111111-2222-4000-8000-009000000005"/>
+    </inventory-item>
+  </system-implementation>
+</system-security-plan>

src/validations/constraints/content/ssp-control-implementation-status-INVALID.xml

@@ -7,7 +7,7 @@
     <implemented-requirement uuid="88888888-0000-4000-9000-000000000008" control-id="ac-1">
       <statement statement-id="ac-1_stmt.a" uuid="99999999-0000-4000-9000-000000000009">
         <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="aaaaaaaa-0000-4000-9000-00000000000a">
-          <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="unsupported-status"/>
+          <implementation-status state="unsupported-status"/>
         </by-component>
       </statement>
     </implemented-requirement>