diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeInterfaceStateTask.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeInterfaceStateTask.robot
index 256dc21570a69ed64f8cad0562de890ba449164a..be0a1c326bb7d8f6079492d4585edd70ac35e27d 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeInterfaceStateTask.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeInterfaceStateTask.robot
@@ -13,7 +13,7 @@ POST Change interface state task
     ...    Test title: POST Change interface state task
     ...    Test objective: The objective is send put request to change the state of the NFV-MANO service interface produced by the NFV-MANO functional entity
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: interface status changed
@@ -27,7 +27,7 @@ POST Change interface state task - Conflict
     ...    Test title: POST Change interface state task - Conflict
     ...    Test objective: The objective is to test that request to cchange the state of the NFV-MANO service interface produced by the NFV-MANO functional entity failed due to a conflict with the state of the NFV-MANO entity resource and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ GET Change interface state task - Method not implemented
     ...    Test title: GET Change interface state task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not allowed to retrieve the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.12.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ PUT Change interface state task - Conflict - Method not implemented
     ...    Test title: PUT Change interface state task - Conflict - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.12.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PATCH Change interface state task - Conflict - Method not implemented
     ...    Test title: PATCH Change interface state task - Conflict - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.12.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ DELETE Change interface state task - Conflict - Method not implemented
     ...    Test title: DELETE Change interface state task - Conflict - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.12.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ POST Change interface state task with permitted authorization scope
     ...    Test title: POST Change interface state task with permitted authorization scope
     ...    Test objective: The objective is send put request to change the state of the NFV-MANO service interface with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: interface status changed
@@ -102,7 +102,7 @@ POST Change interface state task with not permitted authorization scope
     ...    Test title: POST Change interface state task with permitted authorization scope
     ...    Test objective: The objective is to verify that put request to change the state of the NFV-MANO service interface fails with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.12.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: interface status changed
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
index 450faa0922f3dbca29f8e33487708799fd18eadf..3f14b30109b00f365d9b5ddc62a92650e18c0f23 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
@@ -12,7 +12,7 @@ POST NFV-MANO functional entity application state change
     ...    Test title: POST NFV-MANO functional entity application state change
     ...    Test objective: The objective is to request state change of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: entity status changed
@@ -26,7 +26,7 @@ POST NFV-MANO functional entity application state change - Conflict
     ...    Test title: POST NFV-MANO functional entity application state change - Conflict
     ...    Test objective: The objective is to test that request to change the state of the NFV-MANO functional entity application fails due to a conflict with the state of the NFV-MANO entity resource and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ GET NFV-MANO functional entity application state change - Method not implemented
     ...    Test title: GET NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that GET method is not allowed to retrieve the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ PUT NFV-MANO functional entity application state change - Method not implemented
     ...    Test title: PUT NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ PATCH NFV-MANO functional entity application state change - Method not implement
     ...    Test title: PATCH NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ DELETE NFV-MANO functional entity application state change - Method not implemen
     ...    Test title: DELETE NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ POST NFV-MANO functional entity application state change with permitted authoriz
     ...    Test title: POST NFV-MANO functional entity application state change with permitted authorization scope
     ...    Test objective: The objective is to test a state change of the NFV-MANO functional entity application with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: entity status changed
