diff --git a/SOL005/NFVICapacityInformation-API/CapacityThresholds.robot b/SOL005/NFVICapacityInformation-API/CapacityThresholds.robot
index ce554660d5b2e6a91ff5fc32729c8908c7f2581a..9181f9197dc4b6c0a1168a5af3627981dd50da75 100644
--- a/SOL005/NFVICapacityInformation-API/CapacityThresholds.robot
+++ b/SOL005/NFVICapacityInformation-API/CapacityThresholds.robot
@@ -7,7 +7,7 @@ POST Create Capacity Threshold
     ...    Test title: POST Create Capacity Threshold
     ...    Test objective: The objective is to test that POST method creates a Capacity  Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -21,7 +21,7 @@ POST Create Capacity Threshold - Unprocessible Content
     ...    Test title: POST Create Capacity Threshold - Unprocessible Content
     ...    Test objective: The objective is to test that POST method creates a Capacity  Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -34,7 +34,7 @@ GET Capacity Thresholds
     ...    Test title: GET Capacity Thresholds
     ...    Test objective: The objective is to GET Capacity Thresholds objects
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -47,7 +47,7 @@ GET Capacity Thresholds - Filter
     ...    Test title: GET Capacity Thresholds - Filter
     ...    Test objective: The objective is to GET Capacity Thresholds objects using filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ GET Capacity Thresholds Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET Capacity Thresholds Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get information about Capacity Thresholds with Invalid attribute-based filtering parameters
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -73,7 +73,7 @@ GET Capacity Thresholds - Bad Request Response too Big
     ...    Test title: GET Capacity Thresholds - Bad Request Response too Big
     ...    Test objective: The objective is test that the retrieval of existing Capacity Thresholds list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO does not support paged response.
     ...    Post-Conditions: none 
@@ -86,7 +86,7 @@ GET Capacity Thresholds as Paged Response
     ...    Test title: GET Capacity Thresholds as Paged Response
     ...    Test objective: The objective is to test that GET method retrieves the list of existing Capacity Thresholds as paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports paged response.
     ...    Post-Conditions: none    
@@ -99,7 +99,7 @@ PUT Capacity Thresholds - Method not implemented
     ...    Test title: PUT Capacity Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -111,7 +111,7 @@ PATCH Capacity Thresholds - Method not implemented
     ...    Test title: PATCH Capacity Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ DELETE Capacity Thresholds - Method not implemented
     ...    Test title: DELETE Capacity Thresholds - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -135,7 +135,7 @@ GET Capacity Thresholds with permitted authorization scope
     ...    Test title: GET Capacity Thresholds with permitted authorization scope
     ...    Test objective: The objective is to GET Capacity Thresholds objects with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -148,7 +148,7 @@ GET Capacity Thresholds with not permitted authorization scope
     ...    Test title: GET Capacity Thresholds with not permitted authorization scope
     ...    Test objective: The objective is to test that GET Capacity Thresholds objects fails when using not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NFVICapacityInformation-API/IndividualCCMsNFVICapacityInformation.robot b/SOL005/NFVICapacityInformation-API/IndividualCCMsNFVICapacityInformation.robot
