diff --git a/SOL009/NFVMANOFaultManagement-API/Alarms.robot b/SOL009/NFVMANOFaultManagement-API/Alarms.robot
index 01d60318d4e746df2e2b61c3259d0d8340cd73a3..6c42372af26c634b8e575c72129e3cbc87833d62 100644
--- a/SOL009/NFVMANOFaultManagement-API/Alarms.robot
+++ b/SOL009/NFVMANOFaultManagement-API/Alarms.robot
@@ -7,7 +7,7 @@ POST Alarms - Method not implemented
     ...    Test title: POST Alarms - Method not implemented 
     ...    Test objective: The objective is to test that Post method is not allowed to create fault management alarms on NFV-MANO
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -19,7 +19,7 @@ Get information about multiple alarms
     ...    Test title: Get information about multiple alarms
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema of the returned alarms data structure
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ Get information about multiple alarms with filter
     ...    Test title: Get information about multiple alarms with filter
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: none 
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ Get information about multiple alarms with invalid attribute-based filtering par
     ...    Test title:  Get information about multiple alarms with invalid attribute-based filtering parameters
     ...    Test objective: The objective is to try to retrieve information about the alarm list with invalid filters and perform a JSON schema validation of the returned problem details data structure
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ Get information about multiple alarms as a Paged Response
     ...    Test title: Get information about multiple alarms as a Paged Response
     ...    Test objective: The objective is to retrieve information about the alarm list as a Paged Response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -71,7 +71,7 @@ Get information about multiple alarms - Bad Request Response too Big
     ...    Test title:  Get information about multiple alarms - Bad Request Response too Big
     ...    Test objective: The objective is to try to retrieve information about the alarm list because response is too big and perform a JSON schema validation of the returned problem details data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ GET information about alarms with attribute-based filter "id"
     ...    Test title: GET information about alarms with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve information about the alarm list with alarm filter "id"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -98,7 +98,7 @@ GET information about multiple alarms with attribute-based filter "managedObject
     ...    Test title: GET information about multiple alarms with attribute-based filter "managedObjectId"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "managedObjectId"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,7 +112,7 @@ GET information about multiple alarms with attribute-based filter "eventType"
     ...    Test title: GET information about multiple alarms with attribute-based filter "eventType"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "eventType"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.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 information about multiple alarms with attribute-based filter "perceivedSeve
     ...    Test title: GET information about multiple alarms with attribute-based filter "perceivedSeverity"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "perceivedSeverity"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -140,7 +140,7 @@ GET information about multiple alarms with attribute-based filter "probableCause
     ...    Test title: GET information about multiple alarms with attribute-based filter "probableCause"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "probableCause"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -154,7 +154,7 @@ Get information about multiple alarms with malformed authorization token
     ...    Test title: Get information about multiple alarms with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of information about the alarm list fails when using malformed authorization token
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -166,7 +166,7 @@ Get information about multiple alarms without authorization token
     ...    Test title: Get information about multiple alarms without authorization token
     ...    Test objective: The objective is to test that the retrieval of information about the alarm list fails when omitting the authorization token
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -178,7 +178,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 about the alarm list fails when using expired or revoked authorization token
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -190,7 +190,7 @@ PUT Alarms - Method not implemented
     ...    Test title: PUT Alarms - Method not implemented 
     ...    Test objective: The objective is to test that PUT method is not allowed to modify fault management alarms on NFV-MANO.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -202,7 +202,7 @@ PATCH Alarms - Method not implemented
     ...    Test title: PATCH Alarms - Method not implemented 
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify fault management alarms on NFV-MANO.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -214,7 +214,7 @@ DELETE Alarms - Method not implemented
     ...    Test title: POST Alarms - Method not implemented 
     ...    Test objective: The objective is to test that DELETE method is not allowed for fault management alarms on NFV-MANO
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -226,7 +226,7 @@ Get information about multiple alarms with permitted authorization scope
     ...    Test title: Get information about multiple alarms with permitted authorization scope
     ...    Test objective: The objective is to retrieve information about the alarm list with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -239,7 +239,7 @@ Get information about multiple alarms with not permitted authorization scope
     ...    Test title: Get information about multiple alarms with not permitted authorization scope
     ...    Test objective: The objective is to test that retrieve information about the alarm list fails with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.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/NFVMANOFaultManagement-API/IndividualAlarm.robot b/SOL009/NFVMANOFaultManagement-API/IndividualAlarm.robot
index 2998c682bfd4dd4b409427d72d822b0fddff2df3..5de083cef66bb5acaeb3087db323b497afffe05a 100644
--- a/SOL009/NFVMANOFaultManagement-API/IndividualAlarm.robot
+++ b/SOL009/NFVMANOFaultManagement-API/IndividualAlarm.robot
@@ -7,7 +7,7 @@ POST Individual Alarm - Method not implemented
     ...    Test title: POST Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that Post method is not allowed to create fault management individual alarm on NFV-MANO 
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -19,7 +19,7 @@ Get information about an fault management individual alarm
     ...    Test title: Get information about an fault management individual alarm
     ...    Test objective: The objective is to retrieve information about an individual alarm and perform a JSON schema and content validation of the returned alarm data structure
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 7.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none 
@@ -32,7 +32,7 @@ Get information about an fault management individual alarm - Not Found
     ...    Test title: Get information about an fault management individual alarm
     ...    Test objective: The objective is to test the retrieval of information about an individual alarm fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ PUT Individual Alarm - Method not implemented
     ...    Test title: PUT Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to for fault management individual alarm on NFV-MANO 
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.4.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.4.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none 
@@ -57,7 +57,7 @@ PATCH Fault Management Individual Alarm
     ...    Test title: PATCH Fault Management Individual Alarm
     ...    Test objective: The objective is to Modify an individual alarm resource, and perform a JSON schema validation of the returned alarm data structure.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Alarm is modified.
@@ -70,7 +70,7 @@ Modify an individual alarm resource - Precondition failed
     ...    Test title: Modify an individual alarm resource - Precondition failed
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modified if the alarm is already in the state that is requested to be set, and perform a JSON schema validation of the returned data structure.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Alarm is not modified.
@@ -84,7 +84,7 @@ Modify an individual alarm resource - Conflict
     ...    Test title: Modify an individual alarm resource - Conflict
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modified if the resource was modified by another entity , and perform a JSON schema validation of the returned data structure.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Alarm is not modified.
@@ -98,7 +98,7 @@ DELETE Individual Alarm - Method not implemented
     ...    Test title: DELETE Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete fault management individual alarm on NFV-MANO.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ PATCH Fault Management Individual Alarm with permitted authorization scope
     ...    Test title: PATCH Fault Management Individual Alarm with permitted authorization scope
     ...    Test objective: The objective is to Modify an individual alarm resource with permitted authorization scope.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Alarm is modified.
@@ -123,7 +123,7 @@ PATCH Fault Management Individual Alarm with not permitted authorization scope
     ...    Test title: PATCH Fault Management Individual Alarm with not permitted authorization scope
     ...    Test objective: The objective is to test that Modification of an individual alarm resource fails with not permitted authorization scope.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Alarm is modified.