@@ -101,7 +101,7 @@ POST NFV-MANO functional entity application state change with not permitted auth
     ...    Test title: POST NFV-MANO functional entity application state change with not permitted authorization scope
     ...    Test objective: The objective is to test that state change of the NFV-MANO functional entity application fails with not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: entity status changed
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeStateOperationOccurrences.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeStateOperationOccurrences.robot
index 03058d004bbb94b8cd65ff3d37abe83ede4ba359..4956c13b5f26c71d2b39ef58e23d2dd49d5d5d7e 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeStateOperationOccurrences.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeStateOperationOccurrences.robot
@@ -13,7 +13,7 @@ POST Change State Operation Occurrences - Method not implemented
     ...    Test title: POST Change State Operation Occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Change State Operation Occurrences
     ...    Test title: GET Change State Operation Occurrences
     ...    Test objective: The objective is to query status information about multiple change state operation occurrences, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -38,7 +38,7 @@ GET Change State Operation Occurrences - invalid attribute-based filter
     ...    Test title: GET Change State Operation Occurrences - invalid attribute-based filter
     ...    Test objective:  The objective is to test that the retrieval of Change State Operation Occurrences fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ GET Change State Operation Occurrences - invalid attribute selector
     ...    Test title: GET Change State Operation Occurrences - invalid attribute selector
     ...    Test objective: The objective is to test that the retrieval of Change State Operation Occurrences fails when using invalid attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ GET Change State Operation Occurrences - Bad Request Response too Big
     ...    Test title: GET Change State Operation Occurrences - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of Change State Operation Occurrences fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ GET Change State Operation Occurrences with attribute-based filter
     ...    Test title: GET Change State Operation Occurrences with attribute-based filter
     ...    Test objective: The objective is to query status information about multiple change state operation occurrences with attribute filters, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ GET Change State Operation Occurrences with "all_fields" attribute selector
     ...    Test title: GET Change State Operation Occurrences with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve Change State Operation Occurrences with "all_fields" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -103,7 +103,7 @@ GET Change State Operation Occurrences with "exclude_default" attribute selector
     ...    Test title: GET Change State Operation Occurrence with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve Change State Operation Occurrence with "exclude_default" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ GET Change State Operation Occurrences with "fields" attribute selector
     ...    Test title: GET Change State Operation Occurrences with "fields" attribute selector
     ...    Test objective: The objective is to retrieve Change State Operation Occurrences with fields attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ GET Change State Operation Occurrences with "exclude_fields" attribute selector
     ...    Test title: GET Change State Operation Occurrences with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve Change State Operation Occurrences with "exclude_fields" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -142,7 +142,7 @@ GET Change State Operation Occurrences with Paged Response
     ...    Test title: GET Change State Operation Occurrence with Paged Response
     ...    Test objective: The objective is to query Change State Operation Occurrence to get Paged Response.
     ...    Pre-conditions:  none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -155,7 +155,7 @@ GET Change State Operation Occurrences with "fields" and "exclude_default" attri
     ...    Test title: GET Change State Operation Occurrences with "fields" and "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve Change State Operation Occurrences with fields and exclude default attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -168,7 +168,7 @@ PUT Change State Operation Occurrences - Method not implemented
     ...    Test title: PUT Change State Operation Occurrences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -180,7 +180,7 @@ PATCH Change State Operation Occurrences - Method not implemented
     ...    Test title: PATCH Change State Operation Occurrences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -192,7 +192,7 @@ DELETE Change State Operation Occurrences - Method not implemented
     ...    Test title: DELETE Change State Operation Occurrences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -204,7 +204,7 @@ GET Change State Operation Occurrences with permitted authorization scope
     ...    Test title: GET Change State Operation Occurrences with permitted authorization scope
     ...    Test objective: The objective is to query status information about multiple change state operation occurrences with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -217,7 +217,7 @@ GET Change State Operation Occurrences with not permitted authorization scope
     ...    Test title: GET Change State Operation Occurrences with not permitted authorization scope
     ...    Test objective: The objective is to query status information about multiple change state operation occurrences and verify the failure when using a not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualNFVMANOServiceInterface.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualNFVMANOServiceInterface.robot
index c4aee2ba18fb47216c2bc3d47cd0854c24510983..7f78d8a8e5001f53194959b1013529287147c2a5 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualNFVMANOServiceInterface.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualNFVMANOServiceInterface.robot
@@ -13,7 +13,7 @@ POST Individual NFV-MANO Service Interface - Method not implemented
     ...    Test title: POST Individual NFV-MANO Service Interface - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.11.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.11.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Individual NFV-MANO Service Interface
     ...    Test title: GET Individual NFV-MANO Service Interface
     ...    Test objective: The objective is to query status information about an NFV-MANO service interface of the producer NFV-MANO functional entity by reading an "Individual NFV-MANO service interface" resource, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.11.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.11.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -38,7 +38,7 @@ GET Individual NFV-MANO Service Interface - Not Found
     ...    Test title: GET Individual NFV-MANO Service Interface - Not Found
     ...    Test objective: The objective is to test the retrieval of information about an NFV-MANO service interface of the producer NFV-MANO functional entity by reading an "Individual NFV-MANO service interface" resource fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.11.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.11.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ PUT Individual NFV-MANO Service Interface - Method not implemented
     ...    Test title: PUT Individual NFV-MANO Service Interface - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.11.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.11.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ PATCH Individual NFV-MANO Service Interface
     ...    Test title: PATCH Individual NFV-MANO Service Interface
     ...    Test objective: This method modifies the Individual NFV-MANO Service Interface resource, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: Individual NFV-MANO Service Interface resource is already created.
-    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Individual NFV-MANO Service Interface is modified by the operation
@@ -76,7 +76,7 @@ PATCH Individual NFV-MANO Service Interface - Conflict
     ...    Test title: PATCH Individual NFV-MANO Service Interface - Conflict
     ...    Test objective: The objective is to test that the modification of the Individual NFV-MANO Service Interface resource failed due to a conflict with the state of the Individual NFV-MANO Service Interface resource and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: Individual NFV-MANO Service Interface resource is already created.
-    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Individual NFV-MANO Service Interface is not modified by the operation
@@ -89,7 +89,7 @@ PATCH Individual NFV-MANO Service Interface - PreCondition Failed
     ...    Test title: PATCH Individual NFV-MANO Service Interface - PreCondition Failed
     ...    Test objective: The objective is to test that the modification of the Individual NFV-MANO Service Interface resource failed because precondition given in an HTTP request header is not fulfilled and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: Individual NFV-MANO Service Interface resource is already created.
-    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Individual NFV-MANO Service Interface is not modified by the operation
@@ -102,7 +102,7 @@ DELETE Individual NFV-MANO Service Interface - Method not implemented
     ...    Test title: DELETE Individual NFV-MANO Service Interface - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.11.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.11.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -114,7 +114,7 @@ PATCH Individual NFV-MANO Service Interface with permitted authorization scope
     ...    Test title: PATCH Individual NFV-MANO Service Interface with permitted authorization scope
     ...    Test objective: This method modifies the Individual NFV-MANO Service Interface resource with permitted authorization scope.
     ...    Pre-conditions: Individual NFV-MANO Service Interface resource is already created.