new file mode 100644
index 0000000000000000000000000000000000000000..cbbac59e1fc6ca1a117c495101ef419389ebf08d
--- /dev/null
+++ b/SOL005/NFVICapacityInformation-API/IndividualCCMsNFVICapacityInformation.robot
@@ -0,0 +1,115 @@
+*** Settings ***
+Resource    NFVICapacityInformationKeywords.robot
+
+*** Test Cases ***
+POST Individual CCMs NFVI Capacity Information - Method not implemented
+    [Documentation]    Test ID: 5.3.6.7.1
+    ...    Test title: POST Individual CCMs NFVI Capacity Information - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.3a.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST Individual CCMs NFVI Capacity Information
+    Check HTTP Response Status Code Is    405
+    
+GET Information about an Individual CCMs NFVI Capacity Information
+    [Documentation]    Test ID: 5.3.6.7.2
+    ...    Test title: GET Information about an Individual CCMs NFVI Capacity Information
+    ...    Test objective: The objective is to retrieve information about Individual CCMs NFVI Capacity Information
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.3a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Individual CCMs NFVI Capacity Information
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    NfviCapacityInfo
+
+GET Information about an Individual CCMs NFVI Capacity Information using filter query parameter
+    [Documentation]    Test ID: 5.3.6.7.3
+    ...    Test title: GET Information about an Individual CCMs NFVI Capacity Information using filter query parameter
+    ...    Test objective: The objective is to retrieve information about Individual CCMs NFVI Capacity Information using filter query parameter
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.3a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Individual CCMs NFVI Capacity Information using filter
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    NfviCapacityInfo
+        
+GET Information about an Individual CCMs NFVI Capacity Information - NOT FOUND
+     [Documentation]    Test ID: 5.3.6.7.4
+    ...    Test title: GET Information about an Individual CCMs NFVI Capacity Information - NOT FOUND
+    ...    Test objective: The objective is to test that the retrieval of Individual CCMs NFVI Capacity Information fails when using an invalid resource identifier.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.3a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
+    ...    Config ID: Config_prod_NFV-MANO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Individual CCMs NFVI Capacity Information with Invalid VIM ID
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+PUT Individual CCMs NFVI Capacity Information - Method not implemented 
+     [Documentation]    Test ID: 5.3.6.7.5
+    ...    Test title: PUT Individual CCMs NFVI Capacity Information - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.3a.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: VNF Snapshot Package not modified
+    PUT Individual CCMs NFVI Capacity Information
+    Check HTTP Response Status Code Is    405
+
+PATCH Individual CCMs NFVI Capacity Information - Method Not implemented
+    [Documentation]    Test ID: 5.3.6.7.6
+    ...    Test title: PATCH Individual CCMs NFVI Capacity Information
+    ...    Test objective: The objective is to test that PATCH method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.3a.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: VNF Snapshot Package modified
+    PATCH Individual CCMs NFVI Capacity Information
+    Check HTTP Response Status Code Is    405
+
+DELETE Individual CCMs NFVI Capacity Information - Method Not implemented 
+    [Documentation]    Test ID: 5.3.6.7.7
+    ...    Test title: DELETE Individual CCMs NFVI Capacity Information - Method Not implemented
+    ...    Test objective: The objective is to test that DELETE method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.3a.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: VNF Snapshot Package deleted
+    DELETE Individual CCMs NFVI Capacity Information
+    Check HTTP Response Status Code Is    405
+
+GET Information about an Individual CCMs NFVI Capacity Information with permitted authorization scope
+    [Documentation]    Test ID: 5.3.6.7.8
+    ...    Test title: GET Information about an Individual CCMs NFVI Capacity Information with permitted authorization scope
+    ...    Test objective: The objective is to retrieve information about Individual CCms NFVI Capacity Information with permitted authorization scope
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.3a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Individual CCMs NFVI Capacity Information with permitted authorization scope
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    NfviCapacityInfo
+
+GET Information about an Individual CCMs NFVI Capacity Information with not permitted authorization scope
+    [Documentation]    Test ID: 5.3.6.7.9
+    ...    Test title: GET Information about an Individual CCMs NFVI Capacity Information with not permitted authorization scope
+    ...    Test objective: The objective is to test that retrieve information about Individual CCMs NFVI Capacity Information fails when using not permitted authorization scope
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.3a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Individual CCMs NFVI Capacity Information with not permitted authorization scope
+    Check HTTP Response Status Code Is    401
\ No newline at end of file
diff --git a/SOL005/NFVICapacityInformation-API/IndividualCapacityThreshold.robot b/SOL005/NFVICapacityInformation-API/IndividualCapacityThreshold.robot
index b5436c6d123ee685865c82b7c0892849f375e10a..de0969f708ebbd1d7c6e742f5d006b65b4cf25ad 100644
--- a/SOL005/NFVICapacityInformation-API/IndividualCapacityThreshold.robot
+++ b/SOL005/NFVICapacityInformation-API/IndividualCapacityThreshold.robot
@@ -7,7 +7,7 @@ POST Individual Capacity Threshold
     ...    Test title: POST Individual Capacity Threshold
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET Individual Capacity Thresholds
     ...    Test title: GET Capacity Thresholds
     ...    Test objective: The objective is to test that GET method reads information about Individual Capacity Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET Individual Capacity Thresholds - NOT FOUND
     ...    Test title: GET Capacity Thresholds - NOT FOUND
     ...    Test objective: The objective is to test that GET method returns an error when using and invalid URI
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ PUT Individual Capacity Threshold - Method not implemented
     ...    Test title: PUT Capacity Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ PATCH Individual Capacity Threshold - Success
     ...    Test title: PATCH Individual Capacity Threshold - Success
     ...    Test objective: The objective is to test that PATCH method successfully modifies an individual Capacity Threshold resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Capacity Threshold modified
@@ -70,7 +70,7 @@ PATCH Individual Capacity Threshold - Precondition Failed
     ...    Test title: PATCH Individual Capacity Threshold - Precondition Failed
     ...    Test objective: The objective is to that the modification of individual Capacity Threshold fails because precondition given in an HTTP request header is not fulfilled due to an ETag mismatch.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -83,7 +83,7 @@ PATCH Individual Capacity Threshold - Precondition Failed HTTP Conditional Reque
     ...    Test title: PATCH Individual Capacity Threshold - Precondition Failed HTTP Conditional Request Not Supported
     ...    Test objective: The objective is to that the modification of individual Capacity Threshold fails because the API Producer does not support "Last-Modified" and "ETag" HTTP Headers
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.4, 4.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.5.3.4, 4.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: API Producer does not support "Last-Modified" and "ETag" HTTP Headers
     ...    Post-Conditions: none
@@ -96,7 +96,7 @@ PATCH Individual Capacity Threshold - Unprocessable Content
     ...    Test title: PATCH Individual Capacity Threshold - Unprocessable Content
     ...    Test objective: The objective is to that the modification of individual Capacity Threshold fails because callbackUri provided in the request body is unreachable.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -109,7 +109,7 @@ DELETE Individual Capacity Threshold
     ...    Test title: DELETE Individual Capacity Threshold
     ...    Test objective: The objective is to delete an Individual Capacity Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Capacity threshold is deleted