diff --git a/SOL009/NFVMANOFaultManagement-API/IndividualSubscription.robot b/SOL009/NFVMANOFaultManagement-API/IndividualSubscription.robot
index c6ad4f9a9a41285e046da86aaa8afb5ef9467b60..0080a4f53cef653c12d8975282ed9d66b331869b 100644
--- a/SOL009/NFVMANOFaultManagement-API/IndividualSubscription.robot
+++ b/SOL009/NFVMANOFaultManagement-API/IndividualSubscription.robot
@@ -7,7 +7,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 for fault management subscription on NFV-MANO  
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -19,7 +19,7 @@ Get Information about an individual subscription
     ...    Test title: Get Information about an individual subscription
     ...    Test objective: The objective is to read an individual subscription from NFV-MANO alarms subscribed by the client and perform a JSON schema and content validation of the returned fault management individual subscription data structure
     ...    Pre-conditions: The subscription with the given id exists
-    ...   Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...   Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:   none
     ...    Post-Conditions:  none
@@ -32,7 +32,7 @@ Get Information about an individual subscription - Not Found
     ...    Test title: Get Information about an individual subscription - Not Found
     ...    Test objective: The objective is to test the retrieval of individual subscription from NFV-MANO alarms fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title:PUT an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for fault management individual subscription on VNF  
     ...    Pre-conditions:  none
-    ...    Reference: clause 7.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -56,7 +56,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title:PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed for fault management individual subscription on VNF  
     ...    Pre-conditions:  none
-    ...    Reference: clause 7.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -68,7 +68,7 @@ DELETE an individual subscription
     ...    Test title:DELETE an individual subscription
     ...    Test objective: The objective is to test that DELETE method removes individual subscription on VNF   
     ...    Pre-conditions: The Subsbcription already exists
-    ...    Reference: clause 7.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions:  subscription is deleted
@@ -81,7 +81,7 @@ Get Information about an individual subscription with permitted authorization sc
     ...    Test title: Get Information about an individual subscription with permitted authorization scope
     ...    Test objective: The objective is to read an individual subscription from NFV-MANO alarms subscribed by the client with permitted authorization scope
     ...    Pre-conditions: The subscription with the given id exists
-    ...   Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...   Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:   none
     ...    Post-Conditions:  none
@@ -94,7 +94,7 @@ Get Information about an individual subscription with not permitted authorizatio
     ...    Test title: Get Information about an individual subscription with not permitted authorization scope
     ...    Test objective: The objective is to test that reading an individual subscription from NFV-MANO alarms subscribed by the client fails with not permitted authorization scope
     ...    Pre-conditions: The subscription with the given id exists
-    ...   Reference: clause 7.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...   Reference: clause 7.5.6.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/NFVMANOFaultManagement-API/NotificationEndpoint.robot b/SOL009/NFVMANOFaultManagement-API/NotificationEndpoint.robot
index 14e8a77bfed0b2f4f8c4ffe11216d8887f0225c1..6e53597ebef1e206d5c78ab79614eaf120657382 100644
--- a/SOL009/NFVMANOFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL009/NFVMANOFaultManagement-API/NotificationEndpoint.robot
@@ -8,7 +8,7 @@ Alarm Notification
     ...    Test title: Alarm Notification
     ...    Test objective: The objective is to test that Alarm Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A subscription for alarm notification is available in the NFV-MANO.
-    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -20,7 +20,7 @@ Alarm Cleared Notification
     ...    Test title: Alarm Cleared Notification
     ...    Test objective: The objective is to test that Alarm Cleared Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A subscription for alarm cleared notification is available in the NFV-MANO.
-    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -32,7 +32,7 @@ Alarm List Rebuilt Notification
     ...    Test title: Alarm List Rebuilt Notification
     ...    Test objective: The objective is to test that Alarm List Rebuilt Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A subscription for alarm list rebuilt notification is available in the NFV-MANO.
-    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.7.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/NFVMANOFaultManagement-API/Notifications.robot b/SOL009/NFVMANOFaultManagement-API/Notifications.robot
index 81970be6288cd4aac7078b8bca30eaae00705863..a9267954144c2653cd38b2d05c465e1fe0bf4f0d 100644
--- a/SOL009/NFVMANOFaultManagement-API/Notifications.robot
+++ b/SOL009/NFVMANOFaultManagement-API/Notifications.robot
@@ -10,7 +10,7 @@ NFV-MANO Fault Alarm Notification
     ...    Test title: NFV-MANO Fault Alarm Notification
     ...    Test objective: The objective is to test the dispatch of NFV-MANO Fault Alarm Notification when a resource within an NFV-MANO instance fails, 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 NFV-MANO instance is instantiated, and a subscription for fault alarm notifications is available.
-    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -23,7 +23,7 @@ NFV-MANO Fault Alarm Cleared Notification
     ...    Test title: NFV-MANO Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test the dispatch of NFV-MANO Fault Alarm Cleared Notification when a faulty resource within an NFV-MANO instance is cleared, 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 NFV-MANO instance is instantiated, a virtualised resource is in faulty state, and a subscription for fault alarm cleared notifications is available.
-    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ NFV-MANO Fault Alarm List Rebuilt Notification
     ...    Test title: NFV-MANO Fault Alarm List Rebuilt Notification 
     ...    Test objective: The objective is to test the dispatch of NFV-MANO Fault Alarm List Rebuilt Notification when the NFV-MANO decides to rebuild the list of its NFV-MANO alarms, e.g. due to a corruption in the alarm storage, 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 NFV-MANO instance is instantiated, one or more virtualised resource are in faulty state, and a subscription for fault alarm list rebuilt notifications is available.
-    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVMANOFaultManagement-API/Subscriptions.robot b/SOL009/NFVMANOFaultManagement-API/Subscriptions.robot
index f2a65fa0034fef20baebd8df602768308cd42715..c36ab513ee40eb3aa6dd0bfe36c610e5519fd4ee 100644
--- a/SOL009/NFVMANOFaultManagement-API/Subscriptions.robot
+++ b/SOL009/NFVMANOFaultManagement-API/Subscriptions.robot
@@ -7,7 +7,7 @@ POST Create a new Fault Management alarm subscription
     ...    Test title: POST Create a new fault management alarm subscription
     ...    Test objective: The objective is to create a new fault management alarm subscription and perform a JSON schema validation of the returned fault management alarms subscription data structure
     ...    Pre-conditions: No subscription with the same filter and callbackUri exists
-    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: subscription is created
@@ -22,7 +22,7 @@ POST Create a new alarm subscription - DUPLICATION
     ...    Test title: POST Create a new alarm subscription - DUPLICATION
     ...    Test objective: The objective is to create a new subscription with the NFV-MANO allowing duplication and perform a JSON schema validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability: the NFV-MANO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
     ...    Post-Conditions: duplicated subscription is created
@@ -37,7 +37,7 @@ POST Create a new alarm subscription - NO DUPLICATION
     ...    Test title: POST Create a new alarm subscription - NO DUPLICATION
     ...    Test objective: The objective is to create a new subscription with the NFV-MANO not allowing duplication and perform a JSON schema validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability: the NFV-MANO does not allow to create a duplicate subscription resource 
     ...    Post-Conditions: duplicated subscription is not created
@@ -52,7 +52,7 @@ Retrieve a list of alarm subscriptions
     ...    Test title: Retrieve a list of alarm subscriptions
     ...    Test objective: The objective is to retrieve the list of active subscriptions and perform a JSON schema validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: noe