-    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Individual NFV-MANO Service Interface is modified by the operation
@@ -127,7 +127,7 @@ PATCH Individual NFV-MANO Service Interface with not permitted authorization sco
     ...    Test title: PATCH Individual NFV-MANO Service Interface with not permitted authorization scope
     ...    Test objective: The objective is to test that modification of Individual NFV-MANO Service Interface resource fails with not permitted authorization scope.
     ...    Pre-conditions: Individual NFV-MANO Service Interface resource is already created.
-    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.11.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Individual NFV-MANO Service Interface is modified by the operation
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualPeerEntity.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualPeerEntity.robot
index fa7ed065acc8ec7042ae73dfb9f5ae48dfbd7d5a..d8e37f7de57c9fe0a62c74bf2fdcc2dcd5e551ec 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualPeerEntity.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualPeerEntity.robot
@@ -13,7 +13,7 @@ POST Individual Peer Entity - Method not implemented
     ...    Test title: POST Individual Peer Entity - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.14.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.14.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Individual Peer Entity
     ...    Test title: GET Individual Peer Entity
     ...    Test objective: The objective is to retrieves information and configuration hold in the producer NFV-MANO functional entity with regards to a peer entity by reading an individual peer entity resource
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.14.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.14.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -38,7 +38,7 @@ GET Individual Peer Entity - Not Found
     ...    Test title: GET Individual Peer Entity - Not Found
     ...    Test objective: The objective is to test the retrieval of information and configuration hold in the producer NFV-MANO functional entity with regards to a peer entity by reading an individual peer entity resource fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.14.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.14.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT Individual Peer Entity - Method not implemented
     ...    Test title: PUT Individual Peer Entity - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.14.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.14.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH Individual Peer Entity
     ...    Test title: PATCH Individual Peer Entity
     ...    Test objective: This method modifies configuration and information of the producer NFV-MANO functional entity with regards to a peer functional entity by updating the corresponding "Individual peer entity" resource.
     ...    Pre-conditions: At least one Peer Entity resource is created
-    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity Resource is modified by the operation
@@ -75,7 +75,7 @@ PATCH Individual Peer Entity - Conflict
     ...    Test title: PATCH Individual Peer Entity - Conflict
     ...    Test objective: The objective is to test that the modification of configuration and information of the producer NFV-MANO functional entity with regards to a peer functional entity by updating the corresponding "Individual peer entity" resource failed due to a conflict with the state of the Individual Peer Entity resource and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one Peer Entity resource is created
-    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity Resource is not modified by the operation
@@ -88,7 +88,7 @@ PATCH Individual Peer Entity - PreCondition Failed
     ...    Test title: PATCH Individual Peer Entity - PreCondition Failed
     ...    Test objective: The objective is to test that the modification of the Individual Peer Entity resource failed because precondition given in an HTTP request header is not fulfilled and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one Peer Entity resource is created
-    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity Resource is not modified by the operation
@@ -101,7 +101,7 @@ DELETE Individual Peer Entity - Method not implemented
     ...    Test title: DELETE Individual Peer Entity - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.14.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.14.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ PATCH Individual Peer Entity with permitted authorization scope
     ...    Test title: PATCH Individual Peer Entity with permitted authorization scope
     ...    Test objective: This method modifies configuration and information of the producer NFV-MANO functional entity with permitted authorization scope.
     ...    Pre-conditions: At least one Peer Entity resource is created
-    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity Resource is modified by the operation
@@ -126,7 +126,7 @@ PATCH Individual Peer Entity with not permitted authorization scope
     ...    Test title: PATCH Individual Peer Entity with not permitted authorization scope
     ...    Test objective: This method tests that modification of configuration and information of the producer NFV-MANO functional entity fails with not permitted authorization scope.
     ...    Pre-conditions: At least one Peer Entity resource is created