@@ -122,7 +122,7 @@ GET Individual Capacity Thresholds with permitted authorization scope
     ...    Test title: GET Capacity Thresholds with permitted authorization scope  
     ...    Test objective: The objective is to test that GET method reads information about Individual Capacity Threshold with permitted authorization scope  
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -135,7 +135,7 @@ GET Individual Capacity Thresholds with not permitted authorization scope
     ...    Test title: GET Capacity Thresholds with not permitted authorization scope  
     ...    Test objective: The objective is to test that GET method fails to read information about Individual Capacity Threshold when using not permitted authorization scope  
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NFVICapacityInformation-API/IndividualVIMsNFVICapacityInformation.robot b/SOL005/NFVICapacityInformation-API/IndividualVIMsNFVICapacityInformation.robot
index b3b2c3c13eb714266998e5e3c5cb0480ce9b5dde..0d1f723594e1bff4c3433d8cc34a2ccd46dd49cd 100644
--- a/SOL005/NFVICapacityInformation-API/IndividualVIMsNFVICapacityInformation.robot
+++ b/SOL005/NFVICapacityInformation-API/IndividualVIMsNFVICapacityInformation.robot
@@ -7,7 +7,7 @@ POST Individual VIMs NFVI Capacity Information - Method not implemented
     ...    Test title: POST Individual VIMs NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET Information about an Individual VIMs NFVI Capacity Information
     ...    Test title: GET Information about an Individual VIMs NFVI Capacity Information
     ...    Test objective: The objective is to retrieve information about Individual VIMs NFVI Capacity Information
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET Information about an Individual VIMs NFVI Capacity Information using filter
     ...    Test title: GET Information about an Individual VIMs NFVI Capacity Information using filter query parameter
     ...    Test objective: The objective is to retrieve information about Individual VIMs NFVI Capacity Information using filter query parameter
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ GET Information about an Individual VIMs NFVI Capacity Information - NOT FOUND
     ...    Test title: GET Information about an Individual VIMs NFVI Capacity Information - NOT FOUND
     ...    Test objective: The objective is to test that the retrieval of Individual VIMs NFVI Capacity Information fails when using an invalid resource identifier.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ PUT Individual VIMs NFVI Capacity Information - Method not implemented
     ...    Test title: PUT Individual VIMs NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package not modified
@@ -70,7 +70,7 @@ PATCH Individual VIMs NFVI Capacity Information - Method Not implemented
     ...    Test title: PATCH Individual VIMs NFVI Capacity Information
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package modified
@@ -82,7 +82,7 @@ DELETE Individual VIMs NFVI Capacity Information - Method Not implemented
     ...    Test title: DELETE Individual VIMs NFVI Capacity Information - Method Not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package deleted
@@ -94,7 +94,7 @@ GET Information about an Individual VIMs NFVI Capacity Information with permitte
     ...    Test title: GET Information about an Individual VIMs NFVI Capacity Information with permitted authorization scope
     ...    Test objective: The objective is to retrieve information about Individual VIMs NFVI Capacity Information with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -107,7 +107,7 @@ GET Information about an Individual VIMs NFVI Capacity Information with not perm
     ...    Test title: GET Information about an Individual VIMs NFVI Capacity Information with not permitted authorization scope
     ...    Test objective: The objective is to test that retrieve information about Individual VIMs NFVI Capacity Information fails when using not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NFVICapacityInformation-API/NFVICapacityInformation.robot b/SOL005/NFVICapacityInformation-API/NFVICapacityInformation.robot
index 7b6a58aeddcb7bd4e098ad0bda4dc91841907c69..c1d9e6f674be81d5bce4644ec25e1cc13d28e200 100644
--- a/SOL005/NFVICapacityInformation-API/NFVICapacityInformation.robot
+++ b/SOL005/NFVICapacityInformation-API/NFVICapacityInformation.robot
@@ -7,7 +7,7 @@ POST NFVI Capacity Information - Method not implemented
     ...    Test title: POST NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET NFVI Capacity Information
     ...    Test title: GET NFVI Capacity Information
     ...    Test objective: The objective is to GET NFVI Capacity Information objects
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET NFVI Capacity Information - Filter
     ...    Test title: GET NFVI Capacity Information - Filter
     ...    Test objective: The objective is to GET NFVI Capacity Information objects using filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ GET NFVI Capacity Information Bad Request Invalid attribute-based filtering para
     ...    Test title: GET NFVI Capacity Information Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get information about NFVI Capacity Information with Invalid attribute-based filtering parameters
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ GET NFVI Capacity Information Bad Request Invalid attribute selector
     ...    Test title: GET NFVI Capacity Information Bad Request Invalid attribute selector
     ...    Test objective: The objective is to get information about NFVI Capacity Information with Invalid attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -71,7 +71,7 @@ GET NFVI Capacity Information with "all_fields" attribute selector
     ...    Test title: GET NFVI Capacity Information with "all_fields" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "all_fields" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ GET NFVI Capacity Information with "exclude_default" attribute selector
     ...    Test title: GET NFVI Capacity Information with "exclude_default" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "exclude_default" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -97,7 +97,7 @@ GET NFVI Capacity Information with "fields" attribute selector
     ...    Test title: GET NFVI Capacity Information with "fields" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "fields" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ GET NFVI Capacity Information with "exclude_default" and "fields" attribute sele
     ...    Test title: GET NFVI Capacity Information with "exclude_default" and "fields" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "exclude_default" and "fields" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ GET NFVI Capacity Information with "exclude_fields" attribute selector
     ...    Test title: GET NFVI Capacity Information with "exclude_fields" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "exclude_fields" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -136,7 +136,7 @@ GET NFVI Capacity Information - Bad Request Response too Big
     ...    Test title: GET NFVI Capacity Information - Bad Request Response too Big
     ...    Test objective: The objective is test that the retrieval of existing NFVI Capacity Information list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO does not support paged response.
     ...    Post-Conditions: none 
@@ -149,7 +149,7 @@ GET NFVI Capacity Information as Paged Response
     ...    Test title: GET NFVI Capacity Information as Paged Response
     ...    Test objective: The objective is to test that GET method retrieves the list of existing NFVI Capacity Information as paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports paged response.
     ...    Post-Conditions: none    