@@ -65,7 +65,7 @@ Retrieve a list of alarm subscriptions with filter
     ...    Test title: Retrieve a list of alarm subscriptions with filter
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter and perform a JSON schema validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none 
-    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -78,7 +78,7 @@ Get information about multiple alarms as a Paged Response
     ...    Test title: Get information about multiple alarms as a Paged Response
     ...    Test objective: The objective is to retrieve information about active list subscriptions as a Paged Response
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to retrieve the list of active subscriptions with Invalid attribute-based filtering parameters and perform a JSON schema validation of the returned problem details data structure.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions:    none 
@@ -104,7 +104,7 @@ Get information about multiple alarms - Bad Request Response too Big
     ...    Test title:  Get information about multiple alarms - Bad Request Response too Big
     ...    Test objective: The objective is to try to retrieve information about active list subscription to check that response is too big and perform a JSON schema validation of the returned problem details data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -117,7 +117,7 @@ GET Subscription with attribute-based filter "id"
     ...    Test title: GET Subscription with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -131,7 +131,7 @@ Get subscriptions with filter "filter.notificationTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.notificationTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.5.5.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 subscriptions with filter "filter.perceivedSeverities"
     ...    Test title: GET Subscription with attribute-based filter "filter.perceivedSeverities"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.perceivedSeverities"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -159,7 +159,7 @@ Get subscriptions with filter "filter.eventTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.eventTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.eventTypes"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -173,7 +173,7 @@ Get subscriptions with filter "filter.probableCauses"
     ...    Test title: GET Subscription with attribute-based filter "filter.probableCauses"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.probableCauses"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: Clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -187,7 +187,7 @@ PUT subscriptions - Method not implemented
     ...    Test title:PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to for fault management subscriptions on VNF 
     ...    Pre-conditions: none
-    ...    RReference: clause 7.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    RReference: clause 7.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID:  Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -199,7 +199,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 for fault management subscriptions on VNF  
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID:  Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -211,7 +211,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 for fault management subscriptions on VNF  
     ...    Pre-conditions: none 
-    ...    Reference: clause 7.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID:  Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -223,7 +223,7 @@ POST Create a new Fault Management alarm subscription - Unprocessable content
     ...    Test title: POST Create a new fault management alarm subscription - Unprocessable content
     ...    Test objective: The objective is to test that a new fault management alarm subscription is not created if the notification endpoint is unreachable by the NFV-MANO.
     ...    Pre-conditions: No subscription with the same filter and callbackUri exists.
-    ...    Reference: clause 7.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.5.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
@@ -236,7 +236,7 @@ Get list of alarm subscriptions with permitted authorization scope
     ...    Test title: Retrieve a list of alarm subscriptions with permitted authorization scope
     ...    Test objective: The objective is to retrieve the list of active subscriptions with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: noe
@@ -249,7 +249,7 @@ Get list of alarm subscriptions with not permitted authorization scope
     ...    Test title: Retrieve a list of alarm subscriptions with not permitted authorization scope
     ...    Test objective: The objective is to test that retrieving the list of active subscriptions fails with not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 7.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID:   Config_prod_NFV-MANO
     ...    Applicability:  none
     ...    Post-Conditions: noe
diff --git a/SOL009/NFVMANOLogManagement-API/CompileLogTask.robot b/SOL009/NFVMANOLogManagement-API/CompileLogTask.robot
index da7f9beaa53db4b7e1889b43003c698c22b2c7cd..3334660c2612552977bddcdfff15e5cc5f9fd7ab 100644
--- a/SOL009/NFVMANOLogManagement-API/CompileLogTask.robot
+++ b/SOL009/NFVMANOLogManagement-API/CompileLogTask.robot
@@ -8,7 +8,7 @@ Request to compile the logged data into a file - Synchronous mode
     ...    Test title: Request to compile the logged data into a file - Synchronous mode
     ...    Test objective: The objective is to request to compile the logged data into a file in synchronous mode and perform a JSON schema validation on the returned log report data structure
     ...    Pre-conditions: logging job is available
-    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO can decide immediately what to respond to a compile request
     ...    Post-Conditions: none
@@ -22,7 +22,7 @@ Request to compile the logged data into a file - Asynchronous mode
     ...    Test title: Request to compile the logged data into a file - Asynchronous mode
     ...    Test objective: The objective is to request to compile the logged data into a file in asynchronous mode
     ...    Pre-conditions: logging job is available
-    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO can not decide immediately what to respond to a compile request
     ...    Post-Conditions: log report is available to the API consumer
@@ -36,7 +36,7 @@ Request to compile the logged data into a file - Already Processing
     ...    Test title: Request to compile the logged data into a file - Already Processing
     ...    Test objective: The objective is to request to compile the logged data into a file when a log data compilation and report creation is already ongoing, or a log report has just been created, for the specified logging job at the time of processing the request
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -49,7 +49,7 @@ Request to compile the logged data into a file with unprocessable content
     ...    Test title: Request to compile the logged data into a file with unprocessable content
     ...    Test objective:  The objective is to test that the rrequest to compile the logged data into a file fails when error in request body. 
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ GET Compiled Log Data - Method not implemented
     ...    Test title: GET Compiled Log Data - Method not implemented
     ...    Test objective: The objective is to test that GET method is not allowed to retrieve compiled log data.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ PUT Compiled Log Data - Method not implemented
     ...    Test title: PUT Compiled Log Data - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update compiled log data.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -86,7 +86,7 @@ PATCH Compiled Log Data - Method not implemented
     ...    Test title: PATCH Compiled Log Data - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update compiled log data.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -98,7 +98,7 @@ DELETE Compiled Log Data - Method not implemented
     ...    Test title: DELETE Compiled Log Data - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update compiled log data.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ Request to compile the logged data into a file with a permitted authorization sc
     ...    Test title: Request to compile the logged data into a file with a permitted authorization scope - Synchronous mode
     ...    Test objective: The objective is to request to compile the logged data into a file in synchronous mode with a permitted authorization scope
     ...    Pre-conditions: logging job is available
-    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO can decide immediately what to respond to a compile request
     ...    Post-Conditions: none
@@ -124,7 +124,7 @@ Request to compile the logged data into a file with not permitted authorization
     ...    Test title: Request to compile the logged data into a file with not permitted authorization scope - Synchronous mode
     ...    Test objective: The objective is to test that requesting to compile the logged data into a file in synchronous mode fails when using not permitted authorization scope
     ...    Pre-conditions: logging job is available
-    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO can decide immediately what to respond to a compile request
     ...    Post-Conditions: none
diff --git a/SOL009/NFVMANOLogManagement-API/IndividualLoggingJob.robot b/SOL009/NFVMANOLogManagement-API/IndividualLoggingJob.robot
index aa42b23b57031ab6d19506ec68492fa3b367af76..c5c5ccd902d667d6465182af7e5928d68299ab37 100644
--- a/SOL009/NFVMANOLogManagement-API/IndividualLoggingJob.robot
+++ b/SOL009/NFVMANOLogManagement-API/IndividualLoggingJob.robot
@@ -7,7 +7,7 @@ POST Individual Logging Job - Method not implemented
     ...    Test title: POST Individual Logging Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create an Indiviual Logging
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET individual Logging Job
     ...    Test title: Get individual Logging Job
     ...    Test objective: The objective is to test the retrieval of an individual logging job and perform a JSON schema validation of the collected job data structure
     ...    Pre-conditions: Logging Job is already created.