-    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.14.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity Resource is modified by the operation
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualStateChangeOperationOccurrence.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualStateChangeOperationOccurrence.robot
index 0227dd086722acd1f5099100742287d9fb4cc371..b7d44b0f0b02a6671a8a8c547d4b48b83dbe5a57 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualStateChangeOperationOccurrence.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualStateChangeOperationOccurrence.robot
@@ -13,7 +13,7 @@ POST Individual Change State Operation Occurrence - Method not implemented
     ...    Test title: POST Individual Change State Operation Occurrence - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.9.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Individual Change State Operation Occurrence
     ...    Test title: GET Individual Change State Operation Occurrence
     ...    Test objective: The objective is to query status information about Individual change state operation occurrence.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -38,7 +38,7 @@ GET Individual Change State Operation Occurrence - Not Found
     ...    Test title: GET Individual Change State Operation Occurrence - Not Found
     ...    Test objective: The objective is to test the retrieval of information about individual change state operation occurence fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT Individual Change State Operation Occurrence - Method not implemented
     ...    Test title: PUT Individual Change State Operation Occurrence - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.9.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH Individual Change State Operation Occurrence - Method not implemented
     ...    Test title: PATCH Individual Change State Operation Occurrence - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.9.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ DELETE Individual Change State Operation Occurrence - Method not implemented
     ...    Test title: DELETE Individual Change State Operation Occurrence - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.9.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -86,7 +86,7 @@ GET Individual Change State Operation Occurrence with permitted authorization sc
     ...    Test title: GET Individual Change State Operation Occurrence with permitted authorization scope
     ...    Test objective: The objective is to query status information about Individual change state operation occurrence with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -99,7 +99,7 @@ GET Individual Change State Operation Occurrence with not permitted authorizatio
     ...    Test title: GET Individual Change State Operation Occurrence with not permitted authorization scope
     ...    Test objective: The objective is test that the query status information about Individual change state operation occurrence fails with not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualSubscription.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualSubscription.robot
index 9065294648ccb446f54e588232ede0e65234adab..8c162b684b2157a4a18cc2a253772d681fd71d6e 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualSubscription.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/IndividualSubscription.robot
@@ -12,7 +12,7 @@ GET Individual Subscription
     ...    Test title: GET Individual  Subscription
     ...    Test objective: The objective is to test the retrieval of individual subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET Individual Subscription - invalid resource identifier
     ...    Test title: GET Individual Subscription - invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ DELETE Individual Subscription
     ...    Test title: DELETE Individual Subscription
     ...    Test objective: The objective is to test the deletion of an individual subscription
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The resource is not available anymore in the NFV-MANO    
@@ -51,7 +51,7 @@ DELETE Individual Subscription - invalid resource identifier
     ...    Test title: DELETE Individual Subscription - invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual  subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -63,7 +63,7 @@ POST Individual Subscription - Method not implemented
     ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Subscription
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ PUT Individual Subscription - Method not implemented
     ...    Test title: PUT Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing subscription
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ PATCH Individual Subscription - Method not implemented
     ...    Test title: PATCH Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing subscription
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -99,7 +99,7 @@ GET Individual Subscription with permitted authorization scope
     ...    Test title: GET Individual  Subscription with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of individual subscription when a permitted authorization scope is used.
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ GET Individual Subscription with not permitted authorization scope
     ...    Test title: GET Individual  Subscription with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of individual subscription fails when a not permitted authorization scope is used.
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot
index a14ce3a309e1719645bf422383b3c58e2f376bfc..a386b1c3bd296c6aa119160dd3546922e366cd18 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot
@@ -960,7 +960,28 @@ Send Post Request for Duplicated Subscription
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}    allow_redirects=false
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
-    
+
+Send POST request for subscription with unprocessable content
+    Log    Creating a new subscription for unreachable notification endpoint
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/CimSubscriptionRequest.json
+    ${body_request}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    Check GET response from Unreachable Notification Endpoint
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs    ${body_request}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Check GET response from Unreachable Notification Endpoint
+    Log    Creating mock request and response to handle GET operation on unreachable notification endpoint
+    &{notification_request}=    Create Mock Request Matcher    GET    ${unreachable_callback_uri}
+    &{notification_response}=    Create Mock Response    status_code=404
+    Log    Issue the subscription request
+    Create Mock Expectation    ${notification_request}    ${notification_response}
+    Wait Until Keyword Succeeds    ${total_polling_time}   ${polling_interval}   Verify Mock Expectation    ${notification_request}
+    Clear Requests  ${unreachable_callback_uri}
+
 Check HTTP Response Body Is Empty
     Should Be Empty    ${response['body']}    
     Log    No json schema is provided. Validation OK  
@@ -975,10 +996,6 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
     ${result}=    Output    response body
     Validate Json    CimSubscription.schema.json    ${result}
     Log    Validated CimSubscription schema
-    ${body}=    Get File    jsons/subscriptions.json
-    ${subscription}=    evaluate    json.loads('''${body}''')    json
-    Should Be Equal    ${result['callbackUri']}    ${subscription['callbackUri']}
-    Log    Validated Issued subscription is same as original
     
 Send Put Request for Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the NFV-MANO shall return a "405 Method
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot
index 1d32a2804d414dd820ba9a8b869b73360bf9d5ba..1da8dcdf6cfba1721c9199f3998e398c99bdd2eb 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOEntity.robot
@@ -13,7 +13,7 @@ POST NFV-MANO entity - Method not implemented
     ...    Test title: POST NFV-MANO entity - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create an NFV-MANO Entity.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET NFV-MANO entity
     ...    Test title: Get NFV-MANO entity
     ...    Test objective: The objective is to test the retrieval of information about an NFV-MANO functional entity by reading the NFV-MANO entity resource and perform a JSON schema and content validation of the collected job data structure.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ GET NFV-MANO entity - Not Found
     ...    Test title: Get NFV-MANO entity - Not Found
     ...    Test objective: The objective is to test the retrieval of information about an NFV-MANO functional entity by reading the NFV-MANO entity resource fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT NFV-MANO entity - Method not implemented
     ...    Test title: PUT NFV-MANO entity - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an NFV-MANO Entity.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH NFV-MANO entity
     ...    Test title: PATCH NFV-MANO entity
     ...    Test objective: The objective is to test that PATCH method modifies the NFV-MANO entity resource and perform a JSON schema and content validation of the modified response.
     ...    Pre-conditions: NFV-MANO entity resource is already created.