@@ -162,7 +162,7 @@ PUT NFVI Capacity Information - Method not implemented
     ...    Test title: PUT NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -174,7 +174,7 @@ PATCH NFVI Capacity Information - Method not implemented
     ...    Test title: PATCH NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 10.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -186,7 +186,7 @@ DELETE NFVI Capacity Information - Method not implemented
     ...    Test title: DELETE NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -198,7 +198,7 @@ GET NFVI Capacity Information with permitted authorization scope
     ...    Test title: GET NFVI Capacity Information with permitted authorization scope
     ...    Test objective: The objective is to GET NFVI Capacity Information objects with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -211,7 +211,7 @@ GET NFVI Capacity Information with not permitted authorization scope
     ...    Test title: GET NFVI Capacity Information with not permitted authorization scope
     ...    Test objective: The objective is to test that GET NFVI Capacity Information objects fails when using not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NFVICapacityInformation-API/NFVICapacityInformationKeywords.robot b/SOL005/NFVICapacityInformation-API/NFVICapacityInformationKeywords.robot
index 893df1c7696f664afeb9e58c5341dfcffe86849d..820a65190d8cd8fdb58934287f451b5ca0297bc1 100644
--- a/SOL005/NFVICapacityInformation-API/NFVICapacityInformationKeywords.robot
+++ b/SOL005/NFVICapacityInformation-API/NFVICapacityInformationKeywords.robot
@@ -322,6 +322,92 @@ DELETE Individual VIMs NFVI Capacity Information
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
+POST Individual CCMs NFVI Capacity Information
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos/ccm/${ccmId}    
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}        
+
+GET Individual CCMs NFVI Capacity Information
+    log    Trying to get information about an Individual CCMs NFVI Capacity Information
+    Set Headers    {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos/ccm/${ccmId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}   
+
+GET Individual CCMs NFVI Capacity Information with permitted authorization scope
+    log    Trying to get information about an Individual VIMs NFVI Capacity Information
+    Set Headers    {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    ${scopeValue}=    Create Dictionary    scope=${INFOS_PERMITTED_SCOPE} 
+    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=''    algorithm=${OAUTH_ENCRIPTION_ALGORITHM}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
+    Log    Authorization Token: ${authorizationToken}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos/ccm/${ccmId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}  
+
+GET Individual CCMs NFVI Capacity Information with not permitted authorization scope
+    log    Trying to get information about an Individual CCMs NFVI Capacity Information
+    Set Headers    {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    ${scopeValue}=    Create Dictionary    scope=${NOT_PERMITTED_SCOPE} 
+    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=''    algorithm=${OAUTH_ENCRIPTION_ALGORITHM}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
+    Log    Authorization Token: ${authorizationToken}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos/ccm/${ccmId}  		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}   
+
+GET Individual CCMs NFVI Capacity Information using filter
+    log    Trying to get information about an Individual CCMs NFVI Capacity Information
+    Set Headers    {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos/ccm/${ccmId}?${POS_FILTER_info}		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}      
+
+GET Individual CCMs NFVI Capacity Information with Invalid VIM ID
+    log    Trying to get information about an Individual CCMs NFVI Capacity Information
+    Set Headers    {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos/ccm/${invalidCcmId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}      
+	
+PUT Individual CCMs NFVI Capacity Information
+    log    Trying to perform a PUT. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos/ccm/${ccmId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+PATCH Individual CCMs NFVI Capacity Information
+    log    Trying to perform a PATCH. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos/ccm/${ccmId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+DELETE Individual CCMs NFVI Capacity Information
+    log    Trying to perform a DELETE. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos/ccm/${ccmId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
 POST Create a Capacity Threshold
     Log    Trying to POST create a new capacity threshold.
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
diff --git a/SOL005/NFVICapacityInformation-API/NotificationEndpoint.robot b/SOL005/NFVICapacityInformation-API/NotificationEndpoint.robot
index a060f95627753066bda987ffa7e52f11791d4599..4adb2c341c1ee19d30cd3280ab386a8d92105960 100644
--- a/SOL005/NFVICapacityInformation-API/NotificationEndpoint.robot
+++ b/SOL005/NFVICapacityInformation-API/NotificationEndpoint.robot
@@ -8,7 +8,7 @@ Capacity Shortage Notification
     ...    Test title: Capacity Shortage Notification
     ...    Test objective: The objective is to test that Capacity Shortage Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: The consumer has already created an Individual Capacity Threshold resource
-    ...    Reference: Clause 10.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -20,7 +20,7 @@ Test the Notification Endpoint - Successful
     ...    Test title: Test the Notification Endpoint - Successful
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: The consumer has already created an Individual Capacity Threshold resource
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -32,7 +32,7 @@ Test the Notification Endpoint - UNREACHABLE
     ...    Test title: Test the Notification Endpoint - UNREACHABLE
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: The consumer has already created an Individual Capacity Threshold resource
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: The notification endpoint is unreachable by the API producer.
     ...    Post-Conditions: none 
@@ -45,7 +45,7 @@ PUT Notification endpoint - Method Not Implemented
     ...    Test title: PUT Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PUT method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 10.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -57,7 +57,7 @@ PATCH Notification endpoint - Method Not Implemented
     ...    Test title: PATCH Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PATCH method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 10.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -69,7 +69,7 @@ DELETE Notification endpoint - Method Not Implemented
     ...    Test title: DELETE Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the DELETE method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NFVICapacityInformation-API/environment/variables.txt b/SOL005/NFVICapacityInformation-API/environment/variables.txt
index d402693c45599cc3eb981cb65e87e604aa062022..91b10e8d26ae2d2521b22cad22c0bef4b43c1195 100644
--- a/SOL005/NFVICapacityInformation-API/environment/variables.txt
+++ b/SOL005/NFVICapacityInformation-API/environment/variables.txt
@@ -43,4 +43,7 @@ ${invalidVimId}
 ${capacityThreshold}
 ${invalid_capacityThreshold}
 
+${ccmId}
+${invalidCcmId}
+
 ${PRODUCER_SUPPORT_COND_REQ}    1
diff --git a/SOL005/NFVICapacityInformation-API/schemas/NfviCapacityInfo.schema.json b/SOL005/NFVICapacityInformation-API/schemas/NfviCapacityInfo.schema.json
index 79d4b1eb6610a6fe8f063e2b35940fbd82b49645..d495c336c382894b49815660a5da51927ce73719 100644
--- a/SOL005/NFVICapacityInformation-API/schemas/NfviCapacityInfo.schema.json
+++ b/SOL005/NFVICapacityInformation-API/schemas/NfviCapacityInfo.schema.json
@@ -1,143 +1,152 @@
 {
-	"type": "object",
-	"description": "This type defines the format of the NFVI capacity information. The type shall comply with the provisions defined\nin Table 10.5.2.4-1.\n",
-	"required": [
-		"id",
-		"vimId",
-		"capacityInfoPerZone"
-	],
-	"properties": {
-		"id": {
-			"description": "An identifier with the intention of being globally unique.\n",
-			"type": "string"
-		},
-		"vimId": {
-			"description": "An identifier with the intention of being globally unique.\n",
-			"type": "string"
-		},
-		"capacityInfoPerZone": {
-			"description": "Capacity information on a per resource zone basis under control by the associated VIM.\n",
-			"type": "array",
-			"items": {
-				"type": "object",
-				"description": "This type defines the format of the NFVI capacity information on a per resource zone basis.\nThe type shall comply with the provisions defined in table 10.5.2.5-1.\n",
-				"required": [
-					"capacityMeasurements"
-				],
-				"properties": {
-					"resourceZoneId": {
-						"description": "An identifier with the intention of being globally unique.\n",
-						"type": "string"
-					},
-					"capacityMeasurements": {
-						"description": "Capacity measurement on a per resource type basis.\n",
-						"type": "array",
-						"items": {
-							"type": "object",
-							"description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\n",
-							"required": [
-								"resourceType",
-								"capacityMeasurementName",
-								"totalCapacity",
-								"allocatedCapacity",
-								"availableCapacity"
-							],
-							"properties": {
-								"resourceType": {
-									"type": "string",
-									"description": "The enumeration NfviCapacityResourceTypeEnumeration shall comply with the provisions in table 10.5.4.3-1.\n* VR_COMPUTE: For virtualised compute resource.\n* VR_NETWORK: For virtualised network resource.\n* VR_STORAGE: For virtualised storage resource.\n* HOST_COMPUTE: For host compute resource.\n",
-									"enum": [
-										"VR_COMPUTE",
-										"VR_NETWORK",
-										"VR_STORAGE",
-										"HOST_COMPUTE"
-									]
-								},
-								"capacityMeasurementName": {
-									"description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nThe present document and referred documents do not specify the capacity measurements, thus the capacity\nmeasurement names are not specified in the present document version.\n",
-									"type": "string"
-								},
-								"totalCapacity": {
-									"description": "The total capacity.\n",
-									"type": "object"
-								},
-								"allocatedCapacity": {
-									"description": "The allocated/used capacity.\n",
-									"type": "object"
-								},
-								"reservedCapacity": {
-									"description": "The reserved capacity. Shall be present if the capacity measurement relates to a resource type and\n(and sub-type) that is reservable.\n",
-									"type": "object"
-								},
-								"availableCapacity": {
-									"description": "The available capacity.\n",
-									"type": "object"
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"totalCapacityInfo": {
-			"type": "object",
-			"description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\n",
-			"required": [
-				"resourceType",
-				"capacityMeasurementName",
-				"totalCapacity",
-				"allocatedCapacity",
-				"availableCapacity"
-			],
-			"properties": {
-				"resourceType": {
-					"type": "string",
-					"description": "The enumeration NfviCapacityResourceTypeEnumeration shall comply with the provisions in table 10.5.4.3-1.\n* VR_COMPUTE: For virtualised compute resource.\n* VR_NETWORK: For virtualised network resource.\n* VR_STORAGE: For virtualised storage resource.\n* HOST_COMPUTE: For host compute resource.\n",
-					"enum": [
-						"VR_COMPUTE",
-						"VR_NETWORK",
-						"VR_STORAGE",
-						"HOST_COMPUTE"
-					]
-				},
-				"capacityMeasurementName": {
-					"description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nThe present document and referred documents do not specify the capacity measurements, thus the capacity\nmeasurement names are not specified in the present document version.\n",
-					"type": "string"
-				},
-				"totalCapacity": {
-					"description": "The total capacity.\n",
-					"type": "object"
-				},
-				"allocatedCapacity": {
-					"description": "The allocated/used capacity.\n",
-					"type": "object"
-				},
-				"reservedCapacity": {
-					"description": "The reserved capacity. Shall be present if the capacity measurement relates to a resource type and\n(and sub-type) that is reservable.\n",
-					"type": "object"
-				},
-				"availableCapacity": {
-					"description": "The available capacity.\n",
-					"type": "object"
-				}
-			}
-		},
-		"timeInterval": {
-			"type": "object",
-			"description": "This type defines the format of a time interval. The type shall comply with the provisions defined in table 10.5.2.7-1.\n",
-			"required": [
-				"aTime"
-			],
-			"properties": {
-				"aTime": {
-					"description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
-					"format": "date-time"
-				},
-				"bTime": {
-					"description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
-					"format": "date-time"
-				}
-			}
-		}
-	}
+    "type": "object",
+    "description": "This type defines the format of the NFVI capacity information. The type shall comply with the provisions defined\nin Table 10.5.2.4-1.\n",
+    "required": [
+        "id",
+        "capacityInfoPerZone"
+    ],
+    "properties": {
+        "id": {
+            "description": "An identifier with the intention of being globally unique.\n",
+            "type": "string"
+        },
+        "vimId": {
+            "description": "An identifier with the intention of being globally unique.\n",
+            "type": "string"
+        },
+        "ccmId": {
+            "description": "Identifies the CCM to which the NFVI capacity information is associated. \n",
+            "type": "string"
+        },
+        "capacityInfoPerZone": {
+            "description": "Capacity information on a per resource zone basis under control by the associated VIM.\n",
+            "type": "array",
+            "items": {
+                "type": "object",
+                "description": "This type defines the format of the NFVI capacity information on a per resource zone basis.\nThe type shall comply with the provisions defined in table 10.5.2.5-1.\n",
+                "required": [
+                    "capacityMeasurements"
+                ],
+                "properties": {
+                    "resourceZoneId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                    },
+                    "cisClusterId": {
+                        "description": "Identifies the CIS cluster of the applicable NFVI capacity information.\n",
+                        "type": "string"
+                    },
+                    "capacityMeasurements": {
+                        "description": "Capacity measurement on a per resource type basis.\n",
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\nNOTE: The present document and referred documents do not specify the capacity measurements,\nthus the capacity measurement names are not specified in the present document version.\n",
+                            "required": [
+                                "resourceType",
+                                "capacityMeasurementName",
+                                "totalCapacity",
+                                "allocatedCapacity",
+                                "availableCapacity"
+                            ],
+                            "properties": {
+                                "resourceType": {
+                                    "type": "string",
+                                    "description": "The enumeration NfviCapacityResourceTypeEnumeration shall comply with the provisions in table 10.5.4.3-1.\n* VR_COMPUTE: For virtualised compute resource.\n* VR_NETWORK: For virtualised network resource.\n* VR_STORAGE: For virtualised storage resource.\n* HOST_COMPUTE: For host compute resource.\n",
+                                    "enum": [
+                                        "VR_COMPUTE",
+                                        "VR_NETWORK",
+                                        "VR_STORAGE",
+                                        "HOST_COMPUTE"
+                                    ]
+                                },
+                                "capacityMeasurementName": {
+                                    "description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nSee note.\n",
+                                    "type": "string"
+                                },
+                                "totalCapacity": {
+                                    "description": "The total capacity.\n",
+                                    "type": "object"
+                                },
+                                "allocatedCapacity": {
+                                    "description": "The allocated/used capacity.\n",
+                                    "type": "object"
+                                },
+                                "reservedCapacity": {
+                                    "description": "The reserved capacity. Shall be present if the capacity measurement relates to a resource type and\n(and sub-type) that is reservable.\n",
+                                    "type": "object"
+                                },
+                                "availableCapacity": {
+                                    "description": "The available capacity.\n",
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "totalCapacityInfo": {
+            "type": "object",
+            "description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\nNOTE: The present document and referred documents do not specify the capacity measurements,\nthus the capacity measurement names are not specified in the present document version.\n",
+            "required": [
+                "resourceType",
+                "capacityMeasurementName",
+                "totalCapacity",
+                "allocatedCapacity",
+                "availableCapacity"
+            ],
+            "properties": {
+                "resourceType": {
+                    "type": "string",
+                    "description": "The enumeration NfviCapacityResourceTypeEnumeration shall comply with the provisions in table 10.5.4.3-1.\n* VR_COMPUTE: For virtualised compute resource.\n* VR_NETWORK: For virtualised network resource.\n* VR_STORAGE: For virtualised storage resource.\n* HOST_COMPUTE: For host compute resource.\n",
+                    "enum": [
+                        "VR_COMPUTE",
+                        "VR_NETWORK",
+                        "VR_STORAGE",
+                        "HOST_COMPUTE"
+                    ]
+                },
+                "capacityMeasurementName": {
+                    "description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nSee note.\n",
+                    "type": "string"
+                },
+                "totalCapacity": {
+                    "description": "The total capacity.\n",
+                    "type": "object"
+                },
+                "allocatedCapacity": {
+                    "description": "The allocated/used capacity.\n",
+                    "type": "object"
+                },
+                "reservedCapacity": {
+                    "description": "The reserved capacity. Shall be present if the capacity measurement relates to a resource type and\n(and sub-type) that is reservable.\n",
+                    "type": "object"
+                },
+                "availableCapacity": {
+                    "description": "The available capacity.\n",
+                    "type": "object"
+                }
+            }
+        },
+        "timeInterval": {
+            "type": "object",
+            "description": "This type defines the format of a time interval. The type shall comply with the provisions defined in table 10.5.2.7-1.\nNOTE: When only the aTime is present, there is no time interval being defined, and therefore the provided timing\ninformation refers to a specific point in time.\n",
+            "required": [
+                "aTime"
+            ],
+            "properties": {
+                "aTime": {
+                    "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
+                    "type": "string",
+                    "format": "date-time"
+                },
+                "bTime": {
+                    "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
+                    "type": "string",
+                    "format": "date-time"
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/SOL005/NFVICapacityInformation-API/schemas/NfviCapacityInfos.schema.json b/SOL005/NFVICapacityInformation-API/schemas/NfviCapacityInfos.schema.json
index f8329b9506185fe60ab11d2f33fd1cb4a2776c46..1c44b222f36b96998015a00cfb1b608fbd6cb6f9 100644
--- a/SOL005/NFVICapacityInformation-API/schemas/NfviCapacityInfos.schema.json
+++ b/SOL005/NFVICapacityInformation-API/schemas/NfviCapacityInfos.schema.json
@@ -1,147 +1,155 @@
 {
-  "type": "array",
-  "items":
-  {
-	"type": "object",
-	"description": "This type defines the format of the NFVI capacity information. The type shall comply with the provisions defined\nin Table 10.5.2.4-1.\n",
-	"required": [
-		"id",
-		"vimId",
-		"capacityInfoPerZone"
-	],
-	"properties": {
-		"id": {
-			"description": "An identifier with the intention of being globally unique.\n",
-			"type": "string"
-		},
-		"vimId": {
-			"description": "An identifier with the intention of being globally unique.\n",
-			"type": "string"
-		},
-		"capacityInfoPerZone": {
-			"description": "Capacity information on a per resource zone basis under control by the associated VIM.\n",
-			"type": "array",
-			"items": {
-				"type": "object",
-				"description": "This type defines the format of the NFVI capacity information on a per resource zone basis.\nThe type shall comply with the provisions defined in table 10.5.2.5-1.\n",
-				"required": [
-					"capacityMeasurements"
-				],
-				"properties": {
-					"resourceZoneId": {
-						"description": "An identifier with the intention of being globally unique.\n",
-						"type": "string"
-					},
-					"capacityMeasurements": {
-						"description": "Capacity measurement on a per resource type basis.\n",
-						"type": "array",
-						"items": {
-							"type": "object",
-							"description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\n",
-							"required": [
-								"resourceType",
-								"capacityMeasurementName",
-								"totalCapacity",
-								"allocatedCapacity",
-								"availableCapacity"
-							],
-							"properties": {
-								"resourceType": {
-									"type": "string",
-									"description": "The enumeration NfviCapacityResourceTypeEnumeration shall comply with the provisions in table 10.5.4.3-1.\n* VR_COMPUTE: For virtualised compute resource.\n* VR_NETWORK: For virtualised network resource.\n* VR_STORAGE: For virtualised storage resource.\n* HOST_COMPUTE: For host compute resource.\n",
-									"enum": [
-										"VR_COMPUTE",
-										"VR_NETWORK",
-										"VR_STORAGE",
-										"HOST_COMPUTE"
-									]
-								},
-								"capacityMeasurementName": {
-									"description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nThe present document and referred documents do not specify the capacity measurements, thus the capacity\nmeasurement names are not specified in the present document version.\n",
-									"type": "string"
-								},
-								"totalCapacity": {
-									"description": "The total capacity.\n",
-									"type": "object"
-								},
-								"allocatedCapacity": {
-									"description": "The allocated/used capacity.\n",
-									"type": "object"
-								},
-								"reservedCapacity": {
-									"description": "The reserved capacity. Shall be present if the capacity measurement relates to a resource type and\n(and sub-type) that is reservable.\n",
-									"type": "object"
-								},
-								"availableCapacity": {
-									"description": "The available capacity.\n",
-									"type": "object"
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"totalCapacityInfo": {
-			"type": "object",
-			"description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\n",
-			"required": [
-				"resourceType",
-				"capacityMeasurementName",
-				"totalCapacity",
-				"allocatedCapacity",
-				"availableCapacity"
-			],
-			"properties": {
-				"resourceType": {
-					"type": "string",
-					"description": "The enumeration NfviCapacityResourceTypeEnumeration shall comply with the provisions in table 10.5.4.3-1.\n* VR_COMPUTE: For virtualised compute resource.\n* VR_NETWORK: For virtualised network resource.\n* VR_STORAGE: For virtualised storage resource.\n* HOST_COMPUTE: For host compute resource.\n",
-					"enum": [
-						"VR_COMPUTE",
-						"VR_NETWORK",
-						"VR_STORAGE",
-						"HOST_COMPUTE"
-					]
-				},
-				"capacityMeasurementName": {
-					"description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nThe present document and referred documents do not specify the capacity measurements, thus the capacity\nmeasurement names are not specified in the present document version.\n",
-					"type": "string"
-				},
-				"totalCapacity": {
-					"description": "The total capacity.\n",
-					"type": "object"
-				},
-				"allocatedCapacity": {
-					"description": "The allocated/used capacity.\n",
-					"type": "object"
-				},
-				"reservedCapacity": {
-					"description": "The reserved capacity. Shall be present if the capacity measurement relates to a resource type and\n(and sub-type) that is reservable.\n",
-					"type": "object"
-				},
-				"availableCapacity": {
-					"description": "The available capacity.\n",
-					"type": "object"
-				}
-			}
-		},
-		"timeInterval": {
-			"type": "object",
-			"description": "This type defines the format of a time interval. The type shall comply with the provisions defined in table 10.5.2.7-1.\n",
-			"required": [
-				"aTime"
-			],
-			"properties": {
-				"aTime": {
-					"description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
-					"format": "date-time"
-				},
-				"bTime": {
-					"description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
-					"format": "date-time"
-				}
-			}
-		}
-	}
-  }
-} 
\ No newline at end of file
+    "type": "array",
+    "items": {
+        "type": "object",
+        "description": "This type defines the format of the NFVI capacity information. The type shall comply with the provisions defined\nin Table 10.5.2.4-1.\n",
+        "required": [
+            "id",
+            "capacityInfoPerZone"
+        ],
+        "properties": {
+            "id": {
+                "description": "An identifier with the intention of being globally unique.\n",
+                "type": "string"
+            },
+            "vimId": {
+                "description": "An identifier with the intention of being globally unique.\n",
+                "type": "string"
+            },
+			"ccmId": {
+                "description": "Identifies the CCM to which the NFVI capacity information is associated. \n",
+                "type": "string"
+            },
+            "capacityInfoPerZone": {
+                "description": "Capacity information on a per resource zone basis under control by the associated VIM.\n",
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "description": "This type defines the format of the NFVI capacity information on a per resource zone basis.\nThe type shall comply with the provisions defined in table 10.5.2.5-1.\n",
+                    "required": [
+                        "capacityMeasurements"
+                    ],
+                    "properties": {
+                        "resourceZoneId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                        },
+						"cisClusterId": {
+                            "description": "Identifies the CIS cluster of the applicable NFVI capacity information.\n",
+                            "type": "string"
+                        },
+                        "capacityMeasurements": {
+                            "description": "Capacity measurement on a per resource type basis.\n",
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\nNOTE: The present document and referred documents do not specify the capacity measurements,\nthus the capacity measurement names are not specified in the present document version.\n",
+                                "required": [
+                                    "resourceType",
+                                    "capacityMeasurementName",
+                                    "totalCapacity",
+                                    "allocatedCapacity",
+                                    "availableCapacity"
+                                ],
+                                "properties": {
+                                    "resourceType": {
+                                        "type": "string",
+                                        "description": "The enumeration NfviCapacityResourceTypeEnumeration shall comply with the provisions in table 10.5.4.3-1.\n* VR_COMPUTE: For virtualised compute resource.\n* VR_NETWORK: For virtualised network resource.\n* VR_STORAGE: For virtualised storage resource.\n* HOST_COMPUTE: For host compute resource.\n",
+                                        "enum": [
+                                            "VR_COMPUTE",
+                                            "VR_NETWORK",
+                                            "VR_STORAGE",
+                                            "HOST_COMPUTE"
+                                        ]
+                                    },
+                                    "capacityMeasurementName": {
+                                        "description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nSee note.\n",
+                                        "type": "string"
+                                    },
+                                    "totalCapacity": {
+                                        "description": "The total capacity.\n",
+                                        "type": "object"
+                                    },
+                                    "allocatedCapacity": {
+                                        "description": "The allocated/used capacity.\n",
+                                        "type": "object"
+                                    },
+                                    "reservedCapacity": {
+                                        "description": "The reserved capacity. Shall be present if the capacity measurement relates to a resource type and\n(and sub-type) that is reservable.\n",
+                                        "type": "object"
+                                    },
+                                    "availableCapacity": {
+                                        "description": "The available capacity.\n",
+                                        "type": "object"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "totalCapacityInfo": {
+                "type": "object",
+                "description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\nNOTE: The present document and referred documents do not specify the capacity measurements,\nthus the capacity measurement names are not specified in the present document version.\n",
+                "required": [
+                    "resourceType",
+                    "capacityMeasurementName",
+                    "totalCapacity",
+                    "allocatedCapacity",
+                    "availableCapacity"
+                ],
+                "properties": {
+                    "resourceType": {
+                        "type": "string",
+                        "description": "The enumeration NfviCapacityResourceTypeEnumeration shall comply with the provisions in table 10.5.4.3-1.\n* VR_COMPUTE: For virtualised compute resource.\n* VR_NETWORK: For virtualised network resource.\n* VR_STORAGE: For virtualised storage resource.\n* HOST_COMPUTE: For host compute resource.\n",
+                        "enum": [
+                            "VR_COMPUTE",
+                            "VR_NETWORK",
+                            "VR_STORAGE",
+                            "HOST_COMPUTE"
+                        ]
+                    },
+                    "capacityMeasurementName": {
+                        "description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nSee note.\n",
+                        "type": "string"
+                    },
+                    "totalCapacity": {
+                        "description": "The total capacity.\n",
+                        "type": "object"
+                    },
+                    "allocatedCapacity": {
+                        "description": "The allocated/used capacity.\n",
+                        "type": "object"
+                    },
+                    "reservedCapacity": {
+                        "description": "The reserved capacity. Shall be present if the capacity measurement relates to a resource type and\n(and sub-type) that is reservable.\n",
+                        "type": "object"
+                    },
+                    "availableCapacity": {
+                        "description": "The available capacity.\n",
+                        "type": "object"
+                    }
+                }
+            },
+            "timeInterval": {
+                "type": "object",
+                "description": "This type defines the format of a time interval. The type shall comply with the provisions defined in table 10.5.2.7-1.\nNOTE: When only the aTime is present, there is no time interval being defined, and therefore the provided timing\ninformation refers to a specific point in time.\n",
+                "required": [
+                    "aTime"
+                ],
+                "properties": {
+                    "aTime": {
+                        "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "bTime": {
+                        "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
+                        "type": "string",
+                        "format": "date-time"
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file