-    ...    Reference: clause 8.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -33,7 +33,7 @@ GET individual Logging Job with invalid resource identifier
     ...    Test title: Get individual Logging Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual logging job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: Logging Job is already created.
-    ...    Reference: clause 8.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -46,7 +46,7 @@ PUT Individual Logging Job - Method not implemented
     ...    Test title: PUT Individual Logging Job - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing Logging Job
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.4.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.4.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ PATCH Individual Logging Job - Method not implemented
     ...    Test title: PATCH Individual Logging Job - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing new Logging Job
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -70,7 +70,7 @@ DELETE Individual Logging Job
     ...    Test title: DELETE Individual Logging Job
     ...    Test objective: The objective is to test the deletion of an individual logging job
     ...    Pre-conditions: Logging Job is already created.
-    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Logging Job is no more available.   
@@ -83,7 +83,7 @@ DELETE Individual Logging Job with invalid resource identifier
     ...    Test title: DELETE Individual Logging Job with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual logging job fails when using an invalid resource identifier
     ...    Pre-conditions: Logging Job is already created.
-    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -96,7 +96,7 @@ DELETE Individual Logging Job with permitted authorization scope
     ...    Test title: DELETE Individual Logging Job with permitted authorization scope
     ...    Test objective: The objective is to test the deletion of an individual logging job with permitted authorization scope
     ...    Pre-conditions: Logging Job is already created.
-    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Logging Job is no more available.   
@@ -109,7 +109,7 @@ DELETE Individual Logging Job with not permitted authorization scope
     ...    Test title: DELETE Individual Logging Job with not permitted authorization scope
     ...    Test objective: The objective is to test that the deletion of an individual logging job fails when using a not permitted authorization scope
     ...    Pre-conditions: Logging Job is already created.
-    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Logging Job is no more available.   
diff --git a/SOL009/NFVMANOLogManagement-API/IndividualReport.robot b/SOL009/NFVMANOLogManagement-API/IndividualReport.robot
index b80d18028502478e94a9c2983afb31a638b91f9e..531a1138252282a080776c6a615f3147a55b66c2 100644
--- a/SOL009/NFVMANOLogManagement-API/IndividualReport.robot
+++ b/SOL009/NFVMANOLogManagement-API/IndividualReport.robot
@@ -7,7 +7,7 @@ POST Individual Log Report - Method not implemented
     ...    Test title: POST Individual Log Report - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new log report.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ Get Individual Log Report
     ...    Test title: Get Individual Log Report
     ...    Test objective: The objective is to test the retrieval of an individual log report and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: One or more log reports are set.
-    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ Get Individual Log Report (asynchronous)
     ...    Test title: Get Individual Log Report  (asynchronous)
     ...    Test objective: The objective is to test the retrieval of an individual log report is ongoing and no log report is available yet.
     ...    Pre-conditions: One or more log reports are set.
-    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ Get Individual Log Report with invalid resource endpoint
     ...    Test title: Get Individual Log Report with invalid resource endpoint
     ...    Test objective:  The objective is to test that the retrieval of an individual log report  fails when using an invalid resource endpoint. 
     ...    Pre-conditions: One or more log reports are set.
-    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ PUT Individual Log Report - Method not implemented
     ...    Test title: PUT Individual Log Report - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing log report.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -69,7 +69,7 @@ PATCH Individual Log Report - Method not implemented
     ...    Test title: PATCH Individual Log Report - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existinglog report.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -81,7 +81,7 @@ DELETE Individual Log Report - Method not implemented
     ...    Test title: DELETE Individual Log Report - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing log report.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.5.3.5 - 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 Individual Log Report with permitted authorization scope
     ...    Test title: Get Individual Log Report with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an individual log report with permitted authorization scope
     ...    Pre-conditions: One or more log reports are set.
-    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.5.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 Individual Log Report with not permitted authorization scope
     ...    Test title: Get Individual Log Report with not permitted authorization scope
     ...    Test objective: The objective is to test that the retrieval of an individual log report fails when using not permitted authorization scope
     ...    Pre-conditions: One or more log reports are set.
-    ...    Reference: clause 8.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.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/NFVMANOLogManagement-API/IndividualSubscription.robot b/SOL009/NFVMANOLogManagement-API/IndividualSubscription.robot
index 3f6565f388eb9f6042b63320c3bfd8d8bde59614..7d9895b0dc4f28744e59d8e7698908966807f3a0 100644
--- a/SOL009/NFVMANOLogManagement-API/IndividualSubscription.robot
+++ b/SOL009/NFVMANOLogManagement-API/IndividualSubscription.robot
@@ -7,7 +7,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 validation of the returned subscription data structure
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -21,7 +21,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 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -34,7 +34,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 8.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The is not available anymore in the NFV-MANO    
@@ -47,7 +47,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 8.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -59,7 +59,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 8.5.8.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.8.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -71,7 +71,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 8.5.8.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.8.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -83,7 +83,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 8.5.8.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.8.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -95,7 +95,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 with permitted authorization scope
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -109,7 +109,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 that the retrieval of individual subscription fails when using not permitted authorization scope
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.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/NFVMANOLogManagement-API/LoggingJobs.robot b/SOL009/NFVMANOLogManagement-API/LoggingJobs.robot
index 7e427b78d265665dc243e2eb999c39f781446907..4e1e75853577a92d7851200ab5433043179efcc7 100644
--- a/SOL009/NFVMANOLogManagement-API/LoggingJobs.robot
+++ b/SOL009/NFVMANOLogManagement-API/LoggingJobs.robot
@@ -7,7 +7,7 @@ POST Create a new logging job
     ...    Test title: POST Create a new logging job
     ...    Test objective: The objective is to create a new logging job, and perform the JSON schema validation of the operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: logging job created
@@ -22,7 +22,7 @@ GET information about logging jobs
     ...    Test title: GET information logging jobs
     ...    Test objective: The objective is to retrieve information about logging jobs, and perform the JSON schema validation of the operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -35,7 +35,7 @@ GET Logging jobs - invalid attribute-based filter
     ...    Test title: GET Logging jobs - invalid attribute-based filter
     ...    Test objective:  The objective is to test that the retrieval of logging jobs fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -48,7 +48,7 @@ GET Logging jobs - invalid attribute selector
     ...    Test title: GET Logging jobs - invalid attribute selector
     ...    Test objective: The objective is to test that the retrieval of logging jobs fails when using invalid attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -61,7 +61,7 @@ GET Logging jobs - Bad Request Response too Big
     ...    Test title: GET Logging jobs - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of Logging job fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ GET information about logging jobs with attribute-based filter
     ...    Test title: GET information about logging jobs with attribute-based filter
     ...    Test objective: The objective is to retrieve information about the logging jobs with attribute filters, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ GET information about logging jobs with "all_fields" attribute selector
     ...    Test title: GET information about logging jobs with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about logging jobs with "all_fields" attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -100,7 +100,7 @@ GET information about Logging Jobs with "exclude_default" attribute selector
     ...    Test title: GET information about Logging Jobs with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve information about logging jobs with "exclude_default" attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.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 information about Logging Jobs with "fields" attribute selector
     ...    Test title: GET information about Logging Jobs with fields attribute selector
     ...    Test objective: The objective is to retrieve information about Logging Jobs with fields attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.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 information about Logging Jobs with "exclude_fields" attribute selector
     ...    Test title: GET information about Logging Jobs with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the Logging Jobs with "exclude_fields" attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -139,7 +139,7 @@ GET information about Logging Jobs with "fields" and "exclude_default" attribute
     ...    Test title: GET information about Logging Jobs with fields and exclude_default attribute selector
     ...    Test objective: The objective is to retrieve information about Logging Jobs with fields and exclude_default attribute selector, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -152,7 +152,7 @@ GET information about Logging Jobs with Paged Response
     ...    Test title: GET information about Logging Jobs with Paged Response
     ...    Test objective: The objective is to query information about Logging Jobs to get Paged Response.
     ...    Pre-conditions:  At least one logging job is created.
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -165,7 +165,7 @@ GET information about Logging Jobs with malformed authorization token
     ...    Test title: GET information about Logging Jobs with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of information about Logging Jobs fails when using malformed authorization token.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.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