-    ...    Reference: clause 5.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO entity is modified by the operation
@@ -75,7 +75,7 @@ PATCH NFV-MANO entity - Conflict
     ...    Test title: PATCH NFV-MANO entity - Conflict
     ...    Test objective: The objective is to test that the modification of the NFV-MANO entity resource failed due to a conflict with the state of the NFV-MANO entity resource and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: NFV-MANO entity resource is already created.
-    ...    Reference: clause 5.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO entity is not modified by the operation
@@ -88,7 +88,7 @@ PATCH NFV-MANO entity - PreCondition Failed
     ...    Test title: PATCH NFV-MANO entity - PreCondition Failed
     ...    Test objective: The objective is to test that the modification of the NFV-MANO entity resource failed because precondition given in an HTTP request header is not fulfilled and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: NFV-MANO entity resource is already created.
-    ...    Reference: clause 5.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO entity is not modified by the operation
@@ -101,7 +101,7 @@ DELETE NFV-MANO entity - Method not implemented
     ...    Test title: DELETE NFV-MANO entity - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an NFV-MANO Entity.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ GET NFV-MANO entity with permitted authorization scope
     ...    Test title: Get NFV-MANO entity with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of information about an NFV-MANO functional entity by reading the NFV-MANO entity resource when a permitted authorization scope is used.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -126,7 +126,7 @@ GET NFV-MANO entity with not permitted authorization scope
     ...    Test title: Get NFV-MANO entity with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of information about an NFV-MANO functional entity fails when a not permitted authorization scope is used.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOServiceInterfaces.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOServiceInterfaces.robot
index f9fd44d8c60b0aa45f03f95c6da8a09b053b7591..76c607a59d12f01cc1578b2afe72d5dce95cd44a 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOServiceInterfaces.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOServiceInterfaces.robot
@@ -13,7 +13,7 @@ POST NFV-MANO Service Interfaces - Method not implemented
     ...    Test title: POST NFV-MANO Service Interfaces - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET NFV-MANO Service Interfaces
     ...    Test title: GET NFV-MANO Service Interfaces
     ...    Test objective: The objective is to query status information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -38,7 +38,7 @@ GET NFV-MANO Service Interfaces - invalid attribute-based filter
     ...    Test title: GET NFV-MANO Service Interfaces - invalid attribute-based filter
     ...    Test objective:  The objective is to test that the retrieval of NFV-MANO Service Interfaces fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ GET NFV-MANO Service Interfaces - invalid attribute selector
     ...    Test title: GET NFV-MANO Service Interfaces - invalid attribute selector
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO Service Interfaces fails when using invalid attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ GET NFV-MANO Service Interfaces - Bad Request Response too Big
     ...    Test title: GET NFV-MANO Service Interfaces - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO Service Interfaces fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ GET NFV-MANO Service Interfaces with attribute-based filter
     ...    Test title: GET NFV-MANO Service Interfaces with attribute-based filter
     ...    Test objective: The objective is to query status information about multiple NFV-MANO service interfaces of the NFV-MANO functional entities with attribute filters, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ GET NFV-MANO Service Interfaces with "all_fields" attribute selector
     ...    Test title: GET NFV-MANO Service Interface with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Service Interfaces with "all_fields" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -103,7 +103,7 @@ GET NFV-MANO Service Interfaces with "exclude_default" attribute selector
     ...    Test title: GET NFV-MANO Service Interfaces with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Service Interfaces with "exclude_default" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ GET NFV-MANO Service Interfaces with "fields" attribute selector
     ...    Test title: GET NFV-MANO Service Interfaces with "fields" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Service Interfaces with fields attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ GET NFV-MANO Service Interfaces with "exclude_fields" attribute selector
     ...    Test title: GET NFV-MANO Service Interfaces with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Service Interfaces with "exclude_fields" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -142,7 +142,7 @@ GET NFV-MANO Service Interfaces with "exclude_default" and "fields" attribute se
     ...    Test title: GET NFV-MANO Service Interfaces with "exclude_default" and "fields" attribute selector
     ...    Test objective: The objective is to retrieve NFV-MANO Service Interfaces with "exclude_default" and "fields" attribute selector, and perform the JSON schema validation of the HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -155,7 +155,7 @@ GET NFV-MANO Service Interfaces with Paged Response
     ...    Test title: GET NFV-MANO Service Interfaces with Paged Response
     ...    Test objective: The objective is to query NFV-MANO Service Interface to get Paged Response.
     ...    Pre-conditions:  none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -168,7 +168,7 @@ PUT NFV-MANO Service Interfaces - Method not implemented
     ...    Test title: PUT NFV-MANO Service Interfaces - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -180,7 +180,7 @@ PATCH NFV-MANO Service Interfaces - Method not implemented
     ...    Test title: PATCH NFV-MANO Service Interfaces - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -192,7 +192,7 @@ DELETE NFV-MANO Service Interfaces - Method not implemented
     ...    Test title: DELETE NFV-MANO Service Interfaces - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -204,7 +204,7 @@ GET NFV-MANO Service Interfaces with permitted authorization scope
     ...    Test title: GET NFV-MANO Service Interfaces with permitted authorization scope
     ...    Test objective: The objective is to query status information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -217,7 +217,7 @@ GET NFV-MANO Service Interfaces with not permitted authorization scope
     ...    Test title: GET NFV-MANO Service Interfaces with not permitted authorization scope
     ...    Test objective: The objective is test that the query status information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity fails when using not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.10.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/NotificationEndpoint.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/NotificationEndpoint.robot
index 4bab4eeb21bab0c0f2b19799d3fc0be4743b3eb9..e6def01b00850ad625ad7b465da63e5046600ca2 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/NotificationEndpoint.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ Information Changed Notification
     ...    Test title: Information Changed Notification
     ...    Test objective: The objective is to test that Information Changed Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for information availability notification is available in the NFV-MANO.
-    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ Change State Notification
     ...    Test title: Change State Notification
     ...    Test objective: The objective is to test that Change State Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for change state notification is available in the NFV-MANO.
-    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/Notifications.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/Notifications.robot
index 758082b681ad76ab85bc447c92656d99acd016fc..f239cf39630ca0b6ca751478b6f96d96dcd0602c 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/Notifications.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/Notifications.robot
@@ -16,7 +16,7 @@ Information Changed Notification
     ...    Test title: Information Changed Notification
     ...    Test objective: The objective is to test the dispatch of Information Changed Notification when configuration or information is changed in the NFV-MANO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A subscription for information availability notifications is available in the NFV-MANO.
-    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ Change State Notification
     ...    Test title: Change State Notification
     ...    Test objective: The objective is to test the dispatch of Change State Notification when state changes of the NFV-MANO functional entity and its managed objects, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A performance job is created, and a state change subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANOz
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/PeerEntities.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/PeerEntities.robot
index dac2d78fdd50e8e94a2f8f4638938b63ecbb089e..e4df90c55d22de2f45123cd78ef8297e291182f3 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/PeerEntities.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/PeerEntities.robot
@@ -13,7 +13,7 @@ POST Peer Entity
     ...    Test title: POST Peer Entity
     ...    Test objective: The objective is to creates in the producer NFV-MANO functional entity a new peer entity resource which contains configuration and information with regards to the peer functional entity and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity is created
@@ -28,7 +28,7 @@ GET Peer Entities
     ...    Test title: GET Peer Entities
     ...    Test objective: The objective is to query information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created.
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -41,7 +41,7 @@ GET Peer Entities - invalid attribute-based filter
     ...    Test title: GET Peer Entities - invalid attribute-based filter
     ...    Test objective:  The objective is to test that the retrieval of information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ GET Peer Entities - invalid attribute selector
     ...    Test title: GET Peer Entities - invalid attribute selector
     ...    Test objective: The objective is to test that the retrieval of information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities fails when using invalid attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ GET Peer Entities - Bad Request Response too Big
     ...    Test title: GET Peer Entities - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -80,7 +80,7 @@ GET Peer Entities with attribute-based filter
     ...    Test title: GET Peer Entities with attribute-based filter
     ...    Test objective: The objective is to query information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities with attribute filters, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -93,7 +93,7 @@ GET Peer Entities with "all_fields" attribute selector
     ...    Test title: GET Peer Entities with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities with "all_fields" attribute selector, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -106,7 +106,7 @@ GET Peer Entities with "exclude_default" attribute selector
     ...    Test title: GET Peer Entities with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities with "exclude_default" attribute selector, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -119,7 +119,7 @@ GET Peer Entities with "fields" attribute selector
     ...    Test title: GET Peer Entities with "fields" attribute selector
     ...    Test objective: The objective is to retrieve information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities with fields attribute selector, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -132,7 +132,7 @@ GET Peer Entities with "exclude_fields" attribute selector
     ...    Test title: GET Peer Entities with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities with "exclude_fields" attribute selector, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -145,7 +145,7 @@ GET Peer Entities with "exclude_default" and "fields" attribute selector
     ...    Test title: GET Peer Entities with "exclude_default" and "fields" attribute selector
     ...    Test objective: The objective is to retrieve information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities with "exclude_default" and "fields" attribute selector, and perform the JSON schema validation of the returned job data structure.
     ...    Pre-conditions: At least one Peer Entity is already created. 
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -158,7 +158,7 @@ GET Peer Entity with Paged Response
     ...    Test title: GET Peer Entity with Paged Response
     ...    Test objective: The objective is to query information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities to get Paged Response.
     ...    Pre-conditions: At least one Peer Entity is already created.  
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -171,7 +171,7 @@ Get Peer Entity with malformed authorization token
     ...    Test title: Get Peer Entity with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities fails when using malformed authorization token.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The Peer Entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -183,7 +183,7 @@ Get Peer Entity without authorization token
     ...    Test title: Get Peer Entity without authorization token
     ...    Test objective: The objective is to test that the retrieval of information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities fails when omitting the authorization token.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The Peer Entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -195,7 +195,7 @@ GET information about multiple alarms with expired or revoked authorization toke
     ...    Test title: GET information about multiple alarms with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of information and configuration in the producer NFV-MANO functional entity with regards to multiple peer entities fails when using expired or revoked authorization token.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The Peer Entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -207,7 +207,7 @@ PUT Peer Entities - Method not implemented
     ...    Test title: PUT Peer Entities - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -219,7 +219,7 @@ PATCH Peer Entities - Method not implemented
     ...    Test title: PATCH Peer Entities - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -231,7 +231,7 @@ DELETE Peer Entities - Method not implemented
     ...    Test title: DELETE Peer Entities - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemeted.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -243,7 +243,7 @@ POST Peer Entity with permitted authorization scope
     ...    Test title: POST Peer Entity with permitted authorization scope
     ...    Test objective: The objective is to create in the producer NFV-MANO functional entity a new peer entity resource with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity is created