@@ -177,7 +177,7 @@ GET information about Logging Jobs without authorization token
     ...    Test title: GET information about Logging Jobs without authorization token
     ...    Test objective: The objective is to test that the retrieval of information about Logging Jobs fails when omitting the authorization token.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.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
@@ -189,7 +189,7 @@ GET information about Logging Jobs with expired or revoked authorization token
     ...    Test title: GET information about Logging Jobs with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of information about Logging Jobs fails when using expired or revoked authorization token.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.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
@@ -201,7 +201,7 @@ PUT Logging Jobs - Method not implemented
     ...    Test title: PUT Logging Jobs - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -213,7 +213,7 @@ PATCH Logging Jobs - Method not implemented
     ...    Test title: PATCH Logging Jobs - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -225,7 +225,7 @@ DELETE Logging Jobs - Method not implemented
     ...    Test title: DELETE Logging Jobs - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -237,7 +237,7 @@ POST Create a new logging job with permitted authorization scope
     ...    Test title: POST Create a new logging job with permitted authorization scope
     ...    Test objective: The objective is to create a new logging job with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: logging job created
@@ -252,7 +252,7 @@ POST Create a new logging job with not permitted authorization scope
     ...    Test title: POST Create a new logging job with not permitted authorization scope
     ...    Test objective: The objective is to test that the creation of a new logging job fails when a not permitted authorization scope is used.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL009/NFVMANOLogManagement-API/NFVMANOLogManagementKeywords.robot b/SOL009/NFVMANOLogManagement-API/NFVMANOLogManagementKeywords.robot
index d9cdae4f372cc6c4e669a933dcb66ada168d32c3..084e56bdcaebc5b13e1546d416e137ee72e3fb74 100644
--- a/SOL009/NFVMANOLogManagement-API/NFVMANOLogManagementKeywords.robot
+++ b/SOL009/NFVMANOLogManagement-API/NFVMANOLogManagementKeywords.robot
@@ -22,7 +22,12 @@ Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
     Should Contain    ${response['headers']}    ${CONTENT_TYPE}
     Log    Header is present
-    
+    Run Keyword If    '${CONTENT_TYPE}' == 'Location'    Check Existence of Location Header Resource
+Check Existence of Location Header Resource
+    GET    ${response['headers']['Location']}
+    Log    Validate Status code
+    Integer    response status    200
+
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
@@ -642,10 +647,6 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
     ${result}=    Output    response body
     Validate Json    LogmSubscription.schema.json    ${result}
     Log    Validated LogmSubscription 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/NFVMANOLogManagement-API/NotificationEndpoint.robot b/SOL009/NFVMANOLogManagement-API/NotificationEndpoint.robot
index acade9e290342b4bc8968e1180a75fb67f85ed02..097ff823e631643518324208a8671980aa6f92f9 100644
--- a/SOL009/NFVMANOLogManagement-API/NotificationEndpoint.robot
+++ b/SOL009/NFVMANOLogManagement-API/NotificationEndpoint.robot
@@ -8,7 +8,7 @@ Log Report Available Notification
     ...    Test title: Log Report Available Notification
     ...    Test objective: The objective is to test that Log Report Available Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A subscription for log report available notification is available in the NFV-MANO.
-    ...    Reference: clause 8.5.9.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.9.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/NFVMANOLogManagement-API/Notifications.robot b/SOL009/NFVMANOLogManagement-API/Notifications.robot
index 9159d9ec4ad04480a802a6c85efd829bd49c4fa0..a65298c613c18e218f3b737312f8f7383d165844 100644
--- a/SOL009/NFVMANOLogManagement-API/Notifications.robot
+++ b/SOL009/NFVMANOLogManagement-API/Notifications.robot
@@ -9,7 +9,7 @@ Log Report Avaliable Notification
     ...    Test title: Log Report Avaliable Notification
     ...    Test objective: The objective is to test the dispatch of Log Report Avaliable Notification when new log report is available 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: none
-    ...    Reference: clause 8.5.9.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.9.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVMANOLogManagement-API/Subscriptions.robot b/SOL009/NFVMANOLogManagement-API/Subscriptions.robot
index 2ab8c38c9436c028e1eda6f3867cd4c57b537e1b..103e60665e61a309e3debc279f7ebdfe32cb10d4 100644
--- a/SOL009/NFVMANOLogManagement-API/Subscriptions.robot
+++ b/SOL009/NFVMANOLogManagement-API/Subscriptions.robot
@@ -9,7 +9,7 @@ GET all Subscriptions
     ...    Test title: GET all Subscriptions
     ...    Test objective: The objective is to test the retrieval list of active subscriptions list to log management notifications 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 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -22,7 +22,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 to log management notifications using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -35,7 +35,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 log management notifications to get Paged Response.
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -48,7 +48,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 to log management notifications 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 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -61,7 +61,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 to log management notifications 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 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,7 +74,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 to log management notifications fails when using invalid resource endpoint.
     ...    Pre-conditions: At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -87,7 +87,7 @@ GET Subscription with attribute-based filter "id"
     ...    Test title: GET Subscription with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id"
     ...    Pre-conditions: none 
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none 
     ...    Post-Conditions: none 
@@ -101,7 +101,7 @@ Get subscriptions with filter "filter.notificationTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.notificationTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes"
     ...    Pre-conditions: none 
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability:  none 
     ...    Post-Conditions: none 
@@ -115,13 +115,15 @@ POST Create new Subscription
     ...    Test title: POST Create new Subscription
     ...    Test objective: The objective is to test the creation of a new subscription to log management notification and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.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    LogmSubscription
+    Check HTTP Response Header Contains    Location
+    Check Postcondition Subscription Resource Returned in Location Header Is Available
     Check HTTP Response Body LogmSubscription Attributes Values Match the Issued Subscription
     Check Postcondition Subscription Is Set 
 
@@ -131,7 +133,7 @@ POST Create request for duplicated Subscription not creating duplicated subscrip
     ...    Test title: POST 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 8.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.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 
@@ -147,13 +149,15 @@ POST Create request for duplicated Subscription creating duplicated subscription
     ...    Test title: POST 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 8.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.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
     Send Post Request for Duplicated Subscription
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    PmSubscription
+    Check HTTP Response Header Contains    Location
+    Check Postcondition Subscription Resource Returned in Location Header Is Available
     Check HTTP Response Body LogmSubscription Attributes Values Match the Issued Subscription
     Check Postcondition Subscription Is Set 
 