@@ -258,7 +258,7 @@ POST Peer Entity with not permitted authorization scope
     ...    Test title: POST Peer Entity with not permitted authorization scope
     ...    Test objective: The objective is to test that creation in the producer NFV-MANO functional entity of a new peer entity resource fails with not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.13.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.13.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Peer Entity is created
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/Subscriptions.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/Subscriptions.robot
index 11e52620a0fd44520541a4bdbb0ce94d31037e63..4d7cc67e73c1607a018e948a7616084626381254 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/Subscriptions.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/Subscriptions.robot
@@ -16,7 +16,7 @@ GET all Subscriptions
     ...    Test title: GET all Subscriptions
     ...    Test objective: The objective is to test the retrieval list of active subscriptions of API consumer and perform a JSON schema validation of the returned subscriptions data structure.
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -29,7 +29,7 @@ GET Subscriptions with attribute-based filter
     ...    Test title: GET Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of active subscriptions list of API consumer using attribute-based filter and perform a JSON schema validation of the collected indicators data structure. 
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ GET Subscriptions with Paged Response
     ...    Test title: GET Subscriptions with Paged Response
     ...    Test objective: The objective is to query information of active subscriptions list to of API consumer to get Paged Response.
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -55,7 +55,7 @@ GET Subscriptions - invalid attribute-based filter
     ...    Test title: GET Subscriptions - invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of active subscriptions list of API consumer fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -69,7 +69,7 @@ GET Subscriptions - Bad Request Response too Big
     ...    Test title: GET Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of active subscriptions list of API consumer fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -82,7 +82,7 @@ GET Subscriptions - invalid resource endpoint
     ...    Test title: GET Subscriptions - invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of active subscriptions list of API consumer fails when using invalid resource endpoint.
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -94,13 +94,15 @@ POST Create new Subscription
     ...    Test title: Create new Subscription
     ...    Test objective: The objective is to test the creation of a new subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The subscription is successfully set and it matches the issued subscription    
     Send Post Request for Subscription
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    CimSubscription
+    Check HTTP Response Header Contains    Location
+    Check Postcondition Subscription Resource Returned in Location Header Is Available
     Check HTTP Response Body CimSubscription Attributes Values Match the Issued Subscription
     Check Postcondition Subscription Is Set 
 
@@ -111,7 +113,7 @@ POST Create request for duplicated Subscription not creating duplicated subscrip
     ...    Test title: Create request for duplicated Subscription not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated subscription failed and check that no new subscription is created and a link to the original subscription is returned
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO does not support the creation of duplicated subscriptions
     ...    Post-Conditions: The existing Subscription returned is available in the NFV-MANO 
@@ -127,7 +129,7 @@ POST Create request for duplicated Subscription creating duplicated subscription
     ...    Test title: Create request for duplicated Subscription creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO supports the creation of duplicated subscriptions
     ...    Post-Conditions: The duplicated subscription is successfully set and it matches the issued subscription
@@ -135,14 +137,27 @@ POST Create request for duplicated Subscription creating duplicated subscription
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    PmSubscription
     Check HTTP Response Body CimSubscription Attributes Values Match the Issued Subscription
-    Check Postcondition Subscription Is Set 
+    Check Postcondition Subscription Is Set
+
+POST new subscription - Unprocessable Content
+    [Documentation]    Test ID: 8.3.1.10.9a
+    ...    Test title: POST new subscription - Unprocessable Content
+    ...    Test objective:  The objective is to test the creation of a new subscription fails when a request contains syntactically correct data but the data cannot be processed.
+    ...    Pre-conditions: none
+    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
+    ...    Config ID: Config_prod_NFV-MANO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send POST request for subscription with unprocessable content
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is    ProblemDetails
 
 PUT Subscriptions - Method not implemented
     [Documentation]    Test ID: 8.3.1.10.10
     ...    Test title: PUT Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify subscriptions
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.4.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -154,7 +169,7 @@ PATCH Subscriptions - Method not implemented
     ...    Test title: PATCH Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update subscriptions
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -166,7 +181,7 @@ DELETE Subscriptions - Method not implemented
     ...    Test title: DELETE Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete subscriptions
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -178,7 +193,7 @@ POST Create a new subscription - Unprocessable Content
     ...    Test title: POST Create a new Subscription - Unprocessable Content
     ...    Test objective: The objective is to test that a new subscription is not created if the notification endpoint is unreachable by the NFV-MANO.
     ...    Pre-conditions: none