@@ -162,7 +166,7 @@ PUT Subscriptions - Method not implemented
     ...    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 8.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -174,7 +178,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 8.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -186,7 +190,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 8.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -198,7 +202,7 @@ POST Create new Subscription - Unprocessable content
     ...    Test title: POST Create new Subscription - Unprocessable content
     ...    Test objective: The objective is to test that a new log management subscription is not created if the notification endpoint is unreachable by the NFV-MANO.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.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
@@ -211,7 +215,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 list to log management notifications with permitted authorization scope
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -224,7 +228,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 that the retrieval list of active subscriptions list to log management notifications fails when using not permitted authorization scope
     ...    Pre-conditions:  At least one subscription is available in the NFV-MANO.
-    ...    Reference: clause 8.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 8.5.7.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/NFVMANOPerformanceManagement-API/IndividualPmJob.robot b/SOL009/NFVMANOPerformanceManagement-API/IndividualPmJob.robot
index 720195b44b51b872b8f6de1f95716983cec87592..dffecf063f382f05cb733defeff084453ee66edf 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/IndividualPmJob.robot
@@ -7,7 +7,7 @@ POST Individual NFV-MANO Performance Job - Method not implemented
     ...    Test title: POST Individual NFV-MANO Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NFV-MANO Performance Monitoring Job
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.4.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET individual NFV-MANO Performance Job
     ...    Test title: Get individual NFV-MANO Performance Job
     ...    Test objective: The objective is to test the retrieval of an individual performance monitoring job and perform a JSON schema validation of the collected job data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated.
-    ...    Reference: clause 6.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -33,7 +33,7 @@ GET individual NFV-MANO Performance Job with invalid resource identifier
     ...    Test title: Get individual NFV-MANO Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual performance monitoring job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.4.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -46,7 +46,7 @@ PUT Individual NFV-MANO Performance Job - Method not implemented
     ...    Test title: PUT Individual NFV-MANO Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NFV-MANO Performance Monitoring Job
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ PATCH Individual NFV-MANO Performance Job
     ...    Test title: PATCH Individual NFV-MANO Performance Job
     ...    Test objective: The objective is to test that PATCH method modify an existing individual NFV-MANO Performance Monitoring Job
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: PM Job resource is modified.
@@ -71,7 +71,7 @@ DELETE Individual NFV-MANO Performance Job
     ...    Test title: Delete Individual NFV-MANO Performance Job
     ...    Test objective: The objective is to test the deletion of an individual performance monitoring job
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Job is no more available.   
@@ -84,7 +84,7 @@ DELETE Individual NFV-MANO Performance Job with invalid resource identifier
     ...    Test title: Delete individual NFV-MANO Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual NFV-MANO performance monitoring job fails when using an invalid resource identifier
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.4.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -96,7 +96,7 @@ PATCH Individual NFV-MANO Performance Job - Precondition failed
     ...    Test title: PATCH Individual NFV-MANO Performance Job - Precondition failed
     ...    Test objective: The objective is to test that the PATCH method cannot modify an individual NFV-MANO Performance job where the precondition was not met.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: PM Job resource is not modified.
@@ -109,7 +109,7 @@ PATCH Individual NFV-MANO Performance Job - Unprocessable content
     ...    Test title: PATCH Individual NFV-MANO Performance Job - Unprocessable content
     ...    Test objective: The objective is to test that PATCH method cannot modify an exsisting individual PM job resource when a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: PM Job resource is not modified.
@@ -122,7 +122,7 @@ PATCH Individual NFV-MANO Performance Job with permitted authorization scope
     ...    Test title: PATCH Individual NFV-MANO Performance Job with permitted authorization scope
     ...    Test objective: The objective is to test that PATCH method with permitted authorization scope modify an existing individual NFV-MANO Performance Monitoring Job
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: PM Job resource is modified.
@@ -135,7 +135,7 @@ PATCH Individual NFV-MANO Performance Job with not permitted authorization scope
     ...    Test title: PATCH Individual NFV-MANO Performance Job with not permitted authorization scope
     ...    Test objective: The objective is to test that PATCH method with not permitted authorization scope fails
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.4.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: PM Job resource is modified.
diff --git a/SOL009/NFVMANOPerformanceManagement-API/IndividualReport.robot b/SOL009/NFVMANOPerformanceManagement-API/IndividualReport.robot
index 08af11fe6e479fe6765d7015a79e4958730bd7fe..96dca371bdb362847bb772732c13b89c5cff61f5 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/IndividualReport.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/IndividualReport.robot
@@ -7,7 +7,7 @@ POST Individual Performance Report - Method not implemented
     ...    Test title: POST Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NFV-MANO performance report within a monitoring job.
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.5.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ Get Individual Performance Report
     ...    Test title: Get Individual Performance Report
     ...    Test objective: The objective is to test the retrieval of an individual performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance reports are set for a monitoring job.
-    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ Get Individual Performance Report with invalid resource endpoint
     ...    Test title: Get Individual Performance Report with invalid resource endpoint
     ...    Test objective:  The objective is to test that the retrieval of an individual NFV-MANO performance report associated to a monitoring job fails when using an invalid resource endpoint. 
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance reports are set for a monitoring job.
-    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ PUT Individual Performance Report - Method not implemented
     ...    Test title: PUT Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NFV-MANO performance report within a monitoring job.
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.5.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -56,7 +56,7 @@ PATCH Individual Performance Report - Method not implemented
     ...    Test title: PATCH Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing NFV-MANO performance report within a monitoring job.
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.5.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ DELETE Individual Performance Report - Method not implemented
     ...    Test title: DELETE Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing NFV-MANO performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.5.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANOM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -80,7 +80,7 @@ Get Individual Performance Report with permitted authorization scope
     ...    Test title: Get Individual Performance Report with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an individual performance report associated to a monitoring job with permitted authorization scope
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance reports are set for a monitoring job.
-    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.5.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 Individual Performance Report with not permitted authorization scope
     ...    Test title: Get Individual Performance Report with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an individual performance report associated to a monitoring job fails with not permitted authorization scope
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance reports are set for a monitoring job.
-    ...    Reference: clause 6.5.5.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.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/NFVMANOPerformanceManagement-API/IndividualThreshold.robot b/SOL009/NFVMANOPerformanceManagement-API/IndividualThreshold.robot
index ae9cff74ca771c109435e17a3467478e2f1b02c3..bc0796fa841c8733642fa6ed7902a3348c55e3cd 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/IndividualThreshold.robot
@@ -7,7 +7,7 @@ POST Individual Threshold - Method not implemented
     ...    Test title: POST Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Performance Threshold
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.7.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET Individual Threshold
     ...    Test title: GET Individual Threshold
     ...    Test objective: The objective is to test the retrieval of an individual NFV-MANO performance threshold and perform a JSON schema and content validation of the collected threshold data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -33,7 +33,7 @@ GET Individual Threshold with invalid resource identifier
     ...    Test title: GET Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual performance threshold fails when using an invalid resource identifier
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance jobs are set.
-    ...    Reference: clause 6.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.7.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ PUT Individual Threshold - Method not implemented
     ...    Test title: PUT Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing Performance threshold
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.7.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ PATCH Individual Threshold
     ...    Test title: PATCH Individual Threshold
     ...    Test objective: The objective is to test that PATCH method modify an existing NFV_MANO performance threshold.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Threshold resource is modified.