-    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: Notification endpoint is unreachable by the NFV-MANO
     ...    Post-Conditions: none 
@@ -191,7 +206,7 @@ GET all Subscriptions with permitted authorization scope
     ...    Test title: GET all Subscriptions with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval list of active subscriptions of API consumer when a permitted authorization scope is used.
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -204,7 +219,7 @@ GET all Subscriptions with not permitted authorization scope
     ...    Test title: GET all Subscriptions with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval list of active subscriptions of API consumer ffails when a not permitted authorization scope is used.
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 5.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ManoEntity.schema.json b/SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ManoEntity.schema.json
index 65b3892607d841f3bd10b801af6ac68153afa15e..e46747bb5f75f9fe98da553844e387a66e6274ee 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ManoEntity.schema.json
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ManoEntity.schema.json
@@ -185,7 +185,7 @@
             }
         },
         "nfvoSpecificInfo": {
-            "description": "This type represents information attributes specific to an NFVO entity, and that can be relevant to more than one NFV-MANO service offered by an NFVO entity. * NOTE 1:\tThe information to be provided in this attribute shall relate to the specification and version\n            of the specification. For instance, \"ETSI GS NFV-SOL 001 (V2.5.1)\".\n  NOTE 2:\tIf this attribute is not present, the value of this parameter is undefined.\n",
+            "description": "This type represents information attributes specific to an NFVO entity, and that can be relevant to more than one NFV-MANO service offered by an NFVO entity. * NOTE 1:\tThe information to be provided in this attribute shall relate to the specification and version\n          of the specification. For instance, \"ETSI GS NFV-SOL 001 (V2.5.1)\".\n  NOTE 2:\tIf this attribute is not present, the value of this parameter is undefined.\n",
             "type": "object",
             "required": [
                 "supportedVnfdFormats",
@@ -260,7 +260,7 @@
             }
         },
         "vnfmSpecificInfo": {
-            "description": "This type represents information attributes specific to a VNFM entity, and that can be relevant to more than one NFV-MANO service offered by a VNFM entity. * NOTE:\tThe information to be provided in this attribute shall relate to the specification and version\n        of the specification. For instance, \"ETSI GS NFV-SOL 001 (V2.5.1)\".\n",
+            "description": "This type represents information attributes specific to a VNFM entity, and that can be relevant to more than one NFV-MANO service offered by a VNFM entity. * NOTE:\tThe information to be provided in this attribute shall relate to the specification and version\n        of the specification. For instance, \"ETSI GS NFV-SOL 001 (V5.5.1)\".\n",
             "type": "object",
             "required": [
                 "resoruceMgmtModeSupport",
@@ -323,6 +323,78 @@
                             "DIRECT-MODE"
                         ]
                     }
+                },
+                "pmJobConnectionInfos": {
+                    "description": "PM job connection information\n",
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "required": [
+                            "monitoringType"
+                        ],
+                        "properties": {
+                            "monitoringType": {
+                                "description": "Indicates the type of tool to monitor the PM of the VNF instance managed by the VNFM. Permitted values: • VIM_CISM • EXTERNAL\n",
+                                "type": "string",
+                                "enum": [
+                                    "VIM_CISM",
+                                    "EXTERNAL"
+                                ]
+                            },
+                            "vimId": {
+                                "description": "An identifier with the intention of being globally unique.\n",
+                                "type": "string"
+                            },
+                            "interfaceInfo": {
+                                "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                                "type": "object"
+                            },
+                            "accessInfo": {
+                                "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                                "type": "object"
+                            },
+                            "extra": {
+                                "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                                "type": "object"
+                            }
+                        }
+                    }
+                },
+                "fmConnectionInfos": {
+                    "description": "FM connection information\n",
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "required": [
+                            "monitoringType"
+                        ],
+                        "properties": {
+                            "monitoringType": {
+                                "description": "Indicates the type of tool to monitor faults of the VNF instance managed by the VNFM. Permitted values: • VIM_CISM • EXTERNAL\n",
+                                "type": "string",
+                                "enum": [
+                                    "VIM_CISM",
+                                    "EXTERNAL"
+                                ]
+                            },
+                            "vimId": {
+                                "description": "An identifier with the intention of being globally unique.\n",
+                                "type": "string"
+                            },
+                            "interfaceInfo": {
+                                "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                                "type": "object"
+                            },
+                            "accessInfo": {
+                                "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                                "type": "object"
+                            },
+                            "extra": {
+                                "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                                "type": "object"
+                            }
+                        }
+                    }
                 }
             }
         },