@@ -70,7 +70,7 @@ DELETE Individual Threshold
     ...    Test title: DELETE Individual Threshold
     ...    Test objective: The objective is to test the deletion of an individual performance threshold
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The Performance Threshold is not available anymore in the NFV-MANO    
@@ -83,7 +83,7 @@ DELETE Individual Threshold with invalid resource identifier
     ...    Test title: DELETE Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test the deletion of an individual performance threshold
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.7.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -95,7 +95,7 @@ PATCH Individual Threshold - Precondition failed
     ...    Test title: PATCH Individual Threshold - Precondition failed
     ...    Test objective: The objective is to test that the PATCH method cannot modify an individual NFV-MANO threshold where the precondition was not met.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Threshold resource is not modified.
@@ -108,7 +108,7 @@ PATCH Individual Threshold - Unprocessable content
     ...    Test title: PATCH Individual Threshold - Unprocessable content
     ...    Test objective: The objective is to test that PATCH method cannot modify an exsisting individual threshold resource when a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Threshold resource is not modified.
@@ -121,7 +121,7 @@ PATCH Individual Threshold with permitted authorization scope
     ...    Test title: PATCH Individual Threshold with permitted authorization scope
     ...    Test objective: The objective is to test that PATCH method modify an existing NFV_MANO performance threshold with permitted authorization scope.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Threshold resource is modified.
@@ -134,7 +134,7 @@ PATCH Individual Threshold with not permitted authorization scope
     ...    Test title: PATCH Individual Threshold with not permitted authorization scope
     ...    Test objective: The objective is to test that PATCH method fails with not permitted authorization scope.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more performance thresholds are set.
-    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.7.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: Threshold resource is modified.
diff --git a/SOL009/NFVMANOPerformanceManagement-API/NFVMANOPMKeywords.robot b/SOL009/NFVMANOPerformanceManagement-API/NFVMANOPMKeywords.robot
index ac39e32dbf8462c067eb5ff3f5c6446a97e60c65..9fb0b107536a5027af8797e5a6ebf34ed3adaac0 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/NFVMANOPMKeywords.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/NFVMANOPMKeywords.robot
@@ -234,7 +234,18 @@ Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
     Should Contain    ${response['headers']}    ${CONTENT_TYPE}
     Log    Header is present
-    
+
+Check Postcondition Resource Returned in Location Header Is Available
+    Log    Going to check postcondition
+    GET    ${response['headers']['Location']}
+    Integer    response status    200
+    Log    Received a 200 OK as expected
+    ${contentType}=    Output    response headers Content-Type
+    Should Contain    ${contentType}    application/json
+    ${result}=    Output    response body
+    Validate Json    schemas/PmJobschema.json    ${result}
+    Log    Validated PmJobschema schema
+
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
diff --git a/SOL009/NFVMANOPerformanceManagement-API/NotificationEndpoint.robot b/SOL009/NFVMANOPerformanceManagement-API/NotificationEndpoint.robot
index 23b5b9ac3cc01256070db4dc35401d9509216957..e1c2660c6c5274a7a069d7e34d03c775fad12b7b 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/NotificationEndpoint.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/NotificationEndpoint.robot
@@ -8,7 +8,7 @@ Performance Information Available Notification
     ...    Test title: Performance Information Available Notification
     ...    Test objective: The objective is to test that Performance Available Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for performance available notification is available in the NFV-MANO.
-    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -21,7 +21,7 @@ Threshold Crossed Notification
     ...    Test title: Threshold Crossed Notification
     ...    Test objective: The objective is to test that Threshold Crossed Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for threshold crosssed notification is available in the NFV-MANO.
-    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.10.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/NFVMANOPerformanceManagement-API/Notifications.robot b/SOL009/NFVMANOPerformanceManagement-API/Notifications.robot
index 7287db0a9b05ce9e819ba663f7473c80725bdbf4..cfff4995c7b4f0171c3a1f5fedb1594de5605675 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/Notifications.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/Notifications.robot
@@ -9,7 +9,7 @@ Performance Information Availability Notification
     ...    Test title: Performance Information Availability Notification
     ...    Test objective: The objective is to test the dispatch of Performance Information Availability Notification when new performance information is available 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 performance job is created, and a subscription for information availability notifications is available in the NFV-MANO.
-    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -22,7 +22,7 @@ Threshold Crossed Notification
     ...    Test title: Threshold Crossed Notification
     ...    Test objective: The objective is to test the dispatch of Threshold Crossed Notification when a previously set performance metric threshold is crossed, 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 threshold subscription is available in the NFV-MANO.
-    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.10.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL009/NFVMANOPerformanceManagement-API/PMJobs.robot b/SOL009/NFVMANOPerformanceManagement-API/PMJobs.robot
index 818f5330e7fe9ccaec39dc2f2cc5b5a4078d30fe..d280713b2f4591c46bbaac89080b68797040257a 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/PMJobs.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/PMJobs.robot
@@ -7,13 +7,15 @@ POST Create new NFV-MANO Performance Monitoring Job
     ...    Test title:  POST Create a new NFV-MANO Performance Monitoring Job
     ...    Test objective: The objective is to test the creation of a new NFV-MANO performance monitoring job and perform the JSON schema validation of the returned job data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Job is successfully created on the NFV-MANO
     Send Post Request to create new NFV-MANO Performance Monitoring Job
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is   PmJob
+    Check HTTP Response Header Contains    Location
+    Check Postcondition Resource Returned in Location Header Is Available
     Check Postcondition PmJob Exists
     
 GET all NFV-MANO Performance Monitoring Jobs
@@ -21,7 +23,7 @@ GET all NFV-MANO Performance Monitoring Jobs
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs
     ...    Test objective: The objective is to test the retrieval of all the available NFV-MANO performance monitoring jobs and perform a JSON schema validation
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -34,7 +36,7 @@ GET NFV-MANO Performance Monitoring Jobs with attribute-based filter
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of NFV-MANO performance monitoring jobs using attribute-based filter, perform a JSON schema validation of the collected jobs data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -47,7 +49,7 @@ GET all NFV-MANO Performance Monitoring Jobs with all_fields attribute selector
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs with all_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all NFV-MANO performance monitoring jobs all_fields attribute selector, perform a JSON schema validation of the collected jobs data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,7 +62,7 @@ GET all NFV-MANO Performance Monitoring Jobs with exclude_default attribute sele
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of all NFV-MANO performance monitoring jobs exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -73,7 +75,7 @@ GET all NFV-MANO Performance Monitoring Jobs with fields attribute selector
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all NFV-MANO performance monitoring jobs fields attribute selector, perform a JSON schema validation of the collected jobs data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO supports the use of fields attribute selector
     ...    Post-Conditions: none
@@ -86,7 +88,7 @@ GET all NFV-MANO Performance Monitoring Jobs with exclude_fields attribute selec
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all NFV-MANO performance monitoring jobs exclude_fields attribute selector, perform a JSON schema validation of the collected jobs data structure
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -99,7 +101,7 @@ GET NFV-MANO Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test title: GET NFV-MANO Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO performance monitoring jobs fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,7 +114,7 @@ GET NFV-MANO Performance Monitoring Jobs with invalid attribute selector
     ...    Test title: GET NFV-MANO Performance Monitoring Jobs with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO performance monitoring jobs fails with invalid attribute selector
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -125,7 +127,7 @@ GET information about multiple Performance Monitoring Jobs to get Paged Response
     ...    Test title: GET information about multiple Performance Monitoring Jobs to get Paged Response
     ...    Test objective: The objective is to retrieve information about the performance monitoring jobs to get paged response
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -138,7 +140,7 @@ GET information about multiple Performance Monitoring Jobs for Bad Request Respo
     ...    Test title: GET information about multiple Performance Monitoring Jobs for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about performance monitoring jobs when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -151,7 +153,7 @@ GET information about multiple Performance Monitoring Jobs with "fields" and "ex
     ...    Test title: GET all NFV-MANO Performance Monitoring Jobs with "fields" and "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve all performance monitoring jobs 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
@@ -164,7 +166,7 @@ Get information about multiple Performance Monitoring Jobs with malformed author
     ...    Test title: Get information about multiple Performance Monitoring Jobs with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of information about Performance Monitoring Jobs fails when using malformed authorization token
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -176,7 +178,7 @@ Get information about multiple Performance Monitoring Jobs without authorization
     ...    Test title: Get information about multiple Performance Monitoring Jobs without authorization token
     ...    Test objective: The objective is to test that the retrieval of information about Performance Monitoring Jobs fails when omitting the authorization token
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -188,7 +190,7 @@ GET information about multiple Performance Monitoring Jobs with expired or revok
     ...    Test title: GET information about multiple Performance Monitoring Jobs with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of information about Performance Monitoring Jobs fails when using expired or revoked authorization token
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO
-    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO entity requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -200,7 +202,7 @@ PUT all NFV-MANO Performance Monitoring Jobs - Method not implemented
     ...    Test title: PUT all NFV-MANO Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify NFV-MANO Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -212,7 +214,7 @@ PATCH all NFV-MANO Performance Monitoring Jobs - (Method not implemented)
     ...    Test title: PATCH all NFV-MANO Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update NFV-MANO Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -224,7 +226,7 @@ DELETE all NFV-MANO Performance Monitoring Jobs - Method not implemented
     ...    Test title: DELETE all NFV-MANO Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update NFV-MANO Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -236,7 +238,7 @@ POST Create new NFV-MANO Performance Monitoring Job - Unreachable Notification E
     ...    Test title:  POST Create a new NFV-MANO Performance Monitoring Job
     ...    Test objective: The objective is to test that a new NFV_MANO Performance Monitoring Job is not created if the notification endpoint is unreachable by the NFV-MANO.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.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
@@ -249,7 +251,7 @@ POST Create new NFV-MANO Performance Monitoring Job with permitted authorization
     ...    Test title:  POST Create a new NFV-MANO Performance Monitoring Job with permitted authorization scope
     ...    Test objective: The objective is to test the creation of a new NFV-MANO performance monitoring job with permitted authorization scope
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Job is successfully created on the NFV-MANO
@@ -263,7 +265,7 @@ POST Create new NFV-MANO Performance Monitoring Job with not permitted authoriza
     ...    Test title:  POST Create a new NFV-MANO Performance Monitoring Job with not permitted authorization scope
     ...    Test objective: The objective is to test that the creation of a new NFV-MANO performance monitoring job fails with not permitted authorization scope
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance jobs are set in the NFV-MANO.
-    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.3.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Job is successfully created on the NFV-MANO
diff --git a/SOL009/NFVMANOPerformanceManagement-API/Thresholds.robot b/SOL009/NFVMANOPerformanceManagement-API/Thresholds.robot
index 24a6970262e89dffd979c58476b11288550ede93..b351c76f22f0afa02edb695827030216b2c34789 100644
--- a/SOL009/NFVMANOPerformanceManagement-API/Thresholds.robot
+++ b/SOL009/NFVMANOPerformanceManagement-API/Thresholds.robot
@@ -7,7 +7,7 @@ POST Create new Performance Threshold
     ...    Test title:  POST Create new Performance Threshold
     ...    Test objective: The objective is to test the creation of a new NFV-MANO performance threshold and perform the JSON schema validation of the returned threshold data structure.
     ...    Pre-conditions: A NFV-MANO instance is instantiated.
-    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Threshold is successfully created on the NFV-MANO
@@ -22,7 +22,7 @@ GET All Performance Thresholds
     ...    Test title: GET All Performance Thresholds
     ...    Test objective: The objective is to test the retrieval of all the available NFV-MANO performance thresholds and perform a JSON schema validation of the collected thresholds data structure.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance thresholds are set.
-    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -35,7 +35,7 @@ GET Performance Thresholds with attribute-based filter
     ...    Test title: GET Performance Thresholds with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all the available NFV-MANO performance thresholds when using attribute-based filters, perform a JSON schema validation of the collected thresholds data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance thresholds are set in the NFV-MANO.
-    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -49,7 +49,7 @@ GET Performance Threshold with Paged Response
     ...    Test title: GET Performance Threshold with Paged Response
     ...    Test objective: The objective is to query information about NFV-MANO Performance Thresholds to get Paged Response.
     ...    Pre-conditions:  A NFV-MANO instance is instantiated. One or more NFV-MANO performance thresholds are set.
-    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ GET Performance Thresholds - Invalid attribute-based filter
     ...    Test title: GET Performance Thresholds - Invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO performance thresholds fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: A NFV-MANO instance is instantiated. One or more NFV-MANO performance thresholds are set.
-    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ GET Performance Threshold - Bad Request Response too Big
     ...    Test title: GET Performance Threshold - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of NFV-MANO performance thresholds fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions:  A NFV-MANO instance is instantiated. One or more NFV-MANO performance thresholds are set.
-    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.6.3.2 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ PUT Performance Thresholds - Method not implemented
     ...    Test title: PUT Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify NFV-MANO Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.6.3.3 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -100,7 +100,7 @@ PATCH Performance Thresholds - Method not implemented
     ...    Test title: PATCH Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify NFV-MANO Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.6.3.4 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,7 +112,7 @@ DELETE Performance Thresholds - Method not implemented
     ...    Test title: DELETE Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update NFV-MANO Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: clause 6.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.6.3.5 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -125,7 +125,7 @@ POST Create new Performance Threshold - Unprocessable content
     ...    Test objective: The objective is to test the creation of a new NFV-MANO performance threshold and perform the JSON schema validation of the returned threshold data structure.
     ...    Test objective: The objective is to test that a new NFV-MANO performance threshold is not created if the notification endpoint is unreachable by the NFV-MANO.
     ...    Pre-conditions: A NFV-MANO instance is instantiated.
-    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.6.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
@@ -138,7 +138,7 @@ POST Create new Performance Threshold with permitted authorization scope
     ...    Test title:  POST Create new Performance Threshold with permitted authorization scope
     ...    Test objective: The objective is to test the creation of a new NFV-MANO performance threshold with permitted authorization scope.
     ...    Pre-conditions: A NFV-MANO instance is instantiated.
-    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Threshold is successfully created on the NFV-MANO
@@ -153,7 +153,7 @@ POST Create new Performance Threshold with not permitted authorization scope
     ...    Test title:  POST Create new Performance Threshold with not permitted authorization scope
     ...    Test objective: The objective is to test the creation of a new NFV-MANO performance threshold fails with not permitted authorization scope.
     ...    Pre-conditions: A NFV-MANO instance is instantiated.
-    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v4.5.1
+    ...    Reference: clause 6.5.6.3.1 - ETSI GS NFV-SOL 009 [7] v5.1.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: The NFV-MANO Performance Threshold is successfully created on the NFV-MANO
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"
+                            }
+                        }
+                    }
                 }
             }
         },