diff --git a/SOL002/VNFConfiguration-API/ApiVersion.robot b/SOL002/VNFConfiguration-API/ApiVersion.robot
index 621fcc74618a0d1c155cc29b6536775fc8b49dc8..97403c1b4f9973d38e10bfc6c119c802b7e598b5 100644
--- a/SOL002/VNFConfiguration-API/ApiVersion.robot
+++ b/SOL002/VNFConfiguration-API/ApiVersion.robot
@@ -11,7 +11,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -23,7 +23,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -72,7 +72,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -84,7 +84,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,7 +109,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -121,7 +121,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFConfiguration-API/Configuration.robot b/SOL002/VNFConfiguration-API/Configuration.robot
index 0d2720bc0e8faa4662f4c6028771cb22f5ab3ad7..6332449e50c41c46d3d148f6e328e74b8328f997 100644
--- a/SOL002/VNFConfiguration-API/Configuration.robot
+++ b/SOL002/VNFConfiguration-API/Configuration.robot
@@ -14,7 +14,7 @@ Set new VNF Configuration
     ...    Test title: Set a new VNF Configuration
     ...    Test objective: The objective is to test the creation of a new VNF configuration and perform a JSON schema validation of the returned configuration data structure
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
     ...    Post-Conditions: The configuration is successfully set in the VNF and it matches the issued configuration
@@ -30,7 +30,7 @@ Get information about a VNF configuration
     ...    Test title: Get information about a VNF configuration
     ...    Test objective: The objective is to test the retrieval of an existing VNF instance configuration and perform a JSON schema validation of the collected configuration data structure
     ...    Pre-conditions: A VNF instance is instantiated. The VNF instance is already configured.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ Get information about a VNF configuration with HTTP Etag
     ...    Test title: Get information about a VNF configuration with HTTP Etag
     ...    Test objective: The objective is to test the retrieval of an existing VNF instance configuration, check the generation by the VNF of an HTTP Etag opaque identifier, and perform a JSON schema validation of the collected configuration data structure
     ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
     ...    Post-Conditions: none
@@ -59,7 +59,7 @@ Set new VNF Configuration - HTTP Etag precondition unsuccessful
     ...    Test title: Set a new VNF Configuration - HTTP Etag precondition unsuccessful
     ...    Test objective: The objective is to test the unsuccess in setting a duplication of VNF configuration identified by an already used HTTP Etag identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured (Test ID 6.3.1.1.1) with a given HTTP Etag identifier.
-    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
     ...    Post-Conditions:  The VNF configuration is not modified by the unsuccessful operation and it matches the configuration issued in Test ID 6.3.1.1.1
@@ -73,7 +73,7 @@ POST VNF Configuration - Method not implemented
     ...    Test title: POST VNF Configuration - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF configuration
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -85,7 +85,7 @@ PUT VNF Configuration - Method not implemented
     ...    Test title: PUT VNF Configuration - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing VNF configuration
     ...    Pre-conditions:  none
-    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -97,7 +97,7 @@ DELETE VNF Configuration - Method not implemented
     ...    Test title: Delete VNF Configuration - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF configuration
     ...    Pre-conditions:  none
-    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -109,7 +109,7 @@ Set new VNF Configuration With Attribute vnfConfigurationData
     ...    Test title: Set a new VNF Configuration with Attribute vnfConfigurationData
     ...    Test objective: The objective is to test the creation of a new VNF configuration and perform a JSON schema validation of the returned configuration data structure
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
     ...    Post-Conditions: The configuration is successfully set in the VNF and it matches the issued configuration
@@ -124,7 +124,7 @@ Set new VNF Configuration With Attribute vnfcConfigurationData
     ...    Test title: Set a new VNF Configuration with Attribute vnfcConfigurationData
     ...    Test objective: The objective is to test the creation of a new VNF configuration and perform a JSON schema validation of the returned configuration data structure
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
     ...    Post-Conditions: The configuration is successfully set in the VNF and it matches the issued configuration
@@ -139,7 +139,7 @@ Get information about a VNF configuration with permitted authorization scope
     ...    Test title: Get information about a VNF configuration with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an existing VNF instance configuration and perform a JSON schema validation of the collected configuration data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. The VNF instance is already configured.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -152,7 +152,7 @@ Get information about a VNF configuration with NOT permitted authorization scope
     ...    Test title: Get information about a VNF configuration with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an existing VNF instance configuration and perform a JSON schema validation of the collected configuration data structure with not permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. The VNF instance is already configured.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
index a1f2e05352fa53e08c2eabbdbbe0d10aeb55d779..f1a68615fe78b9307412c256a28a308c1bc2d023 100644
--- a/SOL002/VNFFaultManagement-API/Alarms.robot
+++ b/SOL002/VNFFaultManagement-API/Alarms.robot
@@ -14,7 +14,7 @@ POST Alarms - Method not implemented
     ...    Test title: POST Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,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
     ...    Pre-conditions: none 
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ GET information about multiple alarms with attribute-based filter
     ...    Test title: GET information about multiple alarms with attribute-based filter
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute-based filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ GET information about multiple alarms with invalid attribute-based filter
     ...    Test title: GET information about multiple alarms with invalid attribute-based filter
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ GET information about multiple alarms with "all_fields" attribute selector
     ...    Test title: GET information about multiple alarms with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -78,7 +78,7 @@ GET information about multiple alarms with exclude_default attribute selector
     ...    Test title: GET information about multiple alarms with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ GET information about multiple alarms with fields attribute selector
     ...    Test title: GET information about multiple alarms with fields attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: none 
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -104,7 +104,7 @@ GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test title: GET information about multiple alarms with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve information about the alarm list
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -117,7 +117,7 @@ PUT Alarms - Method not implemented
     ...    Test title: PUT Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ PATCH Alarms - Method not implemented
     ...    Test title: PATCH Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -141,7 +141,7 @@ DELETE Alarms - Method not implemented
     ...    Test title: DELETE Alarms - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ GET information about multiple alarms to get Paged Response
     ...    Test title: GET information about multiple alarms to get Paged Response
     ...    Test objective: The objective is to retrieve information about the alarms to get paged response
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -166,7 +166,7 @@ GET information about multiple alarms for Bad Request Response too big
     ...    Test title: GET information about multiple alarms for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about Alarms when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -179,7 +179,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.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -193,7 +193,7 @@ GET information about multiple alarms with attribute-based filter "vnfcInstanceI
     ...    Test title: GET information about multiple alarms with attribute-based filter "vnfcInstanceIds"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "vnfcInstanceIds"
     ...    Pre-conditions: none 
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -207,7 +207,7 @@ GET information about multiple alarms with attribute-based filter "rootCauseFaul
     ...    Test title: GET information about multiple alarms with attribute-based filter "rootCauseFaultyResource.faultyResourceType"
     ...    Test objective: The objective is to retrieve information about the alarm list with attribute filter "rootCauseFaultyResource.faultyResourceType"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -221,7 +221,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.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -235,7 +235,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.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -249,7 +249,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.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -262,7 +262,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.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -274,7 +274,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 retrieve information about the alarm list with not permitted authorization scope
     ...    Pre-conditions: none 
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -282,6 +282,18 @@ GET information about multiple alarms with not permitted authorization scope
     Check HTTP Response Status Code Is    403
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
+GET information about multiple alarms - Unauthorized
+    [Documentation]    Test ID: 6.3.4.1.22
+    ...    Test title: GET information about multiple alarms - Unauthorized
+    ...    Test objective: The objective is to retrieve information about the alarm list without authorization.
+    ...    Pre-conditions: none 
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Alarms Task - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails  
 *** Keywords ***
 POST Alarms Task
     log    Trying to perform a POST. This method should not be implemented
@@ -324,6 +336,14 @@ GET Alarms Task
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
+GET Alarms Task - Unauthorized
+    Log    Query VNF The GET method queries information about multiple alarms without authorization.
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}  
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
 GET Alarms Task with filter
 	Log    Query VNF The GET method queries information about multiple alarms with filters.
     Set Headers    {"Accept": "${ACCEPT}"}
diff --git a/SOL002/VNFFaultManagement-API/ApiVersion.robot b/SOL002/VNFFaultManagement-API/ApiVersion.robot
index f7937d8999a7daaed499d81e52bb7d53e5e3e23d..d9b4ea1171c3e7d8ca106064fa760f4a4ee05a7b 100644
--- a/SOL002/VNFFaultManagement-API/ApiVersion.robot
+++ b/SOL002/VNFFaultManagement-API/ApiVersion.robot
@@ -13,7 +13,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -25,7 +25,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -38,7 +38,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -50,7 +50,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -62,7 +62,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -74,7 +74,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -86,7 +86,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -99,7 +99,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -111,7 +111,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -123,7 +123,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
index 2acf4517eb05cd08758ea6f1442e87af3884eed9..9eb9c26ea80e8a3b283b6855d3ad2fba3ef296a4 100644
--- a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
+++ b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
@@ -13,7 +13,7 @@ Escalate the perceived severity
     ...    Test title: Escalate the perceived severity
     ...    Test objective: To enable the consumer to escalate the perceived severity of an alarm that is represented by an individual alarm resource.
     ...    Pre-conditions: The resource representing the individual alarm has been created
-    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Escalate the perceived severity - Method not implemented
     ...    Test title: GET Escalate the perceived severity - Method not implemented
     ...    Test objective: The objective is to test that the GET HTTP method not implemented for escalate perceived severity
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:   none
@@ -37,7 +37,7 @@ PUT Escalate the perceived severity - Method not implemented
     ...    Test title: PUT Escalate the perceived severity - Method not implemented
     ...    Test objective: The objective is to test that the PUT HTTP method not implemented for escalate perceived severity
     ...    Pre-conditions: none 
-    ...    Reference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -49,7 +49,7 @@ PATCH Escalate the perceived severity - Method not implemented
     ...    Test title: PATCH Escalate the perceived severity - Method not implemented
     ...    Test objective: The objective is to test that the PATCH HTTP method not implemented for escalate perceived severity
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -61,7 +61,7 @@ DELETE Escalate the perceived severity - Method not implemented
     ...    Test title: DELETE Escalate the perceived severity - Method not implemented
     ...    Test objective: The objective is to test that the DELETE HTTP method not implemented for escalate perceived severity
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -72,7 +72,7 @@ Escalate the perceived severity with permitted authorization scope
     ...    Test title: Escalate the perceived severity with permitted authorization scope
     ...    Test objective: To enable the consumer to escalate the perceived severity of an alarm that is represented by an individual alarm resource with permitted authorization scope.
     ...    Pre-conditions: The resource representing the individual alarm has been created
-    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -83,13 +83,26 @@ Escalate the perceived severity with NOT permitted authorization scope
     ...    Test title: Escalate the perceived severity with NOT permitted authorization scope
     ...    Test objective: To enable the consumer to escalate the perceived severity of an alarm that is represented by an individual alarm resource with NOT permitted authorization scope.
     ...    Pre-conditions: The resource representing the individual alarm has been created
-    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
     POST escalate severity with not permitted authorization scope
     Check HTTP Response Status Code Is    403
 
+Escalate the perceived severity - Unauthorized
+    [Documentation]    Test ID: 6.3.4.3.8
+    ...    Test title: Escalate the perceived severity - Unauthorized
+    ...    Test objective: To enable the consumer to escalate the perceived severity of an alarm that is represented by an individual alarm resource with unauthorized.
+    ...    Pre-conditions: The resource representing the individual alarm has been created
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Post escalate severity - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+
 *** Keywords ***
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}
@@ -109,7 +122,17 @@ POST escalate severity
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate    ${body}  
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
-	
+
+POST escalate severity - Unauthorized
+    Log    escalate the perceived severity of an alarm with the VNFM without authorization.
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    ${template}=    Get File    jsons/EscalatePerceivedSeverity.json
+    ${body}=    Format String    ${template}    perceivedSeverity=${PerceivedSeverity}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate    ${body}  
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
 GET escalate severity
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
diff --git a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
index 52c9ff53873b3adf371b8d0a8bd1d6d885688d98..8fc0a18f93a39044a347e527d852b2e0f191d354 100644
--- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
@@ -16,7 +16,7 @@ POST Alarm - Method not implemented
     ...    Test title: POST Alarm - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ GET information about an individual alarm
     ...    Test title: GET information about an individual alarm
     ...    Test objective: The objective is to read an individual alarm.
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.2  - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.3.3.2  - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none 
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ PUT Individual Alarm - Method not implemented
     ...    Test title: PUT Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ PATCH Individual Alarm
     ...    Test title: PATCH Individual Alarm
     ...    Test objective: The objective is to Modify an individual alarm resource
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ PATCH Individual Alarm - Precondition failed
     ...    Test title: PATCH Individual Alarm - Precondition failed
     ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The alarm resource is not modified
@@ -82,7 +82,7 @@ PATCH Individual Alarm - Conflict
     ...    Test title: PATCH Individual Alarm - Conflict
     ...    Test objective: The objective is to Modify an individual alarm resource
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The alarm resource is not modified
@@ -96,7 +96,7 @@ DELETE Individual Alarm - Method not implemented
     ...    Test title: DELETE Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -108,7 +108,7 @@ GET information about an individual alarm - Not Found
     ...    Test title: GET information about an individual alarm - Not Found
     ...    Test objective: The objective is to test that GET method fail retrieving status information about individaual Alarms when alarm is not present.
     ...    Pre-conditions: The related alarm doesnot exists
-    ...    Reference: Clause 7.4.3.3.2  - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.3.3.2  - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -120,7 +120,7 @@ PATCH Individual Alarm with permitted authorization scope
     ...    Test title: PATCH 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.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -133,7 +133,7 @@ PATCH Individual Alarm with NOT permitted authorization scope
     ...    Test title: PATCH Individual Alarm with NOT permitted authorization scope
     ...    Test objective: The objective is to Modify an individual alarm resource with NOT permitted authorization scope
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -141,6 +141,42 @@ PATCH Individual Alarm with NOT permitted authorization scope
     Check HTTP Response Status Code Is    403
     Check HTTP Response Body Json Schema Is     ProblemDetails
 
+GET information about an individual alarm - Unauthorized
+    [Documentation]    Test ID: 6.3.4.2.11
+    ...    Test title: GET information about an individual alarm - Unauthorized
+    ...    Test objective: The objective is to read an individual alarm without authorization.
+    ...    Pre-conditions: The related alarm exists
+    ...    Reference: Clause 7.4.3.3.2  - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none 
+    ...    Post-Conditions: none
+    GET Alarm Task - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+PATCH Individual Alarm - Unauthorized
+    [Documentation]    Test ID: 6.3.4.2.12
+    ...    Test title: PATCH Individual Alarm - Unauthorized
+    ...    Test objective: The objective is to Modify an individual alarm resource without authorization.
+    ...    Pre-conditions: The related alarm exists
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH Alarm Task - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is     ProblemDetails
+PATCH Individual Alarm - Not Found
+    [Documentation]    Test ID: 6.3.4.2.13
+    ...    Test title: PATCH Individual Alarm - Not Found
+    ...    Test objective: The objective is to Modify an individual alarm resource that does not exist
+    ...    Pre-conditions: The related alarm exists
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH Alarm Task - Not Found
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is     ProblemDetails
 *** Keywords ***
 POST Alarm Task
     log    Trying to perform a POST. This method should not be implemented
@@ -170,6 +206,29 @@ PATCH Alarm Task
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
+
+PATCH Alarm Task - Unauthorized
+    log    Trying to perform a PATCH. This method modifies an individual alarm resource without authorization.
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
+    Set Headers  {"If-Match": "${original_etag[0]}"}
+    ${body}=    Get File    jsons/alarmModifications.json
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
+PATCH Alarm Task - Not Found
+    log    Trying to perform a PATCH. This method modifies an individual alarm resource on a not existing resource.
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
+    Set Headers  {"If-Match": "${original_etag[0]}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${body}=    Get File    jsons/alarmModifications.json
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${not_existing_alarmId}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
 PATCH Alarm Task with wrong precondition
     log    Trying to perform a PATCH. This method modifies an individual alarm resource
     Set Headers    {"Accept": "${ACCEPT}"}
@@ -203,6 +262,17 @@ GET Alarm Task
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 
+GET Alarm Task - Unauthorized
+	Log    Query VNF The GET method queries information about individual alarm without authorization.
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}  
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
+    ${etag}    Output    response headers ETag
+    Set Suite Variable    &{original_etag}    ${etag}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
 Check HTTP Response Header Contains ETag and Last-Modified
     Pass Execution If    ${HEADER_TEST_SUPPORTED} == 0    Headers testing not supported. Skipping the Test.
     Log    ${response['headers']}
diff --git a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
index 6ef5cc5be448efbeefbce8d7a4e2f19bfc94def0..829e1bf58476598f7de8026dcc155957a092fa9e 100644
--- a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
@@ -14,7 +14,7 @@ POST Individual Subscription - Method not implemented
     ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,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 for VNF alarms subscribed by the client
     ...    Pre-conditions: The subscription with the given id exists
-    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -39,7 +39,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 the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,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 the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ DELETE an individual subscription
     ...    Test title: DELETE an individual subscription
     ...    Test objective: The objective is to test that the deletion of a individual subscription resource.
     ...    Pre-conditions: one or more subscription already exsist
-    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: the subscription is deleted
@@ -76,7 +76,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 that GET method fail retrieving individual subscription for VNF alarms subscribed by the client because it is not present.
     ...    Pre-conditions: The subscription with the given id donot exists
-    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -88,7 +88,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 for VNF alarms subscribed by the client with the permitted authorization scope
     ...    Pre-conditions: The subscription with the given id exists
-    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -100,12 +100,48 @@ 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 read an individual subscription for VNF alarms subscribed by the client with not permitted authorization scope
     ...    Pre-conditions: The subscription with the given id exists
-    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
     Get individual subscription with not permitted authorization scope
     Check HTTP Response Status Code Is    403
+GET Information about an individual subscription - Unauthorized
+    [Documentation]    Test ID: 6.3.4.5.9
+    ...    Test title: GET Information about an individual subscription without authorization
+    ...    Test objective: The objective is to read an individual subscription for VNF alarms subscribed by the client without authorization
+    ...    Pre-conditions: The subscription with the given id exists
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    Get individual subscription - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+DELETE an individual subscription - Unauthorized
+    [Documentation]    Test ID: 6.3.4.5.10
+    ...    Test title: DELETE an individual subscription - Unauthorized
+    ...    Test objective: The objective is to test that the deletion of a individual subscription resource without authorization fails.
+    ...    Pre-conditions: one or more subscription already exsist
+    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: the subscription is deleted
+    Delete individual subscription - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+DELETE an individual subscription - Not Found
+    [Documentation]    Test ID: 6.3.4.5.11
+    ...    Test title: DELETE an individual subscription which does not exist
+    ...    Test objective: The objective is to test that the deletion of a individual subscription resource fails when the subscription does not exist.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Delete individual subscription - Not Found
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 *** Keywords ***
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}
@@ -129,6 +165,13 @@ Get individual subscription
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
+Get individual subscription - Unauthorized
+    log    Trying to get information about an individual subscription without authorization
+    Set Headers    {"Accept":"${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}  
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
 Get individual subscription - filter
     Log    Get the list of active individual subscription using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
@@ -168,7 +211,21 @@ DELETE individual subscription
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}    	   
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	      
-	
+DELETE individual subscription - Not Found
+    log    Try to delete an individual subscription which does not exist
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${not_existing_subscriptionId}    	   
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+DELETE individual subscription - Unauthorized
+    log    Try to delete an individual subscription without authorization
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}  
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}    	   
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	 
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}    
     Should Be Equal As Strings    ${response['status']}    ${expected_status}
diff --git a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
index df31134d7744c77ef35b6f5f43ff7ec0bdd29d52..25d372478efdbc34c207b2dc5952e34c7319b56b 100644
--- a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ VNF Fault Alarm Notification
     ...    Test title: VNF Fault Alarm Notification
     ...    Test objective: The objective is to test that VNF Fault Alarm Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ VNF Fault Alarm Cleared Notification
     ...    Test title: VNF Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test that VNF Fault Alarm Cleared Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm cleared notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -37,7 +37,7 @@ VNF Fault Alarm List Rebuilt Notification
     ...    Test title: VNF Fault List Rebuilt Alarm List Rebuilt Notification
     ...    Test objective: The objective is to test that VNF Fault Alarm List Rebuilt Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ Test the Notification Endpoint - Successful
     ...    Test title: Test the Notification Endpoint - Successful
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -59,7 +59,7 @@ PUT Notification endpoint - Method Not Implemented
     ...    Test title: PUT Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PUT method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 7.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -70,7 +70,7 @@ PATCH Notification endpoint - Method Not Implemented
     ...    Test title: PATCH Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PATCH method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 7.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -81,13 +81,48 @@ DELETE Notification endpoint - Method Not Implemented
     ...    Test title: DELETE Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the DELETE method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 7.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     DELETE notification endpoint
     Check HTTP Response Status Code Is    405
 
+VNF Fault Alarm Notification - Unauthorized
+    [Documentation]    Test ID: 6.3.4.8.8
+    ...    Test title: VNF Fault Alarm Notification - Unauthorized
+    ...    Test objective: The objective is to test that VNF Fault Alarm Notification isn't delivered with success to the notification consumer without authorization. 
+    ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post Alarm Notification - Unauthorized
+    Check HTTP Response Status Code Is    401
+
+Test the Notification Endpoint - Unauthorized
+    [Documentation]    Test ID: 6.3.4.8.9
+    ...    Test title: Test the Notification Endpoint - Unauthorized
+    ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer without authorization.
+    ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
+    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get reach the notification endpoint - Unauthorized
+    Check HTTP Response Status Code Is    401
+Test the Notification Endpoint - Not Found
+    [Documentation]    Test ID: 6.3.4.8.10
+    ...    Test title: Test the Notification Endpoint - Not Found
+    ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer when it does not exist.
+    ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
+    ...    Reference: Clause 7.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get reach the notification endpoint - Not Found
+    Check HTTP Response Status Code Is    404
+
 *** Keywords ***
 Check resource existence and get CallbackUri
     Set Headers    {"Accept": "${ACCEPT}"}
@@ -116,6 +151,16 @@ Post Alarm Notification
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
 
+Post Alarm Notification - Unauthorized
+    log    Trying to perform a POST to get notification without authorization
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    ${template} =    Get File    jsons/AlarmNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
 Post Alarm Cleared Notification
     log    Trying to perform a POST to get notification
     Set Headers    {"Accept": "${ACCEPT}"}
@@ -147,6 +192,22 @@ GET reach the notification endpoint
     GET    ${callbackResp}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
+
+GET reach the notification endpoint - Unauthorized
+    Log    Trying to reach the notification endpoint using GET method without authorization.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    GET    ${callbackResp}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
+GET reach the notification endpoint - Not Found
+    Log    Trying to reach the notification endpoint that does not existusing GET method.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${Invalid_callbackResp}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
 PUT notification endpoint  
     Log    Trying to perform a PUT. This method should not be implemented.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
diff --git a/SOL002/VNFFaultManagement-API/Notifications.robot b/SOL002/VNFFaultManagement-API/Notifications.robot
index 6b76a56ef8d8dd30e4c9ed6e4831d5e5effb167b..5a93301a3c440cdc170b25604a14fd88df4cf325 100644
--- a/SOL002/VNFFaultManagement-API/Notifications.robot
+++ b/SOL002/VNFFaultManagement-API/Notifications.robot
@@ -5,6 +5,7 @@ Library    MockServerLibrary
 Library    Process
 Library    OperatingSystem
 Library    Collections
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
 Suite Setup    Create Sessions
 Suite Teardown    Terminate All Processes    kill=true
@@ -15,39 +16,42 @@ VNF Fault Alarm Notification
     ...    Test title: VNF Fault Alarm Notification
     ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Notification when a virtualised resource within an VNF 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 VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the fault of a virtualised resource in the VNF instance (external action) 
-    Check Alarm Notification Http POST Request Body Json Schema Is    alarmNotification
-    Check Alarm Notification Http POST Request Body notificationType attribute Is    alarmNotification
+    Check Alarm Notification Http POST Request Body Json Schema Is    AlarmNotification
+    Check Alarm Notification Http POST Request Body notificationType attribute Is    AlarmNotification
+    Check Alarm Notification validation
 
 VNF Fault Alarm Cleared Notification
     [Documentation]    Test ID: 6.3.4.6.2
     ...    Test title: VNF Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Cleared Notification when a faulty virtualised resource within an VNF 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 VNF instance is instantiated, a virtualised resource is in faulty state, and a subscription for fault alarm cleared notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the clear of a faulty virtualised resource in the VNF instance (external action)
-    Check Alarm cleared Notification Http POST Request Body Json Schema Is    alarmClearedNotification
-    Check Alarm cleared Notification Http POST Request Body notificationType attribute Is    alarmClearedNotification
+    Check Alarm cleared Notification Http POST Request Body Json Schema Is    AlarmClearedNotification
+    Check Alarm cleared Notification Http POST Request Body notificationType attribute Is    AlarmClearedNotification
+    Check Alarm Cleared Notification validation
 
 VNF Fault Alarm List Rebuilt Notification 
     [Documentation]    Test ID: 6.3.4.6.3
     ...    Test title: VNF Fault Alarm List Rebuilt Notification 
     ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm List Rebuilt Notification when the VNFM decides to rebuild the list of its VNF 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 VNF instance is instantiated, one or more virtualised resource are in faulty state, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the VNF fault alarm list rebuild in the NFVO (external action) 
-    Check Alarm list rebuilt Notification Http POST Request Body Json Schema Is    alarmListRebuiltNotification
-    Check Alarm list rebuilt Notification Http POST Request Body notificationType attribute Is    alarmListRebuiltNotification
+    Check Alarm list rebuilt Notification Http POST Request Body Json Schema Is    AlarmListRebuiltNotification
+    Check Alarm list rebuilt Notification Http POST Request Body notificationType attribute Is    AlarmListRebuiltNotification
+    Check Alarm List Rebuilt Notification validation
 
 
 *** Keywords ***
@@ -107,6 +111,71 @@ Check Alarm Clerance Notification Http POST Request Body changeType attribute Is
     Log    do nothing 
     
 
+Check Alarm Notification validation
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}
+    ${last_request}=    Get From List    ${requests}    -1
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    ${alarm}=    Get From Dictionary    ${notification}    alarm
+    Dictionary Should Contain Key    ${alarm}    id
+    Dictionary Should Contain Key    ${alarm}    managedObjectId
+    ${subscriptionId}=    Get From Dictionary    ${notification}    subscriptionId
+    ${alarmId}=    Get From Dictionary    ${alarm}    id
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${subscription_response}=    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    ${subscription_response_object}=    Get From Dictionary    ${subscription_response}    response
+    ${subscription_status}=    Get From Dictionary    ${subscription_response_object}    status
+    Should Be Equal As Integers    ${subscription_status}    200
+    ${alarm_response}=    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
+    ${alarm_response_object}=    Get From Dictionary    ${alarm_response}    response
+    ${alarm_status}=    Get From Dictionary    ${alarm_response_object}    status
+    Should Be Equal As Integers    ${alarm_status}    200
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+    
+Check Alarm Cleared Notification validation
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}
+    ${last_request}=    Get From List    ${requests}    -1
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    ${subscriptionId}=    Get From Dictionary    ${notification}    subscriptionId
+    ${alarmId}=    Get From Dictionary    ${notification}    alarmId
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${subscription_response}=    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    ${subscription_response_object}=    Get From Dictionary    ${subscription_response}    response
+    ${subscription_status}=    Get From Dictionary    ${subscription_response_object}    status
+    Should Be Equal As Integers    ${subscription_status}    200
+    ${alarm_response}=    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
+    ${alarm_response_object}=    Get From Dictionary    ${alarm_response}    response
+    ${alarm_status}=    Get From Dictionary    ${alarm_response_object}    status
+    Should Be Equal As Integers    ${alarm_status}    200
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+    
+Check Alarm List Rebuilt Notification validation
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}
+    ${last_request}=    Get From List    ${requests}    -1
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    ${subscriptionId}=    Get From Dictionary    ${notification}    subscriptionId
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${subscription_response}=    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    ${subscription_response_object}=    Get From Dictionary    ${subscription_response}    response
+    ${subscription_status}=    Get From Dictionary    ${subscription_response_object}    status
+    Should Be Equal As Integers    ${subscription_status}    200
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+    
+    
 Configure Notification Alarm List Rebuilt Handler
     [Arguments]    ${endpoint}    ${type}
     ${json}=    evaluate    {}
@@ -139,7 +208,7 @@ Configure Notification Alarm Cleareance Handler
     Set Global Variable    ${notification_request}    ${req}
     &{notification_response}=  Create Mock Response    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
-  
+
 Configure Notification Forward
     [Arguments]    ${schema}    ${endpoint}    ${endpoint_fwd}    
     Log  Creating mock Http POST forward to handle ${schema}
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 1e382e062e1f3b0dc732eb1128c09aeb2091c6aa..4a3d110a8a1ce9269b796f59394ed0a6df434e5f 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -17,7 +17,7 @@ Create a new subscription
     ...    Test title: Create a new subscription
     ...    Test objective: The objective is to create a new subscription.
     ...    Pre-conditions: no subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: Resource created successfully
@@ -34,7 +34,7 @@ Create a duplicated Subscription
     ...    Test title: Create a duplicated Subscription
     ...    Test objective: The objective is to create a duplicate subscription.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: duplicated subscription is created if the IUT allows duplications, otherwise the duplicated subscription is not created
@@ -58,7 +58,7 @@ GET Subscriptions
     ...    Test title: GET Subscriptions
     ...    Test objective: The objective is to retrieve the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -71,7 +71,7 @@ GET Subscription - Filter
     ...    Test title: GET Subscription - Filter
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -84,7 +84,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
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -97,7 +97,7 @@ GET subscriptions with "all_fields" attribute selector
     ...    Test title: GET subscriptions with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ GET subscriptions with "exclude_default" attribute selector
     ...    Test title: GET subscriptions with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ GET subscriptions with "fields" attribute selector
     ...    Test title: GET subscriptions with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -136,7 +136,7 @@ GET subscriptions with "exclude_fields" attribute selector
     ...    Test title: GET subscriptions with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -149,7 +149,7 @@ PUT subscriptions - Method not implemented
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -161,7 +161,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -173,7 +173,7 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -185,7 +185,7 @@ GET Subscriptions to get Paged Response
     ...    Test title: GET Subscriptions to get Paged Response
     ...    Test objective: The objective is to retrieve the list of active subscriptions to get paged response
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -198,7 +198,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 GET method fail retrieving list of active subscription because Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: none 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -211,7 +211,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.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -225,7 +225,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.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -239,7 +239,7 @@ Get subscriptions with filter "filter.faultyResourceTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.faultyResourceTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.faultyResourceTypes"
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -253,7 +253,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.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -267,7 +267,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.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -281,7 +281,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.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -295,7 +295,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 content type of the message content is supported and the message content of a request contains syntactically correct data but the data cannot be processed.
     ...    re-conditions: none
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -307,7 +307,7 @@ Create a new subscription with permitted authorization scope
     ...    Test title: Create a new subscription with permitted authorization scope
     ...    Test objective: The objective is to create a new subscription with permitted authorization scope.
     ...    Pre-conditions: no subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: Resource created successfully
@@ -323,13 +323,37 @@ Create a new subscription with not permitted authorization scope
     ...    Test title: Create a new subscription with not permitted authorization scope
     ...    Test objective: The objective is to create a new subscription with not permitted authorization scope.
     ...    Pre-conditions: no subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: Resource created successfully
     Post Create subscription with not permitted authorization scope
     Check HTTP Response Status Code Is    403
 
+Create a new subscription - Unauthorized
+    [Documentation]    Test ID: 6.3.4.4.25
+    ...    Test title: Create a new subscription - Unauthorized
+    ...    Test objective: The objective is to create a new subscription without authorization.
+    ...    Pre-conditions: no subscription with the same filter and callbackUri exists
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: Resource created successfully
+    Post Create subscription - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+GET Subscriptions - Unauthorized
+    [Documentation]    Test ID: 6.3.4.4.26
+    ...    Test title: GET Subscriptions - Unauthorized
+    ...    Test objective: The objective is to retrieve the list of active subscriptions without authorization.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    Get subscriptions - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails 
 *** Keywords ***
 Void
     log    do nothing
@@ -356,7 +380,23 @@ Post Create subscription
 	${output}=    Output    response
 	Set Global Variable    ${response}    ${output}
 	Clear Requests    ${callback_endpoint}
-		
+
+Post Create subscription - Unauthorized
+    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions without authorization
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    ${template}=    Get File    jsons/fmSubscriptionRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
+    Log  Creating mock request and response to handle GET operation on notification endpoint
+    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
+    &{notification_response}=  Create Mock Response	status_code=204
+    Log    Issue the subscription request
+    Create Mock Expectation  ${notification_request}  ${notification_response}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    allow_redirects=false
+	${output}=    Output    response
+	Set Global Variable    ${response}    ${output}
+	Clear Requests    ${callback_endpoint}		
 # Post Create subscription - DUPLICATION
     # Log    Trying to create a subscription with an already created content
     # Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test
@@ -389,6 +429,15 @@ Get subscriptions
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
+Get subscriptions - Unauthorized
+    Log    Get the list of active subscriptions without authorization
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
 Get subscriptions - filter
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
diff --git a/SOL002/VNFFaultManagement-API/environment/variables.txt b/SOL002/VNFFaultManagement-API/environment/variables.txt
index 5567f283f91e9781e7999b1f944bd62a106b6ce9..71ef01b4432f7ec936340c27d7dda0baf17b86fc 100644
--- a/SOL002/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL002/VNFFaultManagement-API/environment/variables.txt
@@ -30,7 +30,7 @@ ${origResponse}=    httpresponse
 ${VNFM_ALLOWS_DUPLICATE_SUBS}    0
 
 ${alarmId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
-
+${not_existing_alarmId}     not_existing_alarmId
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 
 ${PerceivedSeverity}    CRITICAL
@@ -39,7 +39,7 @@ ${sub_filter}    filter
 ${sub_filter_invalid}    filter_invalid
 
 ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
-
+${not_existing_subscriptionId}      not_existing_subscriptionId
 ${callback_uri}    http://localhost
 ${callback_port}    9091
 ${callback_endpoint}    /endpoint
@@ -62,4 +62,5 @@ ${probableCause}
 
 ${notification_type}	AlarmNotification
 
-${callbackResp}    localhost
\ No newline at end of file
+${callbackResp}    localhost
+${Invalid_callbackResp}     Invalid_callbackResp
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/ApiVersion.robot b/SOL002/VNFIndicator-API/ApiVersion.robot
index be42d0f93a041093a2aeb55261c4179a7f086a92..76803752894496e378d0d675e6f6cfd670bb13cc 100644
--- a/SOL002/VNFIndicator-API/ApiVersion.robot
+++ b/SOL002/VNFIndicator-API/ApiVersion.robot
@@ -13,7 +13,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -25,7 +25,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -38,7 +38,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -50,7 +50,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -62,7 +62,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -74,7 +74,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -86,7 +86,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -99,7 +99,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -111,7 +111,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -123,7 +123,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index ffcec620c203885e62073833de1cfd820271ff28..31a281568acea8c7ebe59b5970970a365d8afdbf 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -11,7 +11,7 @@ GET Individual VNF Indicator Subscription
     ...    Test title: Get individual subscription to VNF performance indicators
     ...    Test objective: The objective is to test the retrieval of individual VNF performance indicator subscription and perform a JSON schema validation of the returned subscription data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test title: Get individual subscription to VNF performance indicators
     ...    Test objective: The objective is to test that the retrieval of individual VNF performance indicator subscription fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ DELETE Individual VNF Indicator Subscription
     ...    Test title: Delete individual subscription to VNF performance indicators
     ...    Test objective: The objective is to test the deletion of an individual VNF performance indicator subscription.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: The subscription to VNF performance indicators is deleted
@@ -50,7 +50,7 @@ DELETE Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test title: Delete individual subscription to VNF performance indicators
     ...    Test objective: The objective is to test that the deletion of an individual VNF performance indicator subscription fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none   
@@ -63,7 +63,7 @@ PUT Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an individual VNF performance indicator subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ PATCH Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an individual VNF performance indicator subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ POST Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an individual VNF performance indicator subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -98,7 +98,7 @@ GET Individual VNF Indicator Subscription with permitted authorization scope
     ...    Test title: Get individual subscription to VNF performance indicators with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of individual VNF performance indicator subscription and perform a JSON schema validation of the returned subscription data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ GET Individual VNF Indicator Subscription with NOT permitted authorization scope
     ...    Test title: Get individual subscription to VNF performance indicators with NOT permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of individual VNF performance indicator subscription and perform a JSON schema validation of the returned subscription data structure with NOT permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index 45766f5dc115a399331a8f6f4ac7d533860c9a0e..3380c2785ec262c4ecd2cfbadb5e702225d71997 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -10,7 +10,7 @@ Get Individual Indicator for VNF Instance
     ...    Test title: Get individual performance indicator for a VNF instance
     ...    Test objective: The objective is to test the retrieval of a performance indicator for a given VNF instance and perform a JSON schema validation of the returned indicator data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ Get Individual Indicator for VNF Instance with invalid indicator identifier
     ...    Test title: Get individual performance indicator for a VNF instance with invalid indicator identifier
     ...    Test objective: The objective is to test that the retrieval of a performance indicator for a given VNF instance fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ POST Individual VNF Indicator - Method not implemented
     ...    Test title: POST individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new performance indicator for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT Individual VNF Indicator - Method not implemented
     ...    Test title: PUT individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing performance indicator for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH Individual VNF Indicator - Method not implemented
     ...    Test title: PATCH individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an existing performance indicator for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ DELETE Individual VNF Indicator - Method not implemented
     ...    Test title: DELETE individual performance indicator indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing performance indicator for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -86,7 +86,7 @@ Get Individual Performance Indicator
     ...    Test title: Get Individual Performance Indicator 
     ...    Test objective: The objective is to test the retrieval of a performance indicator and perform a JSON schema validation of the returned indicator data structure
     ...    Pre-conditions: At least one measure of performance indicator is available..
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -100,7 +100,7 @@ Get Individual Performance Indicator with invalid indicator identifier
     ...    Test title: Get Individual Performance Indicator with invalid indicator identifier
     ...    Test objective: The objective is to test that the retrieval of a performance indicator fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: At least one measure of performance indicator is available.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ POST Individual Performance Indicator - Method not implemented
     ...    Test title: POST Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new performance indicator.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -125,7 +125,7 @@ PUT Individual Performance Indicator - Method not implemented
     ...    Test title: PUT Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing performance indicator.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -137,7 +137,7 @@ PATCH Individual Performance Indicator - Method not implemented
     ...    Test title: PATCH Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an existing performance indicator.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -149,7 +149,7 @@ DELETE Individual Performance Indicator - Method not implemented
     ...    Test title: DELETE Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing performance indicator.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -160,7 +160,7 @@ Get Individual Indicator for VNF Instance with permitted authorization scope
     ...    Test title: Get individual performance indicator for a VNF instance with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of a performance indicator for a given VNF instance and perform a JSON schema validation of the returned indicator data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -174,7 +174,7 @@ Get Individual Indicator for VNF Instance with NOT permitted authorization scope
     ...    Test title: Get individual performance indicator for a VNF instance with NOT permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of a performance indicator for a given VNF instance and perform a JSON schema validation of the returned indicator data structure with NOT permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
diff --git a/SOL002/VNFIndicator-API/NotificationEndpoint.robot b/SOL002/VNFIndicator-API/NotificationEndpoint.robot
index ff0b1aef9e4607d88dd81803b768d9f01af9a453..290c73f401cbc5c08af6e569baedd8fcdfb0cab8 100644
--- a/SOL002/VNFIndicator-API/NotificationEndpoint.robot
+++ b/SOL002/VNFIndicator-API/NotificationEndpoint.robot
@@ -12,7 +12,7 @@ VNF Indicator Value Change Notification
     ...    Test title: VNF Indicator Value Change Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Indicator Value Change Notification .
     ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNF.
-    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -24,7 +24,7 @@ Supported Indicators Change Notification
     ...    Test title: Supported Indicators Change Notification
     ...    Test objective: The objective is to test that the POST request triggers Supported Indicators Change Notification .
     ...    Pre-conditions: A VNF is instantiated, and a subscription for supported indicators change notifications is available in the VNF.
-    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ Test the Notification Endpoint - Successful
     ...    Test title: Test the Notification Endpoint - Successful
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 8.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ Test the Notification Endpoint - NOT FOUND
     ...    Test title: Test the Notification Endpoint - UNREACHABLE
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 8.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: The notification endpoint is unreachable by the API producer.
     ...    Post-Conditions: none 
@@ -61,7 +61,7 @@ PUT Notification endpoint - Method Not Implemented
     ...    Test title: PUT Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PUT method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 8.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -73,7 +73,7 @@ PATCH Notification endpoint - Method Not Implemented
     ...    Test title: PATCH Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PATCH method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 8.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -85,7 +85,7 @@ DELETE Notification endpoint - Method Not Implemented
     ...    Test title: DELETE Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the DELETE method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 8.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFIndicator-API/Notifications.robot b/SOL002/VNFIndicator-API/Notifications.robot
index abfd3fdbdd0b0cb278e9257b4670f829061b1faf..b29d9091bd513765abb14c11d4fa336a315eb678 100644
--- a/SOL002/VNFIndicator-API/Notifications.robot
+++ b/SOL002/VNFIndicator-API/Notifications.robot
@@ -1,4 +1,4 @@
-*** Setting ***
+*** Settings ***
 Resource	environment/variables.txt
 Suite Setup    Create Sessions
 Suite Teardown    Terminate All Processes    kill=true
@@ -8,6 +8,7 @@ Library    OperatingSystem
 Library    BuiltIn
 Library    Collections
 Library    String
+Library    REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}    ssl_verify=false
 
 
 *** Test Cases ***
@@ -16,26 +17,28 @@ VNF Indicator Value Change Notification
     ...    Test title: VNF Indicator Value Change Notification
     ...    Test objective: The objective is to test the dispatch of VNF Indicator Value Change Notification when new indicator values are available in the VNF, 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 VNF is instantiated, and a subscription for indicator value change notifications is available in the VNF.
-    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNF
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the availability of new indicator value in the VNF (external action) 
     Check Indicator Value Change Notification Http POST Request Body Json Schema Is    VnfIndicatorValueChangeNotification
     Check Indicator Value Change Notification Http POST Request Body notificationType attribute Is    VnfIndicatorValueChangeNotification
+    Check Indicator Value Change Notification validation
 
 Supported Indicators Change Notification
     [Documentation]    Test ID: 6.3.2.6.2
     ...    Test title: Supported Indicators Change Notification
     ...    Test objective: The objective is to test the dispatch of Supported Indicators Change Notification when new indicator values are available in the VNF, 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 VNF is instantiated, and a subscription for supported indicators change notifications is available in the VNF.
-    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNF
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the availability of new indicator value in the VNF (external action) 
     Check Indicator Value Change Notification Http POST Request Body Json Schema Is    SupportedIndicatorsChangeNotification
     Check Indicator Value Change Notification Http POST Request Body notificationType attribute Is    SupportedIndicatorsChangeNotification
+    Check Supported Indicators Change Notification validation
 
 *** Keywords ***
 Trigger the availability of new indicator value in the VNF (external action) 
@@ -76,4 +79,87 @@ Configure Notification Forward
 Create Sessions
     Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
-    Create Mock Session  ${callback_uri}:${callback_port}
\ No newline at end of file
+    Create Mock Session  ${callback_uri}:${callback_port}
+Check Indicator Value Change Notification validation
+    [Arguments]    ${expected_notification_type}=VnfIndicatorValueChangeNotification
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+
+    ${request_type}=    Evaluate    type(${requests})
+    Log    Request type: ${request_type}
+
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    Log    Parsed notification: ${notification}
+
+    Should Be Equal As Strings    ${notification['notificationType']}    ${expected_notification_type}
+
+    ${vnfInstanceId}=    Get From Dictionary    ${notification}    vnfInstanceId
+    ${indicatorId}=    Get From Dictionary    ${notification}    vnfIndicatorId
+    ${subscriptionId}=    Get From Dictionary    ${notification}    subscriptionId
+
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+
+    # Validate Subscription exists
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+
+    # Validate Indicator resource
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
+    Integer    response status    200
+
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
+Check Supported Indicators Change Notification validation
+    [Arguments]    ${expected_notification_type}=SupportedIndicatorsChangeNotification
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+
+    ${request_type}=    Evaluate    type(${requests})
+    Log    Request type: ${request_type}
+
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    Log    Parsed notification: ${notification}
+
+    Should Be Equal As Strings    ${notification['notificationType']}    ${expected_notification_type}
+
+    ${vnfInstanceId}=    Get From Dictionary    ${notification}    vnfInstanceId
+    ${subscriptionId}=    Get From Dictionary    ${notification}    subscriptionId
+
+    Dictionary Should Contain Key    ${notification}    supportedIndicators
+    ${supportedIndicators}=    Get From Dictionary    ${notification}    supportedIndicators
+    Should Not Be Empty    ${supportedIndicators}
+
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+
+    # Validate Subscription exists
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+
+    # Validate VNF Instance indicators list exists
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+    Integer    response status    200
+
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 8059e05206a96c0267006d2a746198893790b2df..6261c5367805d4baf0d0cca33ba3c6b231dbe597 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -17,7 +17,7 @@ GET VNF Indicators Subscriptions
     ...    Test title: GET VNF Indicators Subscriptions
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -30,7 +30,7 @@ GET VNF Indicators Subscriptions with attribute-based filter
     ...    Test title: GET VNF Indicators Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions using attribute-based filter and perform a JSON schema and content validation of the returned subscriptions data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ GET VNF Indicators Subscriptions with invalid attribute-based filter
     ...    Test title: GET VNF Indicators Subscriptions with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of all VNF indicators subscriptions fails when using invalid attribute-based filter. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ GET VNF Indicators Subscriptions with invalid resource endpoint
     ...    Test title: GET VNF Indicators Subscriptions with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all VNF indicators subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: none
@@ -70,7 +70,7 @@ Create new VNF indicator subscription
     ...    Test title: Create new VNF indicator subscription
     ...    Test objective: The objective is to test the creation of a new VNF indicator subscription perform a JSON schema and content validation of the returned subscriptions data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: The VNF indicator subscription is successfully set and it matches the issued subscription
@@ -86,7 +86,7 @@ PUT VNF Indicator Subscriptions - Method not implemented
     ...    Test title: PUT VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicator subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: none
@@ -98,7 +98,7 @@ PATCH VNF Indicator Subscriptions - Method not implemented
     ...    Test title: PATCH VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicator subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Test title: DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicator subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: none
@@ -122,7 +122,7 @@ GET VNF Indicators Subscriptions to get Paged Response
     ...    Test title: GET VNF Indicators Subscriptions to get Paged Response
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions to get Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -135,7 +135,7 @@ GET VNF Indicators Subscriptions - Bad Request Response too Big
     ...    Test title: GET VNF Indicators Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of all VNF indicators subscriptions fails because response is too big. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -148,7 +148,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 content type of the message content is supported and the message content of a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -161,7 +161,7 @@ Create new VNF indicator Subscription - DUPLICATION
     ...    Test title: POST Create a new subscription - DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should support duplication of subscription creation
     ...    Post-Conditions: In response header Location shall not be null
@@ -178,7 +178,7 @@ Create new VNF indicator Subscription - NO-DUPLICATION
     ...    Test title: POST Create a new subscription - NO-DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should not support duplication of subscription creation
     ...    Post-Conditions: In response header Location shall not be null
@@ -193,7 +193,7 @@ GET VNF Indicators Subscriptions with permitted authorization scope
     ...    Test title: GET VNF Indicators Subscriptions with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions and perform a JSON schema validation of the returned subscriptions data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -205,7 +205,7 @@ GET VNF Indicators Subscriptions with NOT permitted authorization scope
     ...    Test title: GET VNF Indicators Subscriptions with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions and perform a JSON schema validation of the returned subscriptions data structure with not permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index ff7f7b3c4b676382934b7b6b5fdb6bd344c0b929..253510a05058cff011eef8b10a0f6d85c1defd6e 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -13,7 +13,7 @@ Get all VNF Indicators
     ...    Test title: Get all VNF Indicators
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators and perform a JSON schema validation of the collected indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ Get VNF Indicators with attribute-based filter
     ...    Test title: Get VNF Indicators with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF indicators 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: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ Get VNF Indicators with invalid attribute-based filter
     ...    Test title: Get VNF Indicators with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ Get all VNF Indicators with malformed authorization token
     ...    Test title: GET all VNF Indicators with malformed authrization token.
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using malformed authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators. The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ Get all VNF Indicators without authorization token
     ...    Test title: GET all VNF Indicators without authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when omitting the authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators. The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ GET all VNF Indicators with expired or revoked authorization token
     ...    Test title: GET all VNF Indicators with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using expired or revoked authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators. The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ Get all VNF Indicators with invalid resource endpoint
     ...    Test title: GET all VNF Indicators with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using invalid resource endpoint
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators. 
     ...    Post-Conditions: none
@@ -105,7 +105,7 @@ POST all VNF Indicators - Method not implemented
     ...    Test title: POST all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF indicators
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -117,7 +117,7 @@ PUT all VNF Indicators - Method not implemented
     ...    Test title: PUT all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicators
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ PATCH all VNF Indicators - Method not implemented
     ...    Test title: PATCH all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicators
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -141,7 +141,7 @@ DELETE all VNF Indicators - Method not implemented
     ...    Test title: DELETE all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicators
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ Get VNF Indicators to get Paged Response
     ...    Test title: Get VNF Indicators to get Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators with Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -166,7 +166,7 @@ Get VNF Indicators - Bad Request Response too Big
     ...    Test title: Get VNF Indicators - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -178,7 +178,7 @@ Get all VNF Indicators with permitted authorization scope
     ...    Test title: Get all VNF Indicators with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators and perform a JSON schema validation of the collected indicators data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -190,7 +190,7 @@ Get all VNF Indicators with not permitted authorization scope
     ...    Test title: Get all VNF Indicators with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators and perform a JSON schema validation of the collected indicators data structure with not permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index f023955557b750e8824222fdeef675a4aedbf65a..1e518b2c920ad37fbf4bd7fcf15d12a55f28b038 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -13,7 +13,7 @@ Get Indicators for VNF Instance
     ...    Test title: Get all performance indicators for a VNF instance
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance and perform a JSON schema validation of the returned indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET Indicators for VNF Instance with attribute-based filter
     ...    Test title: Get all performance indicators for a VNF instance with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance using attribute-based filter and perform a JSON schema validation of the returned indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ Get Indicators for VNF Instance with invalid attribute-based filter
     ...    Test title: Get all performance indicators for a VNF instance with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of all performance indicators for a given VNF instance fails using invalid attribute-based filter. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ Get Indicators for VNF Instance with invalid resource identifier
     ...    Test title: Get all performance indicators for a VNF instance with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of all performance indicators for a given VNF instance fails when using invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ POST Indicators for VNF instance - Method not implemented
     ...    Test title: POST performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new performance indicators for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ PUT Indicators for VNF instance - Method not implemented
     ...    Test title: PUT performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify existing performance indicators for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ PATCH Indicators for VNF instance - Method not implemented
     ...    Test title: PATCH performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update existing performance indicators for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -103,7 +103,7 @@ DELETE Indicators for VNF instance - Method not implemented
     ...    Test title: DELETE performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete performance indicators for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -115,7 +115,7 @@ Get Indicators for VNF Instance to get Paged Response
     ...    Test title: Get Indicators for VNF Instance to get Paged Response
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance to get paged response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ Get Indicators for VNF Instance - Bad Request Response too Big
     ...    Test title: Get Indicators for VNF Instance - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of all performance indicators for a given VNF instance fails when response is too big. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -140,7 +140,7 @@ Get Indicators for VNF Instance with permitted authorization scope
     ...    Test title: Get all performance indicators for a VNF instance with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance and perform a JSON schema validation of the returned indicators data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ Get Indicators for VNF Instance with NOT permitted authorization scope
     ...    Test title: Get all performance indicators for a VNF instance with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance and perform a JSON schema validation of the returned indicators data structure with not permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLCMCoordination-API/ApiVersion.robot b/SOL002/VNFLCMCoordination-API/ApiVersion.robot
index 0c91b10f9ffc5b0c46a500981ee1c5ec1c8c96dc..553f3dd4278c0db5a062eeab9f5f6ebfb4263f59 100644
--- a/SOL002/VNFLCMCoordination-API/ApiVersion.robot
+++ b/SOL002/VNFLCMCoordination-API/ApiVersion.robot
@@ -14,7 +14,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -26,7 +26,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -39,7 +39,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -51,7 +51,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -63,7 +63,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -75,7 +75,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -87,7 +87,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -100,7 +100,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -112,7 +112,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -124,7 +124,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLCMCoordination-API/CancelCoordinationActionTask.robot b/SOL002/VNFLCMCoordination-API/CancelCoordinationActionTask.robot
index d5285cb4306a7a75681ae05fe791426591a226b2..c5c592d7908daedfa2a4b1cd66baac2cf75f4400 100644
--- a/SOL002/VNFLCMCoordination-API/CancelCoordinationActionTask.robot
+++ b/SOL002/VNFLCMCoordination-API/CancelCoordinationActionTask.robot
@@ -15,7 +15,7 @@ POST Cancellation of an Ongoing Individual Coordination Action
     ...    Test title: POST Cancellation of an Ongoing Individual Coordination Action
     ...    Test Objective: The objective is to test that POST request for cancellation of an ongoing individual coordination Action has accepted for processing.
     ...    pre-condition: The status of the related LCM operation occurance is "PROCESSING"
-    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: When there is an Ongoing individual LCM operation coordination action.
     ...    Post-Condition: none
@@ -28,7 +28,7 @@ POST Cancellation of an Ongoing Individual Coordination Action - Conflict
     ...    Test title: POST Cancellation of an Ongoing Individual Coordination Action - Conflict
     ...    Test Objective: The objective is to test that POST request for cancellation of an ongoing individual coordination Action is not successfull due to a conflict with the state of the "Individual coordination action" resource. 
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: Processing of Individual Coordination Action has 'Finished'.
     ...    Post-Condition: none
@@ -41,7 +41,7 @@ Request a cancellation of an ongoing coordination action without authentication
     ...    Test title: Request a cancellation of an ongoing coordination action without authentication
     ...    Test objective: The objective is to test the failure of the request for a cancellation of a coordination task when no authentication is used
     ...    Pre-conditions: none
-    ...    Reference: Clause Clause 10.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause Clause 10.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ GET Cancellation of an Ongoing Individual Coordination Action - Method not Imple
     ...    Test title: GET Cancellation of an Ongoing Individual Coordination Action
     ...    Test Objective: The objective is to test that GET method for cancellation of an ongoing individual coordination Action is not implemented.
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: ongoing individual coordination
     ...    Post-Condition: none
@@ -65,7 +65,7 @@ PUT Cancellation of an Ongoing Individual Coordination Action - Method not Imple
     ...    Test title: PUT Cancellation of an Ongoing Individual Coordination Action
     ...    Test Objective: The objective is to test that PUT method for cancellation of an ongoing individual coordination Action is not implemented.
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none  
     ...    Post-Condition: none
@@ -77,7 +77,7 @@ PATCH Cancellation of an Ongoing Individual Coordination Action - Method not Imp
     ...    Test title: PATCH Cancellation of an Ongoing Individual Coordination Action
     ...    Test Objective: The objective is to test that PATCH method for cancellation of an ongoing individual coordination Action is not implemented.
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none  
     ...    Post-Condition: none
@@ -89,7 +89,7 @@ DELETE Cancellation of an Ongoing Individual Coordination Action - Method not Im
     ...    Test title: DELETE Cancellation of an Ongoing Individual Coordination Action
     ...    Test Objective: The objective is to test that DELETE method for cancellation of an ongoing individual coordination Action is not implemented.
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none  
     ...    Post-Condition: none
@@ -100,7 +100,7 @@ POST Cancellation of an Ongoing Individual Coordination Action with permitted au
     ...    Test title: POST Cancellation of an Ongoing Individual Coordination Action with permitted authorization scope
     ...    Test Objective: The objective is to test that POST request for cancellation of an ongoing individual coordination Action has accepted for processing with permitted authorization scope.
     ...    pre-condition: The status of the related LCM operation occurance is "PROCESSING"
-    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: When there is an Ongoing individual LCM operation coordination action.
     ...    Post-Condition: none
@@ -112,7 +112,7 @@ POST Cancellation of an Ongoing Individual Coordination Action with not permitte
     ...    Test title: POST Cancellation of an Ongoing Individual Coordination Action with not permitted authorization scope
     ...    Test Objective: The objective is to test that POST request for cancellation of an ongoing individual coordination Action has accepted for processing with not permitted authorization scope.
     ...    pre-condition: The status of the related LCM operation occurance is "PROCESSING"
-    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: When there is an Ongoing individual LCM operation coordination action.
     ...    Post-Condition: none
diff --git a/SOL002/VNFLCMCoordination-API/Coordinations.robot b/SOL002/VNFLCMCoordination-API/Coordinations.robot
index d0bb82af4fa382a57c90f96de358dbe8f9362760..321e22c29898851d798db020a60e8b2f7aaaaf25 100644
--- a/SOL002/VNFLCMCoordination-API/Coordinations.robot
+++ b/SOL002/VNFLCMCoordination-API/Coordinations.robot
@@ -15,7 +15,7 @@ POST Coordination of LCM Operation Occurance and API Producer has Chosen the Syn
     ...    Test title: Post Coordination of an LCM operation occurrence
     ...    Test Objective: The objective is to test the creation of new Individual Coordination Action, and perform a JSON schema validation of the returned LCM coordination data structure.
     ...    pre-condition: LCM operation occurrence resource is in Processing state
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: API producer has chosen the synchronous mode   
     ...    Post-Condition: none
@@ -32,7 +32,7 @@ POST Coordination of LCM Operation Occurance and API Producer has Chosen the Asy
     ...    Test title: Post Coordination of an LCM operation occurrence
     ...    Test Objective: The objective is to test that the coordination of a LCM operation occurance request has been accepted for processing, and perform a JSON schema validation of the returned LCM coordination data structure.
     ...    pre-condition: LCM operation occurrence resource is in Processing state
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: API producer has chosen the asynchronous mode   
     ...    Post-Condition: none
@@ -47,7 +47,7 @@ POST Coordination of a LCM Operation Occurance Forbidden
     ...    Test title: Post Coordination of an LCM operation occurrence Forbidden
     ...    Test Objective: The objective is to test the failure of a request for the coordination of an LCM operation occurrence
     ...    pre-condition: The status of the related LCM opeation occurrence is "PROCESSING". The request is performed by a user that has not the grant to run this operation
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none  
     ...    Post-Condition: none
@@ -60,7 +60,7 @@ POST Coordination of LCM Operation Occurance Conflict
     ...    Test title: Post Coordination of an LCM operation occurrence Conflict
     ...    Test Objective: The objective is to verify that no coordination actions can be executed currently, due to a conflict with the state of the "Coordinations" resource.
     ...    pre-condition: The status of the related LCM opeation occurrence is not "PROCESSING"
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: When there are many coordination actions exist, or conflicting ones, are in progress.
     ...    Post-Condition: none
@@ -73,7 +73,7 @@ POST Coordination of LCM Operation Occurance Service Unavailable
     ...    Test title: Post Coordination of an LCM operation occurrence Service Unavailable 
     ...    Test Objective: The objective is to test the request for the coordination of an LCM operation occurrence and the verify that the NFVO cannot perform immediately the request, but can perform it sometime in the future. 
     ...    pre-condition: The status of the related LCM opeation occurrence is "PROCESSING" but API producer cannot perform immediately the request
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: API producer has chosen the synchronous mode
     ...    Post-Condition: none
@@ -87,7 +87,7 @@ POST Coordination of an LCM operation occurrence without authentication
     ...    Test title:  Request a Coordination of an LCM operation occurrence without authentication
     ...    Test objective: The objective is to test the failure of the request for the coordination of an LCM operation occurrence without providing an authentication token
     ...    Pre-conditions: The status of the related LCM opeation occurrence is "PROCESSING"
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -99,7 +99,7 @@ GET Coordination of a LCM Operation Occurance - Method not implemented
     ...    Test title: GET Coordination of a LCM Operation Occurance - Method not implemented
     ...    Test Objective: The objective is to test that GET method for Resource Coordinations is not implemented.
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none  
     ...    Post-Condition: none
@@ -111,7 +111,7 @@ PUT Coordination of a LCM Operation Occurance - Method not implemented
     ...    Test title: PUT Coordination of a LCM Operation Occurance - Method not implemented
     ...    Test Objective: The objective is to test that PUT method for Resource Coordinations is not implemented.
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none  
     ...    Post-Condition: none
@@ -123,7 +123,7 @@ PACTH Coordination of a LCM Operation Occurance - Method not implemented
     ...    Test title: PATCH Coordination of a LCM Operation Occurance - Method not implemented
     ...    Test Objective: The objective is to test that PATCH method for Resource Coordinations is not implemented.
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none  
     ...    Post-Condition: none
@@ -135,7 +135,7 @@ DELETE Coordination of a LCM Operation Occurance - Method not implemented
     ...    Test title: DELETE Coordination of a LCM Operation Occurance - Method not implemented
     ...    Test Objective: The objective is to test that DELETE method for Resource Coordinations is not implemented.
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none  
     ...    Post-Condition: none
@@ -146,7 +146,7 @@ POST Coordination of LCM Operation Occurance and API Producer has Chosen the Syn
     ...    Test title: Post Coordination of an LCM operation occurrence with permitted authorization scope
     ...    Test Objective: The objective is to test the creation of new Individual Coordination Action, and perform a JSON schema validation of the returned LCM coordination data structure with permitted authorization scope.
     ...    pre-condition: LCM operation occurrence resource is in Processing state
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: API producer has chosen the synchronous mode   
     ...    Post-Condition: none
@@ -161,7 +161,7 @@ POST Coordination of LCM Operation Occurance and API Producer has Chosen the Syn
     ...    Test title: Post Coordination of an LCM operation occurrence with not permitted authorization scope
     ...    Test Objective: The objective is to test the creation of new Individual Coordination Action, and perform a JSON schema validation of the returned LCM coordination data structure with not permitted authorization scope.
     ...    pre-condition: LCM operation occurrence resource is in Processing state
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: API producer has chosen the synchronous mode   
     ...    Post-Condition: none
diff --git a/SOL002/VNFLCMCoordination-API/IndividualCoordinationAction.robot b/SOL002/VNFLCMCoordination-API/IndividualCoordinationAction.robot
index adb29508a8461367f60af83cac9b255fee9666f8..889355985debc230c0cda7f650c1caaeac43b72a 100644
--- a/SOL002/VNFLCMCoordination-API/IndividualCoordinationAction.robot
+++ b/SOL002/VNFLCMCoordination-API/IndividualCoordinationAction.robot
@@ -14,7 +14,7 @@ POST Individual LCM Operation Coordination Results - Method not implemented
     ...    Test title: POST Individual LCM Operation Coordination Results - Method not implemented
     ...    Test Objective: The objective is to test that POST method for individual LCM operation coordination results is not implemented.
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none  
     ...    Post-Condition: none
@@ -26,7 +26,7 @@ GET Individual LCM Operation Coordination Results - Coordination is Finished
     ...    Test title: GET Individual LCM Operation Coordination Results
     ...    Test Objective: The objective is to test that coordination is finished and GET method reads individual LCM operation coordination results successfully, and perform a JSON schema validation of the returned LCM coordination data structure.
     ...    pre-condition: LCM operation occurrence resource is in Processing state
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: When the Individual LCM Operation Coordination is finished
     ...    Post-Condition: none
@@ -39,7 +39,7 @@ GET Individual LCM Operation Coordination Results - Coordination is Not Finished
     ...    Test title: GET Individual LCM Operation Coordination Results
     ...    Test Objective: The objective is to test that GET method checks that whether Individual LCM Operation Coordination is still ongoing or in the process of being cancelled.
     ...    pre-condition: LCM operation occurrence resource is in Processing state
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: When the Individual LCM Operation Coordination is still ongoing or in the process of being cancelled.
     ...    Post-Condition: none
@@ -52,7 +52,7 @@ Get Individual LCM Operation Coordination Results without authentication
     ...    Test title:  Get information about a finished coordination task without authentication
     ...    Test objective: The objective is to try to read an individual coordination task without using authentication
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PUT Individual LCM Operation Coordination Results - Method not implemented
     ...    Test title: PUT Individual LCM Operation Coordination Results - Method not implemented
     ...    Test Objective: The objective is to test that PUT method for individual LCM operation coordination results is not implemented.
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none  
     ...    Post-Condition: none
@@ -76,7 +76,7 @@ PATCH Individual LCM Operation Coordination Results - Method not implemented
     ...    Test title: PATCH Individual LCM Operation Coordination Results - Method not implemented
     ...    Test Objective: The objective is to test that PATCH method for individual LCM operation coordination results is not implemented.
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none  
     ...    Post-Condition: none
@@ -88,7 +88,7 @@ DELETE Individual LCM Operation Coordination Results - Method not implemented
     ...    Test title: PUT Individual LCM Operation Coordination Results - Method not implemented
     ...    Test Objective: The objective is to test that DELETE method for individual LCM operation coordination results is not implemented.
     ...    pre-condition: none
-    ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none  
     ...    Post-Condition: none
@@ -99,7 +99,7 @@ GET Individual LCM Operation Coordination Results - Coordination is Finished wit
     ...    Test title: GET Individual LCM Operation Coordination Results - Coordination is Finished with permitted authorization scope
     ...    Test Objective: The objective is to test that coordination is finished and GET method reads individual LCM operation coordination results successfully, and perform a JSON schema validation of the returned LCM coordination data structure with permitted authorization scope.
     ...    pre-condition: LCM operation occurrence resource is in Processing state
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: When the Individual LCM Operation Coordination is finished
     ...    Post-Condition: none
@@ -111,7 +111,7 @@ GET Individual LCM Operation Coordination Results - Coordination is Finished wit
     ...    Test title: GET Individual LCM Operation Coordination Results - Coordination is Finished with not permitted authorization scope
     ...    Test Objective: The objective is to test that coordination is finished and GET method reads individual LCM operation coordination results successfully, and perform a JSON schema validation of the returned LCM coordination data structure with not permitted authorization scope.
     ...    pre-condition: LCM operation occurrence resource is in Processing state
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: When the Individual LCM Operation Coordination is finished
     ...    Post-Condition: none
diff --git a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
index fa6aa2231ea9d470c42a8f687bde48ae4be45aa4..dea0eaab69c1a61101da3b34cb64973f0fa46a66 100644
--- a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
@@ -11,7 +11,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -23,7 +23,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -72,7 +72,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -84,7 +84,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,7 +109,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -121,7 +121,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
index 390b83662c6cc0f348668ed0a4d0b7dbb0694afe..b65810db3804e4bb3de2c89523e9eae2e94bea33 100644
--- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -14,7 +14,7 @@ Post Cancel operation task
     ...    Test title: POST Cancel operation task
     ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
     ...    Pre-conditions: the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: the resource is in FAILED_TEMP state    
@@ -27,7 +27,7 @@ Post Cancel operation task Conflict
     ...    Test title: POST Cancel operation task Conflict
     ...    Test objective: The POST method is NOT cancelling an ongoing VNF lifecycle operation due to the fact that the VNF instance resource is not in STARTING, PROCESSING or ROLLING_BACK state
     ...    Pre-conditions: operation is not in STARTING, PROCESSING or ROLLING_BACK state
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -41,7 +41,7 @@ Post Cancel operation task Not Found
     ...    Test title: POST Cancel operation task
     ...    Test objective: The objective is to test that POST method cannot cancel a VNF lifecycle operation because the resource is not found
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -54,7 +54,7 @@ GET Cancel operation task - Method not implemented
     ...    Test title: GET Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.17.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -66,7 +66,7 @@ PUT Cancel operation task - Method not implemented
     ...    Test title: PUT Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.17.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -78,7 +78,7 @@ PATCH Cancel operation task - Method not implemented
     ...    Test title: PATCH Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.17.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -90,7 +90,7 @@ DELETE Cancel operation task - Method not implemented
     ...    Test title: DELETE Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.17.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -101,7 +101,7 @@ Post Cancel operation task with permitted authorization scope
     ...    Test title: POST Cancel operation task with permitted authorization scope
     ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state with permitted authorization scope
     ...    Pre-conditions: the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: the resource is in FAILED_TEMP state    
@@ -113,7 +113,7 @@ Post Cancel operation task with not permitted authorization scope
     ...    Test title: POST Cancel operation task with not permitted authorization scope
     ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state with not permitted authorization scope
     ...    Pre-conditions: the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: the resource is in FAILED_TEMP state    
@@ -126,7 +126,7 @@ Post Cancel operation task - STARTING
     ...    Test title: POST Cancel operation task
     ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed, i.e. the "VNF LCM operation occurrence" is in "STARTING" state.
     ...    Pre-conditions: the "VNF LCM operation occurrence" is in "STARTING" state.
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: the resource is in ROLLED_BACK state    
@@ -139,7 +139,7 @@ Cancel operation task - Unauthorized
     ...    Test title: Post Cancel operation task - Unauthorized 
     ...    Test objective: The objective is to cancel operation task without authorization
     ...    Pre-conditions: The "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state 
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeCurrentVNFPackageTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeCurrentVNFPackageTask.robot
index 3ab18f78a443003a9bcfa08f334f80f3e5158403..45a54bb809e7aa5fc2c90e6800baba16455f804d 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeCurrentVNFPackageTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeCurrentVNFPackageTask.robot
@@ -13,7 +13,7 @@ POST Change current VNF Package Task
     ...    Test title: POST Change current VNF Package Task
     ...    Test objective: The objective is to test that the POST method changes the current VNF package on which the VNF instance is based.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11a.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11a.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -28,7 +28,7 @@ POST Change current VNF Package Task - Conflict
     ...    Test title: POST Change current VNF Package Task - Conflict
     ...    Test objective: The objective is to test that the POST method cannot change the current VNF package task when another lifecycle management operation is ongoing. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11a.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11a.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: There is another lifecycle management operation ongoing.
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET Change current VNF Package Task - Method not implemented
     ...    Test title: GET Change current VNF Package Task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11a.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11a.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -53,7 +53,7 @@ PUT Change current VNF Package Task - Method not implemented
     ...    Test title: PUT Change current VNF Package Task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11a.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11a.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -65,7 +65,7 @@ PATCH Change current VNF Package Task - Method not implemented
     ...    Test title: PATCH Change current VNF Package Task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11a.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11a.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -77,7 +77,7 @@ DELETE Change current VNF Package Task - Method not implemented
     ...    Test title: DELETE Change current VNF Package Task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11a.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11a.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -88,7 +88,7 @@ POST Change current VNF Package Task with permitted authorization scope
     ...    Test title: POST Change current VNF Package Task with permitted authorization scope
     ...    Test objective: The objective is to test that the POST method changes the current VNF package on which the VNF instance is based with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11a.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11a.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -102,7 +102,7 @@ POST Change current VNF Package Task with not permitted authorization scope
     ...    Test title: POST Change current VNF Package Task with not permitted authorization scope
     ...    Test objective: The objective is to test that the POST method changes the current VNF package on which the VNF instance is based with not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11a.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11a.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -115,7 +115,7 @@ POST Change current VNF Package Task - VNF instance not found
     ...    Test title: POST Change current VNF Package Task - VNF instance not found
     ...    Test objective: The objective is to test that POST method can not trigger a Change current VNF Package Task due to VNF instance not found
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11a.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11a.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ POST Change current VNF Package Task - Unauthorized
     ...    Test title: POST Change current VNF Package Task - Unauthorized
     ...    Test objective: The objective is to test that POST method cannot trigger a  Change current VNF Package Task  without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11a.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11a.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index 03805bb9500575bf8fd3ec5fce185fee33ccfe02..31624ffb2bab4fac63c96e59ace65f5609eecd5b 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -13,7 +13,7 @@ POST Change external VNF connectivity
     ...    Test title: POST Change external VNF connectivity
     ...    Test objective: The objective is to test that POST method triggers a change in VNF external connectivity
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -27,7 +27,7 @@ GET Change external VNF connectivity - Method not implemented
     ...    Test title: GET Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -39,7 +39,7 @@ PUT Change external VNF connectivity - Method not implemented
     ...    Test title: PUT Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -51,7 +51,7 @@ PATCH Change external VNF connectivity - Method not implemented
     ...    Test title: PATCH Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -63,7 +63,7 @@ DELETE Change external VNF connectivity - Method not implemented
     ...    Test title: DELETE Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -75,7 +75,7 @@ POST Change external VNF connectivity Conflict
     ...    Test title: POST Change external VNF connectivity Conflict
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ POST Change external VNF connectivity with permitted authorization scope
     ...    Test title: POST Change external VNF connectivity with permitted authorization value
     ...    Test objective: The objective is to test that POST method triggers a change in VNF external connectivity with the permitted authorization value
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -101,7 +101,7 @@ POST Change external VNF connectivity with not permitted authorization scope
     ...    Test title: POST Change external VNF connectivity with not permitted authorization value
     ...    Test objective: The objective is to test that POST method triggers a change in VNF external connectivity with not permitted authorization value
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -114,7 +114,7 @@ POST Change external VNF connectivity - VNF instance not found
     ...    Test title: POST Change external VNF connectivity - VNF instance not found
     ...    Test objective: The objective is to test that POST method can not trigger a change in VNF external connectivity due to VNF instance not found
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null
@@ -127,7 +127,7 @@ POST Change external VNF connectivity - Unauthorized
     ...    Test title: POST Change external VNF connectivity - Unauthorized
     ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF external connectivity without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index e1b21d630fd15c5086c74813581bc4f178086652..a62c58ad8bcccf137b6f040e1c5ed07d32449ab5 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -13,7 +13,7 @@ POST Change deployment flavour of a vnfInstance
     ...    Test title: POST Change deployment flavour of a vnfInstance
     ...    Test objective: The objective is to test that POST method trigger a change in VNF deployment flavour
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null  
@@ -28,7 +28,7 @@ POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF deployment flavour because of a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -41,7 +41,7 @@ POST Change deployment flavour of a vnfInstance Not Found
     ...    Test title: POST Change deployment flavour of a vnfInstance Not Found
     ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF deployment flavour because the VNF instance resource is not found. 
     ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -54,7 +54,7 @@ GET Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: GET Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -66,7 +66,7 @@ PUT Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: PUT Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -78,7 +78,7 @@ PATCH Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: PATCH Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -90,7 +90,7 @@ DELETE Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: DELETE Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -101,7 +101,7 @@ POST Change deployment flavour of a vnfInstance with permited authorization scop
     ...    Test title: POST Change deployment flavour of a vnfInstance with permited authorization scope
     ...    Test objective: The objective is to test that POST method trigger a change in VNF deployment flavour with permited authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null  
@@ -115,7 +115,7 @@ POST Change deployment flavour of a vnfInstance with not permited authorization
     ...    Test title: POST Change deployment flavour of a vnfInstance with not permited authorization scope
     ...    Test objective: The objective is to test that POST method trigger a change in VNF deployment flavour with not permited authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null  
@@ -129,7 +129,7 @@ POST Change deployment flavour of a vnfInstance - Unauthorized
     ...    Test objective: The objective is to test that POST method trigger a change in VNF deployment flavour without authorization
     ...    Pre-conditions: none
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/CreateVNFSnapshotTask.robot b/SOL002/VNFLifecycleManagement-API/CreateVNFSnapshotTask.robot
index 04b6eefa0bf592c1511d1e9bb2b1650aa55ca91f..2531aa6204f26cb4dd9835ba9c6db8910194a0a6 100644
--- a/SOL002/VNFLifecycleManagement-API/CreateVNFSnapshotTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CreateVNFSnapshotTask.robot
@@ -13,7 +13,7 @@ POST Create VNF Snapshot Task
     ...    Test title: POST Create VNF Snapshot Task
     ...    Test objective: The objective is to test that POST method requests taking a snapshot of a VNF instance.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -28,7 +28,7 @@ POST Create VNF Snapshot Task - NOT FOUND
     ...    Test title: POST Create VNF Snapshot Task - NOT FOUND
     ...    Test objective: The objective is to test that the POST method cannot request for a snapshot if the task is not supported for the VNF instance represented by the parent resource. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: Task is not supported for the VNF instance represented by the parent resource.
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ POST Create VNF Snapshot Task - CONFLICT
     ...    Test title: POST Create VNF Snapshot Task - CONFLICT
     ...    Test objective: The objective is to test that the POST method cannot request for a snapshot when the VNF instance is in NOT_INSTANTIATED state. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: VNF instance is in NOT_INSTANTIATED state.
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ POST Create VNF Snapshot Task - UNPROCESSABLE CONTENT
     ...    Test title: POST Create VNF Snapshot Task - UNPROCESSABLE CONTENT
     ...    Test objective: The objective is to test that the POST method cannot request for a snapshot when the provided identifier of the target "Individual VNF snapshot" resource for the VNF snapshot is invalid. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The identifier of the target "Individual VNF snapshot" resource for the VNF snapshot is invalid.
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ GET Create VNF Snapshot Task - Method not implemented
     ...    Test title: GET Create VNF Snapshot Task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.21.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.21.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -79,7 +79,7 @@ PUT Create VNF Snapshot Task - Method not implemented
     ...    Test title: PUT Create VNF Snapshot Task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.21.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.21.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -91,7 +91,7 @@ PATCH Create VNF Snapshot Task - Method not implemented
     ...    Test title: PATCH Create VNF Snapshot Task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.21.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.21.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -103,7 +103,7 @@ DELETE Create VNF Snapshot Task - Method not implemented
     ...    Test title: DELETE Create VNF Snapshot Task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.21.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.21.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -114,7 +114,7 @@ POST Create VNF Snapshot Task with permitted authorization scope
     ...    Test title: POST Create VNF Snapshot Task with permitted authorization scope
     ...    Test objective: The objective is to test that POST method requests taking a snapshot of a VNF instance with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -128,7 +128,7 @@ POST Create VNF Snapshot Task with not permitted authorization scope
     ...    Test title: POST Create VNF Snapshot Task with not permitted authorization scope
     ...    Test objective: The objective is to test that POST method requests taking a snapshot of a VNF instance with not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none         
@@ -141,7 +141,7 @@ POST Create VNF Snapshot Task - Unauthorized
     ...    Test title: POST Create VNF Snapshot Task - Unauthorized
     ...    Test objective: The objective is to test that POST method requests taking a snapshot of a VNF instance without authorization.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.21.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none         
diff --git a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
index d5d29fa1f4165f876a998507281d7d11de865993..26b37c979c3eee1e4149566e9624eb00763124f9 100644
--- a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -12,7 +12,7 @@ POST Fail operation task
     ...    Test title: POST Fail operation task
     ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation if that operation has experienced a failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -26,7 +26,7 @@ POST Fail operation task Conflict (Not-FAILED_TEMP)
     ...    Test title: POST Fail operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" due to confilct with the state of LCM Operation Occurrence
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none     
@@ -39,7 +39,7 @@ POST Fail operation task Not Found
     ...    Test title: POST Fail operation task Not Found
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation because the operation is not supported
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -52,7 +52,7 @@ GET Fail operation task - Method not implemented
     ...    Test title: GET Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.16.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PUT Fail operation task - Method not implemented
     ...    Test title: PUT Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.16.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -76,7 +76,7 @@ PATCH Fail operation task - Method not implemented
     ...    Test title: PATCH Fail operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.16.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -88,7 +88,7 @@ DELETE Fail operation task - Method not implemented
     ...    Test title: DELETE Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.16.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -99,7 +99,7 @@ POST Fail operation task with permitted authorization scope
     ...    Test title: POST Fail operation task with permitted authorization scope with permitted authorization scope
     ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation if that operation has experienced a failure with permitted authorization scope
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -112,7 +112,7 @@ POST Fail operation task with not permitted authorization scope
     ...    Test title: POST Fail operation task with permitted authorization scope with not permitted authorization scope
     ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation if that operation has experienced a failure with not permitted authorization scope
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -125,7 +125,7 @@ POST Fail operation task - Unauthorized
     ...    Test title: POST Fail operation task - Unauthorized
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation because the operation is unauthorized
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...   Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index 626cb8f40f2c1ab46285a6e19ea24f32b0cbe993..1edaf02c2bb6261b2301c40f3cb0e7f002f03b64 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -13,7 +13,7 @@ POST Heal a vnfInstance
     ...    Test title: POST Heal a vnfInstance
     ...    Test objective: The objective is to test that POST method heal a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Heal a vnfInstance (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ POST Heal a vnfInstance Not Found
     ...    Test title: POST Heal a vnfInstance Not Found
     ...    Test objective: The objective is to test that the operation cannot be executed because the VNF instance resource is not found. 
     ...    Pre-conditions: the VNF instance resource is not existing
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ GET Heal VNFInstance - Method not implemented
     ...    Test title: GET Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ PUT Heal VNFInstance - Method not implemented
     ...    Test title: PUT Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -78,7 +78,7 @@ PATCH Heal VNFInstance - Method not implemented
     ...    Test title: PATCH Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ DELETE Heal VNFInstance - Method not implemented
     ...    Test title: DELETE Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ POST Heal a vnfInstance with permitted authorization scope
     ...    Test title: POST Heal a vnfInstance with permitted authorization scope
     ...    Test objective: The objective is to test that POST method heal a VNF instance with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -115,7 +115,7 @@ POST Heal a vnfInstance with not permitted authorization scope
     ...    Test title: POST Heal a vnfInstance with not permitted authorization scope
     ...    Test objective: The objective is to test that POST method heal a VNF instance with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ POST Heal a vnfInstance - Unauthorized
     ...    Test title: POST Heal a vnfInstance - Unauthorized
     ...    Test objective: The objective is to test that POST method cannot trigger heal  without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
index da4d61f67e90330481d45a29a2faeab5b5a3e8f3..f6caa28e1395288d3dceb89cd4b92a9c8c25a38b 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -11,7 +11,7 @@ POST Individual Subscription - Method not implemented
     ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.19.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -23,7 +23,7 @@ GET Individual Subscription
     ...    Test title: GET Individual Subscription
     ...    Test objective: The objective is to test the Get individual subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title: PUT Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.19.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title: PATCH Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.19.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,7 @@ DELETE an individual subscription
     ...    Test title: DELETE Individual Subscription
     ...    Test objective: The objective is to test that the DELETE method removes an individual subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -71,7 +71,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 Get individual subscription with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -83,7 +83,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 Get individual subscription with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -96,7 +96,7 @@ GET Individual Subscription - Unauthorized
     ...    Test title: GET Individual Subscription - Unauthorized
     ...    Test objective: The objective is to test the retrieval of individual subscription without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,10 +109,34 @@ GET Individual Subscription - Not Found
     ...    Test title: GET Individual Subscription - Not Found
     ...    Test objective: The objective is to test the retrieval of individual subscription fails when subscription is not present
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
     GET Individual Subscription - Not Found
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+DELETE an individual subscription - Unauthorized
+     [Documentation]    Test ID: 6.3.5.18.10
+    ...    Test title: DELETE Individual Subscription - Unauthorized
+    ...    Test objective: The objective is to test that the DELETE method removes an individual subscription without authorization fails
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Delete Individual subscription - Unauthorized
+	Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+DELETE an individual subscription - Not Found
+     [Documentation]    Test ID: 6.3.5.18.11
+    ...    Test title: DELETE Individual Subscription - Not Found
+    ...    Test objective: The objective is to test that the DELETE method fails when the individual subscription is not found
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Delete Individual subscription - Not Found
+    Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index f3ab9a5dff6d8f38a3886e44c433ad1de3302714..8eb301881d08904b8e649543ae684f0d835990eb 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -18,7 +18,7 @@ POST Individual VNFInstance - Method not implemented
     ...    Test title: POST Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -30,7 +30,7 @@ GET Information about an individual VNF Instance
     ...    Test title: GET Information about an individual VNF Instance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ PUT Individual VNFInstance - Method not implemented
     ...    Test title: PUT Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF instance not modified
@@ -57,7 +57,7 @@ PATCH Individual VNFInstance
     ...    Test title: PATCH Individual VNFInstance
     ...    Test objective: This method modifies an individual VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF instance modified
@@ -71,7 +71,7 @@ PATCH Individual VNFInstance Precondition failed
     ...    Test title: PATCH Individual VNFInstance Precondition failed
     ...    Test objective: The objective is to that the modification of individual VNFInstance fails because precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity.
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ PATCH Individual VNFInstance Conflict
     ...    Test title: PATCH Individual VNFInstance Conflict
     ...    Test objective: The objective is to verify that modification operation cannot be executed currently, due to a conflict with the state of the VNF instance resource because another LCM Operation is ongoing. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -97,7 +97,7 @@ DELETE Individual VNFInstance
     ...    Test title: DELETE Individual VNFInstance
     ...    Test objective: The objective is to delete a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF instance deleted
@@ -109,7 +109,7 @@ DELETE Individual VNFInstance Conflict
     ...    Test title: DELETE Individual VNFInstance Conflict
     ...    Test objective: The objective is to verify that The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource.
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -121,7 +121,7 @@ GET Information about an individual VNF Instance with permitted authorization sc
     ...    Test title: GET Information about an individual VNF Instance with permitted authorization scope
     ...    Test objective: The objective is to create a new VNF instance resource with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -135,7 +135,7 @@ GET Information about an individual VNF Instance with permitted authorization sc
     ...    Test title: GET Information about an individual VNF Instance with not permitted authorization scope
     ...    Test objective: The objective is to create a new VNF instance resource with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -147,7 +147,7 @@ Get Information about an individual VNF Instance - Not Found
     ...    Test title: Get Information about an individual VNF Instance - Not Found
     ...    Test objective: The objective is to test that the retrieval of an individual VNF Instance fails when instance is not present.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -160,10 +160,58 @@ Get Information about an individual VNF Instance - Unauthorized
     ...    Test title: Get Information about an individual VNF Instance - Unauthorized 
     ...    Test objective: The objective is to Get Information about an individual VNF Instance without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
     GET individual vnfInstance - Unauthorized
     Check HTTP Response Status Code Is    401
-    Check HTTP Response Body Json Schema Is    ProblemDetails  
\ No newline at end of file
+    Check HTTP Response Body Json Schema Is    ProblemDetails  
+PATCH Individual VNFInstance - Unauthorized
+    [Documentation]    Test ID: 6.3.5.2.13
+    ...    Test title: PATCH Individual VNFInstance - Unauthorized
+    ...    Test objective: This method modifies an individual VNF instance resource without authorization.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH individual vnfInstance - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+DELETE Individual VNFInstance - Unauthorized
+    [Documentation]    Test ID: 6.3.5.2.14
+    ...    Test title: DELETE Individual VNFInstance - Unauthorized
+    ...    Test objective: The objective is to delete a VNF instance without authorization.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    DELETE individual vnfInstance - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+PATCH Individual VNFInstance - Not Found
+    [Documentation]    Test ID: 6.3.5.2.15
+    ...    Test title: PATCH Individual VNFInstance - Not Found
+    ...    Test objective: This method modifies an individual VNF instance resource that does not exist.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH individual vnfInstance - Not Found
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+DELETE Individual VNFInstance - Not Found
+    [Documentation]    Test ID: 6.3.5.2.16
+    ...    Test title: DELETE Individual VNFInstance - Not Found
+    ...    Test objective: The objective is to delete a VNF instance that does not exist.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    DELETE individual vnfInstance - Not Found
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFSnapshot.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFSnapshot.robot
index 0ca6fd3dfd6e3396743da74d092ab56fa9ed14d8..69b440b1d15f3b40dd1c4184ff1ecb68a74944cf 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFSnapshot.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFSnapshot.robot
@@ -8,7 +8,7 @@ POST Individual VNF Snapshot - Method not implemented
     ...    Test title: POST Individual VNF Snapshot - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.24.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.24.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -20,7 +20,7 @@ GET Information about an individual VNF Snapshot - SUCCESSFUL
     ...    Test title: GET Information about an individual VNF Snapshot - SUCCESSFUL
     ...    Test objective: The objective is to GET information about an individual VNF Snapshot
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.24.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.24.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -33,7 +33,7 @@ GET Information about an individual VNF Snapshot - NOT FOUND
     ...    Test title: GET Information about an individual VNF Snapshot - NOT FOUND
     ...    Test objective: The objective is to test that the retrieval of individual VNF Snapshot fails when using an invalid resource identifier.
     ...    Pre-conditions: At least one individual VNF Snapshot is available in the NFV-MANO.
-    ...    Reference: Clause 5.4.24.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.24.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -46,7 +46,7 @@ PUT Individual VNF Snapshot - Method not implemented
     ...    Test title: PUT Individual VNF Snapshot - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.24.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.24.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot not modified
@@ -58,7 +58,7 @@ PATCH Individual VNF Snapshot - Method not implemented
     ...    Test title: PATCH Individual VNF Snapshot - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.24.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.24.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -70,7 +70,7 @@ DELETE Individual VNF Snapshot
     ...    Test title: DELETE Individual VNF Snapshot
     ...    Test objective: The objective is to delete a VNF Snapshot
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.24.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.24.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot deleted
@@ -82,7 +82,7 @@ DELETE Individual VNF Snapshot - Conflict
     ...    Test title: DELETE Individual VNF Snapshot Conflict
     ...    Test objective: The objective is to verify that The operation cannot be executed currently, due to a conflict with the state of the VNF Snapshot resource.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.24.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.24.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: VNF snapshot is in use by some operation such as reverting a VNF instance to a VNF snapshot or creating a VNF snapshot package.
     ...    Post-Conditions: none
@@ -94,7 +94,7 @@ GET Information about an individual VNF Snapshot with permitted authorization sc
     ...    Test title: GET Information about an individual VNF Snapshot with permitted authorization scope - SUCCESSFUL
     ...    Test objective: The objective is to GET information about an individual VNF Snapshot with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.24.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.24.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -106,7 +106,7 @@ GET Information about an individual VNF Snapshot with not permitted authorizatio
     ...    Test title: GET Information about an individual VNF Snapshot with not permitted authorization scope - SUCCESSFUL
     ...    Test objective: The objective is to GET information about an individual VNF Snapshot with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.24.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.24.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -119,10 +119,34 @@ GET Information about an individual VNF Snapshot - Unauthorized
     ...    Test title: GET Information about an individual VNF Snapshot - Unauthorized
     ...    Test objective: The objective is to test that the retrieval of individual VNF Snapshot cannot be executed because the request is not authorized
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.24.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.24.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
     GET Individual VNF Snapshot - Unauthorized
     Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+DELETE Individual VNF Snapshot - Unauthorized
+    [Documentation]    Test ID: 6.3.5.26.11
+    ...    Test title: DELETE Individual VNF Snapshot - Unauthorized
+    ...    Test objective: The objective is to test that the DELETE method fails when the request is not authorized.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.24.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    DELETE individual VNF Snapshot - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+DELETE Individual VNF Snapshot - Not Found
+    [Documentation]    Test ID: 6.3.5.26.12
+    ...    Test title: DELETE Individual VNF Snapshot - Not Found
+    ...    Test objective: The objective is to test that the DELETE method fails when the VNF Snapshot is not found.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.24.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    DELETE individual VNF Snapshot - Not Found
+    Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index 54df23c0b6eebf874a34a5a33976618863fec9e8..27a32c3baf76af0b5b9f03cc6e775cb1453da4af 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -10,7 +10,7 @@ Post Individual VNF LCM OP occurrences - Method not implemented
     ...    Test title: Post Individual VNF LCM OP occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -22,7 +22,7 @@ Get status information about individual VNF instances
     ...    Test title: Get status information about individual VNF instances
     ...    Test objective: The objective is to test that this method retrieve status information about a VNF lifecycle management operation occurrence 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT status information about multiple VNF instances - Method not implemented
     ...    Test title: PUT status information about multiple VNF instances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -48,7 +48,7 @@ PATCH status information about multiple VNF instances - Method not implemented
     ...    Test title: PATCH status information about multiple VNF instances - Method not implemented 
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none      
@@ -60,7 +60,7 @@ DELETE status information about multiple VNF instances - Method not implemented
     ...    Test title: DELETE status information about multiple VNF instances - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -72,7 +72,7 @@ Get status information about individual VNF instances with permitted authorizati
     ...    Test title: Get status information about individual VNF instances with permitted authorization scope
     ...    Test objective: The objective is to test that this method retrieve status information about a VNF lifecycle management operation occurrence with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -86,7 +86,7 @@ Get status information about individual VNF instances with not permitted authori
     ...    Test title: Get status information about individual VNF instances with not permitted authorization scope
     ...    Test objective: The objective is to test that this method retrieve status information about a VNF lifecycle management operation occurrence with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -99,7 +99,7 @@ Get Individual VNF LCM Operation occurrences - Not Found
     ...    Test title: Get status information about individual VNF instances - Not Found
     ...    Test objective: The objective is to test that the retrieval of VNF lifecycle management operation occurrence fails when instance is not present. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -111,7 +111,7 @@ Get Individual VNF LCM Operation occurrences - Unauthorized
     ...    Test title: Get Individual VNF LCM Operation occurrences - Unauthorized
     ...    Test objective: The objective is to test that the retrieval of VNF lifecycle management operation occurrence fails without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 6111c312f1dabc29682f828ed88eaff32ba6ac65..941f65ab203d200405f970cc6bd79e5803c4e44a 100644
--- a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -15,7 +15,7 @@ POST Instantiate a vnfInstance
     ...    Test title: POST Instantiate a vnfInstance
     ...    Test objective: The objective is to instantiate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -29,7 +29,7 @@ POST Instantiate a vnfInstance Conflict
     ...    Test title: POST Instantiate a vnfInstance Conflict
     ...    Test objective: The objective is to verify that the instantiation of the vnf cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ GET Instantiate VNFInstance - Method not implemented
     ...    Test title: GET Instantiate VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.4.3.2  - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.4.3.2  - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ PUT Instantiate VNFInstance - Method not implemented
     ...    Test title: PUT Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ PATCH Instantiate VNFInstance - Method not implemented
     ...    Test title: PATCH Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -78,7 +78,7 @@ DELETE Instantiate VNFInstance - Method not implemented
     ...    Test title: DELETE Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,33 +90,37 @@ POST Instantiate a vnfInstance with TaretScaleLevelId
     ...    Test title: POST Instantiate a vnfInstance with TaretScaleLevelId attribute
     ...    Test objective: The objective is to instantiate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
     POST instantiate individual vnfInstance with TargetScaleLevelId
+    Check HTTP Response Header Contains    Location
+    Check Operation Occurrence Id
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id    
+    
 
 POST Instantiate individual vnfInstance with instantiationLevelId
     [Documentation]    Test ID: 6.3.5.3.8
     ...    Test title: POST Instantiate a vnfInstance with instantiationLevelId attribute
     ...    Test objective: The objective is to instantiate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
     POST instantiate individual vnfInstance with instantiationLevelId
-    Check HTTP Response Status Code Is    202
+    Check HTTP Response Header Contains    Location
     Check Operation Occurrence Id 
+    Check HTTP Response Status Code Is    202
+
 
 POST Instantiate a vnfInstance with permited authorization scope
     [Documentation]    Test ID: 6.3.5.3.9
     ...    Test title: POST Instantiate a vnfInstance with permited authorization scope
     ...    Test objective: The objective is to instantiate a VNF instance using correct OAuth scope value with permited authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -131,7 +135,7 @@ POST Instantiate a vnfInstance with not permited authorization scope
     ...    Test title: POST Instantiate a vnfInstance with non permited authorization scope
     ...    Test objective: The objective is to instantiate a VNF instance using incorrect OAuth scope value with not permited authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -143,7 +147,7 @@ POST Instantiate a vnfInstance with not valid authorization token
     ...    Test title: POST Instantiate a vnfInstance with non permited authorization scope
     ...    Test objective: The objective is to instantiate a VNF instance using incorrect OAuth scope value with not permited authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -156,7 +160,7 @@ POST Instantiate a vnfInstance - Not Found
     ...    Test title: POST Instantiate a vnfInstance - Not Found
     ...    Test objective: The objective is to  Instantiate Individual VNFInstance  when instance is not present.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 5efc67ac59ef0e2ddd78f09ff1d106437dee2843..f90fbf0e96355b920293cdbbd60b1c4a28d413b3 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -14,7 +14,7 @@ VNF LCM Operation Occurrence Notification
     ...    Test title: VNF LCM Operation Occurrence Start Notification
     ...    Test objective:  The objective is to test that VNF LCM Operation Occurrence Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -26,7 +26,7 @@ VNF Identifier Creation Notification
     ...    Test title: VNF Identifier Creation Notification
     ...    Test objective:  The objective is to test that VNF Identifier Creation Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for VNF Identifier Creation Notification is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -38,7 +38,7 @@ VNF Identifier Deletion Notification
     ...    Test title: VNF Identifier Deletion Notification
     ...    Test objective:  The objective is to test that VNF Identifier Deletion Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for VNF Identifier Deletion Notification is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -50,7 +50,7 @@ Test the Notification Endpoint - Successful
     ...    Test title: Test the Notification Endpoint - Successful
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 5.4.20.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.20.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -61,7 +61,7 @@ PUT Notification endpoint - Method Not Implemented
     ...    Test title: PUT Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PUT method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 5.4.20.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.20.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -73,7 +73,7 @@ PATCH Notification endpoint - Method Not Implemented
     ...    Test title: PATCH Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PATCH method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 5.4.20.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.20.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -85,13 +85,50 @@ DELETE Notification endpoint - Method Not Implemented
     ...    Test title: DELETE Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the DELETE method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 5.4.20.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.20.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     DELETE notification endpoint
     Check HTTP Response Status Code Is    405
 
+Test the Notification Endpoint - Unauthorized
+    [Documentation]    Test ID: 6.3.5.21.8
+    ...    Test title: Test the Notification Endpoint - Unauthorized
+    ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer without authorization.
+    ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
+    ...    Reference: Clause 5.4.20.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get reach the notification endpoint - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+Test the Notification Endpoint - Not Found
+    [Documentation]    Test ID: 6.3.5.21.9
+    ...    Test title: Test the Notification Endpoint - Not Found
+    ...    Test objective: The objective is to test the not existing Notification Endpoint provided by the notification consumer.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.20.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get reach the notification endpoint - Not Found
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+VNF LCM Operation Occurrence Notification - Unauthorized
+    [Documentation]    Test ID: 6.3.5.21.10
+    ...    Test title: VNF LCM Operation Occurrence Start Notification - Unauthorized
+    ...    Test objective:  The objective is to test that VNF LCM Operation Occurrence Notification is delivered with success to the notification consumer without authorization.
+    ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF LCM Operation Occurrence Notification - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+
 *** Keywords ***
 Check resource existence and get CallbackUri
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -114,7 +151,17 @@ Post VNF LCM Operation Occurrence Notification
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
-	
+Post VNF LCM Operation Occurrence Notification - Unauthorized
+    log    Trying to perform a POST to get notification without authorization
+    Set Headers  {"Accept":"${ACCEPT}"}
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Version": "${API_VERSION}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    ${template} =    Get File    jsons/VnfLcmOperationOccurrenceNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfInstanceId=${vnfInstanceId}    vnfLcmOpOccId=${vnfLcmOpOccId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}		
 Post VNF Identifier Creation Notification
     log    Trying to perform a POST to get notification
     Set Headers  {"Accept":"${ACCEPT}"}  
diff --git a/SOL002/VNFLifecycleManagement-API/Notifications.robot b/SOL002/VNFLifecycleManagement-API/Notifications.robot
index 05036a2ab36a00ffbac94388d204ff1a000ec9f4..284dde58bc226d53ded06550a0c66c583eea69ce 100644
--- a/SOL002/VNFLifecycleManagement-API/Notifications.robot
+++ b/SOL002/VNFLifecycleManagement-API/Notifications.robot
@@ -6,6 +6,7 @@ Library    MockServerLibrary
 Library    Process
 Library    OperatingSystem
 Library    Collections
+Library    REST    http://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
 *** Test Cases ***
 VNF LCM Operation Occurrence Start Notification
@@ -13,35 +14,35 @@ VNF LCM Operation Occurrence Start Notification
     ...    Test title: VNF LCM Operation Occurrence Start Notification
     ...    Test objective: The objective is to test the dispatch of VNF LCM Operation Occurrence Start Notification when a new VNF LCM operation is started in the VNFM, 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 VNF LCM Operation Occurrence notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger a VNF LCM operation (external action) 
     Check VNF LCM Operation Occurrence Start Notification Http POST Request Body Json Schema Is    VnfLcmOperationOccurrenceNotification
     Check VNF LCM Operation Occurrence Start Notification Http POST Request Body notificationType attribute Is    VnfLcmOperationOccurrenceNotification
-    Check VNF LCM Operation Occurrence Start Notification Http POST Request Body notificationStatus attribute Is    START
+    Check VNF LCM Operation Occurrence Start Notification And LCM State    START
     
 VNF LCM Operation Occurrence Result Notification
     [Documentation]    Test ID: 6.3.5.19.2
     ...    Test title: VNF LCM Operation Occurrence Result Notification
     ...    Test objective: The objective is to test the dispatch of VNF LCM Operation Occurrence Result Notification when a VNF LCM operation is completed in the VNFM, 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: An VNF LCM operation is in progress, and a subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the completion of an VNF LCM operation (external action)
     Check VNF LCM Operation Occurrence Result Notification Http POST Request Body Json Schema Is    VnfLcmOperationOccurrenceNotification
     Check VNF LCM Operation Occurrence Result Notification Http POST Request Body notificationType attribute Is    VnfLcmOperationOccurrenceNotification
-    Check VNF LCM Operation Occurrence Start Notification Http POST Request Body notificationStatus attribute Is    RESULT
+    Check VNF LCM Operation Occurrence Result Notification And LCM State    RESULT
     
 VNF Identifier Creation Notification
     [Documentation]    Test ID: 6.3.5.19.3
     ...    Test title: VNF Identifier Creation Notification
     ...    Test objective: The objective is to test the dispatch of VNF Identifier Creation Notification when a new VNF instance resource is created in the VNFM, 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 VNF identifier creation notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -54,7 +55,7 @@ VNF Identifier Deletion Notification
     ...    Test title: VNF Identifier Deletion Notification
     ...    Test objective: The objective is to test the dispatch of VNF Identifier Deletion Notification when a VNF instance resource is deleted in the VNFM, 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 VNF instance resource is created, and a subscription for VNF identifier creation notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -87,14 +88,11 @@ Check VNF LCM Operation Occurrence Start Notification Http POST Request Body Jso
 Check VNF LCM Operation Occurrence Start Notification Http POST Request Body notificationType attribute Is
     [Arguments]    ${type}
     Configure Notification VNF LCM Operation Occurrence Start Handler    ${callback_endpoint_fwd}    ${type}    START
-    Wait Until Keyword Succeeds     ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${notification_request}
-    Clear Requests    ${callback_endpoint}
-    Clear Requests    ${callback_endpoint_fwd}
-    
+    Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${notification_request}    
 Configure Notification VNF LCM Operation Occurrence Start Handler
     [Arguments]    ${endpoint}    ${type}    ${status}
     ${json}=    evaluate    {}
-    set to dictionary   ${json}    notificationType    ${type}    changeType    ${status}
+    set to dictionary   ${json}    notificationType    ${type}    notificationStatus    ${status}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
@@ -110,14 +108,11 @@ Check VNF LCM Operation Occurrence Result Notification Http POST Request Body Js
 Check VNF LCM Operation Occurrence Result Notification Http POST Request Body notificationType attribute Is
     [Arguments]    ${type}
     Configure Notification VNF LCM Operation Occurrence Result Handler    ${callback_endpoint_fwd}    ${type}    RESULT
-    Wait Until Keyword Succeeds     ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${notification_request}
-    Clear Requests    ${callback_endpoint}
-    Clear Requests    ${callback_endpoint_fwd}
-    
+    Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${notification_request}
 Configure Notification VNF LCM Operation Occurrence Result Handler
     [Arguments]    ${endpoint}    ${type}    ${status}
     ${json}=    evaluate    {}
-    set to dictionary   ${json}    notificationType    ${type}    changeType    ${status}
+    set to dictionary   ${json}    notificationType    ${type}    notificationStatus    ${status}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
     &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
@@ -133,10 +128,7 @@ Check VNF Identifier Creation Notification Http POST Request Body Json Schema Is
 Check VNF Identifier Creation Notification Http POST Request Body notificationType attribute Is
     [Arguments]    ${type}
     Configure Notification VNF Identifier Creation Handler    ${callback_endpoint_fwd}    ${type}
-    Wait Until Keyword Succeeds     ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${notification_request}
-    Clear Requests    ${callback_endpoint}
-    Clear Requests    ${callback_endpoint_fwd}
-
+    Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${notification_request}
 Configure Notification VNF Identifier Creation Handler
     [Arguments]    ${endpoint}    ${type}
     ${json}=    evaluate    {}
@@ -156,7 +148,7 @@ Check VNF Identifier Deletion Notification Http POST Request Body Json Schema Is
 Check VNF Identifier Deletion Notification Http POST Request Body notificationType attribute Is
     [Arguments]    ${type}
     Configure Notification VNF Identifier Deletion Handler    ${callback_endpoint_fwd}    ${type}
-    Wait Until Keyword Succeeds     ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${notification_request}
+    Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${notification_request}
     Clear Requests    ${callback_endpoint}
     Clear Requests    ${callback_endpoint_fwd}
 
@@ -193,3 +185,124 @@ Create Sessions
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
 
+Check VNF LCM Operation Occurrence Start Notification And LCM State
+    [Arguments]    ${expected_status}
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+
+    ${request_type}=    Evaluate    type(${requests})
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    Should Not Be Empty    ${notification}
+    # Validate notification content
+    Dictionary Should Contain Key    ${notification}    notificationType
+    Dictionary Should Contain Key    ${notification}    notificationStatus
+    Dictionary Should Contain Key    ${notification}    vnfInstanceId
+    Dictionary Should Contain Key    ${notification}    vnfLcmOpOccId
+
+    Should Be Equal As Strings
+    ...    ${notification['notificationType']}
+    ...    VnfLcmOperationOccurrenceNotification
+
+    Should Be Equal As Strings
+    ...    ${notification['notificationStatus']}
+    ...    ${expected_status}
+
+    ${vnfInstanceId}=    Get From Dictionary    ${notification}    vnfInstanceId
+    ${vnfLcmOpOccId}=    Get From Dictionary    ${notification}    vnfLcmOpOccId
+
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+
+    # Validate VNF Instance
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
+    Integer    response status    200
+
+    # Validate LCM operation occurrence
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Integer    response status    200
+
+    ${response_body}=    Output    response body
+
+    ${lcm_state}=    Get From Dictionary    ${response_body}    operationState
+    ${returned_id}=    Get From Dictionary    ${response_body}    id
+
+    Should Be Equal As Strings    ${returned_id}    ${vnfLcmOpOccId}
+
+    @{allowed_states}=    Create List    STARTING    PROCESSING
+
+    List Should Contain Value
+    ...    ${allowed_states}
+    ...    ${lcm_state}
+Check VNF LCM Operation Occurrence Result Notification And LCM State
+    [Arguments]    ${expected_status}
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+    
+    ${request_type}=    Evaluate    type(${requests})
+    Log    Request type: ${request_type}
+    
+    # Handle both single request and list of requests
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+
+    # 2. Content Validation of Notification
+    Dictionary Should Contain Key    ${notification}    notificationType
+    Dictionary Should Contain Key    ${notification}    notificationStatus
+    Dictionary Should Contain Key    ${notification}    vnfInstanceId
+    Dictionary Should Contain Key    ${notification}    vnfLcmOpOccId
+
+    Should Be Equal As Strings    ${notification['notificationType']}      VnfLcmOperationOccurrenceNotification
+    Should Be Equal As Strings    ${notification['notificationStatus']}    ${expected_status}
+    ...    msg=Expected notificationStatus=RESULT but got ${notification['notificationStatus']}
+
+    ${vnfInstanceId}=    Get From Dictionary    ${notification}    vnfInstanceId
+    ${vnfLcmOpOccId}=    Get From Dictionary    ${notification}    vnfLcmOpOccId
+
+    #  Post-condition Verification
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+
+    # Validate VNF Instance
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
+    Integer    response status    200
+    Log    VNF Instance ${vnfInstanceId} validated successfully
+
+    # Validate LCM Operation Occurrence
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
+    Integer    response status    200
+
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
+    ${lcm_state}=   Get From Dictionary    ${response['body']}    operationState
+
+    # ID Consistency Check
+    ${returned_id}=    Get From Dictionary    ${response['body']}    id
+    Should Be Equal As Strings    ${returned_id}    ${vnfLcmOpOccId}
+    ...    msg=ID mismatch! LCM Op Occ ID in notification (${vnfLcmOpOccId}) does not match resource ID (${returned_id})
+
+    Log    LCM operationState = ${lcm_state}
+
+    # Allowed states for RESULT notification
+    @{allowed_states}=    Create List    COMPLETED    FAILED    FAILED_TEMP    ROLLING_BACK    ROLLED_BACK
+    List Should Contain Value    ${allowed_states}    ${lcm_state}
+    ...    msg=Unexpected operationState '${lcm_state}' after RESULT notification
+
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
index eadf25edbdfe3d3f4f9be29d49ce7184a8e8a295..288df7fc0b758a0b1229eee24f62239c11a36ad8 100644
--- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -13,7 +13,7 @@ POST Operate a vnfInstance
     ...    Test title: POST Operate a vnfInstance
     ...    Test objective: The objective is to test that POST method operate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: the VNF instance resource is in NOT_INSTANTIATED state
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ POST Operate a vnfInstance Not Found
     ...    Test title: POST Operate a vnfInstance Not Found
     ...    Test objective: The objective is to test that the operation cannot be executed currently, because the resource is not existing
     ...    Pre-conditions: the VNF instance resource is in  not existing
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ GET Operate VNFInstance - Method not implemented
     ...    Test title: GET Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.10.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ PUT Operate VNFInstance - Method not implemented
     ...    Test title: PUT Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.10.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -78,7 +78,7 @@ PATCH Operate VNFInstance - Method not implemented
     ...    Test title: PATCH Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.10.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ DELETE Operate VNFInstance - Method not implemented
     ...    Test title: DELETE Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.10.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ POST Operate a vnfInstance with permitted authorization scope
     ...    Test title: POST Operate a vnfInstance with permitted authorization scope
     ...    Test objective: The objective is to test that POST method operate a VNF instance with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -115,7 +115,7 @@ POST Operate a vnfInstance with not permitted authorization scope
     ...    Test title: POST Operate a vnfInstance with not permitted authorization scope
     ...    Test objective: The objective is to test that POST method operate a VNF instance with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ POST Operate a vnfInstance - Unauthorized
     ...    Test title: POST Operate a vnfInstance - Unauthorized
     ...    Test objective: The objective is to test that POST method cannot trigger operate  without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
index 28768db4a51128d2b5620941a663296782efddb4..1ca8e99240ad423b41796e6f35bf5ea5b24df3de 100644
--- a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -14,7 +14,7 @@ POST Retry operation task
     ...    Test title: POST Retry operation task
     ...    Test objective: The objective is to test that the POST method initiates retrying a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -27,7 +27,7 @@ POST Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Test title: POST Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that the retry operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. (i.e. the VNF instance resource is not in FAILED_TEMP state)
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -40,7 +40,7 @@ POST Retry operation task Not Found
     ...    Test title: POST Retry operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -53,7 +53,7 @@ GET Retry operation task - Method not implemented
     ...    Test title: GET Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.14.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PUT Retry operation task - Method not implemented
     ...    Test title: PUT Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.14.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ PATCH Retry operation task - Method not implemented
     ...    Test title: PATCH Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.14.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ DELETE Retry operation task - Method not implemented
     ...    Test title: DELETE Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.14.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -100,7 +100,7 @@ POST Retry operation task with permitted authorization scope
     ...    Test title: POST Retry operation task with permitted authorization scope
     ...    Test objective: The objective is to test that the POST method initiates retrying a VNF lifecycle operation if that operation has experienced a temporary failure with permitted authorization scope
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -112,7 +112,7 @@ POST Retry operation task with not permitted authorization scope
     ...    Test title: POST Retry operation task with not permitted authorization scope
     ...    Test objective: The objective is to test that the POST method initiates retrying a VNF lifecycle operation if that operation has experienced a temporary failure with not permitted authorization scope
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -125,7 +125,7 @@ POST Retry operation task - Unauthorized
     ...    Test title: POST Retry operation task - Unauthorized
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the request is not authorized    
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/RevertToVNFSnapshotTask.robot b/SOL002/VNFLifecycleManagement-API/RevertToVNFSnapshotTask.robot
index 8f6203011475d6fa720d2fcdf851aaf1a8dcf61b..903e7ff985d464d887cc41988a28caa9d6084940 100644
--- a/SOL002/VNFLifecycleManagement-API/RevertToVNFSnapshotTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RevertToVNFSnapshotTask.robot
@@ -13,7 +13,7 @@ POST Revert to VNF Snapshot Task
     ...    Test title: POST Revert to VNF Snapshot Task
     ...    Test objective: The objective is to test that POST method requests reverting a VNF/VNFC instance to a VNF/VNFC snapshot.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.22.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.22.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -28,7 +28,7 @@ POST Revert to VNF Snapshot Task - NOT FOUND
     ...    Test title: POST Revert to VNF Snapshot Task - NOT FOUND
     ...    Test objective: The objective is to test that the POST method cannot request reverting to a snapshot if the task is not supported for the VNF instance represented by the parent resource. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.22.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.22.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: Task is not supported for the VNF instance represented by the parent resource.
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ POST Revert to VNF Snapshot Task - CONFLICT
     ...    Test title: POST Revert to VNF Snapshot Task - CONFLICT
     ...    Test objective: The objective is to test that the POST method cannot request reverting to a snapshot when the VNF instance is in NOT_INSTANTIATED state. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.22.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.22.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: VNF instance is in NOT_INSTANTIATED state.
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ GET Revert to VNF Snapshot Task - Method not implemented
     ...    Test title: GET Revert to VNF Snapshot Task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.22.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.22.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -66,7 +66,7 @@ PUT Revert to VNF Snapshot Task - Method not implemented
     ...    Test title: PUT Revert to VNF Snapshot Task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.22.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.22.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -78,7 +78,7 @@ PATCH Revert to VNF Snapshot Task - Method not implemented
     ...    Test title: PATCH Revert to VNF Snapshot Task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.22.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.22.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -90,7 +90,7 @@ DELETE Revert to VNF Snapshot Task - Method not implemented
     ...    Test title: DELETE Revert to sVNF Snapshot Task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.22.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.22.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -101,7 +101,7 @@ POST Revert to VNF Snapshot Task with permitted authorization scope
     ...    Test title: POST Revert to VNF Snapshot Task with permitted authorization scope.
     ...    Test objective: The objective is to test that POST method requests reverting a VNF/VNFC instance to a VNF/VNFC snapshot with permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.22.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.22.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -115,7 +115,7 @@ POST Revert to VNF Snapshot Task with not permitted authorization scope
     ...    Test title: POST Revert to VNF Snapshot Task with not permitted authorization scope.
     ...    Test objective: The objective is to test that POST method requests reverting a VNF/VNFC instance to a VNF/VNFC snapshot with not permitted authorization scope.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.22.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.22.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -128,7 +128,7 @@ POST Revert to VNF Snapshot Task - Unauthorized
     ...    Test title: POST Revert to VNF Snapshot Task - Unauthorized
     ...    Test objective: The objective is to test that POST method requests reverting a VNF/VNFC instance to a VNF/VNFC snapshot without authorization.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.22.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.22.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
diff --git a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 074d5a7de805872af5bfee6b33be6649e427e97b..4264229453cce9af878f72cd55f6189938d313a1 100644
--- a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -14,7 +14,7 @@ POST Rollback operation task
     ...    Test title: POST Rollback operation task
     ...    Test objective: The objective is to test that POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -27,7 +27,7 @@ POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Test title: POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -40,7 +40,7 @@ POST Rollback operation task Not Found
     ...    Test title: POST Rollback operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -53,7 +53,7 @@ GET Rollback operation task - Method not implemented
     ...    Test title: GET Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.15.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -65,7 +65,7 @@ PUT Rollback operation task - Method not implemented
     ...    Test title: PUT Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.15.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -77,7 +77,7 @@ PATCH Rollback operation task - Method not implemented
     ...    Test title: PATCH Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.15.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ DELETE Rollback operation task - Method not implemented
     ...    Test title: DELETE Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.15.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -100,7 +100,7 @@ POST Rollback operation task with permitted authorization value
     ...    Test title: POST Rollback operation task with permitted authorization value.
     ...    Test objective: The objective is to test that POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure with permitted authorization scope
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -112,7 +112,7 @@ POST Rollback operation task with not permitted authorization value
     ...    Test title: POST Rollback operation task with not permitted authorization value.
     ...    Test objective: The objective is to test that POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure with not permitted authorization scope
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -125,7 +125,7 @@ POST Rollback operation task - Unauthorized
     ...    Test title: POST Rollback operation task - Unauthorized
     ...    Test objective: The objective is to test that the rollback operation cannot be executed because the request is not authorized
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 7607041e25905e73ceb98d1ced7fd2c5566536e8..9a346c09186e29535a24927944fa1d2e4e6e36fb 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -13,7 +13,7 @@ POST Scale a vnfInstance
     ...    Test title: POST Scale a vnfInstance
     ...    Test objective: The objective is to scale a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ POST Scale a vnfInstance Not Found
     ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: none 
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ GET Scale VNFInstance - Method not implemented
     ...    Test title: GET Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions: none  
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PUT Scale VNFInstance - Method not implemented
     ...    Test title: PUT Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ PATCH Scale VNFInstance - Method not implemented
     ...    Test title: PATCH Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ DELETE Scale VNFInstance - Method not implemented
     ...    Test title: DELETE Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ POST Scale a vnfInstance with permited authorization scope
     ...    Test title: POST Scale a vnfInstance with permited authorization scope
     ...    Test objective: The objective is to scale a VNF instance with permited authorization scope with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ POST Scale a vnfInstance with not permited authorization scope
     ...    Test title: POST Scale a vnfInstance with not permited authorization scope
     ...    Test objective: The objective is to scale a VNF instance with not permited authorization scope with not permited authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ POST Scale a vnfInstance - Unauthorized
     ...    Test title: Post Scale a vnfInstance - Unauthorized 
     ...    Test objective: The objective is to scale a VNF instance without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 0939c4baa1509fec82b300a5103a5e46e1c82299..a6015c1cd1af10913e653158553f8a9256ea33c7 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -12,7 +12,7 @@ POST Scale a vnfInstance to level with Attribute instantiationLevelId
     ...    Test title: POST Scale a vnfInstance to level with instantiationLevelId attribute
     ...    Test objective: The objective is to scale a VNF instance to a target level.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Test title: POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ POST Scale a vnfInstance Not Found
     ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the VNF Scale operation fails when the VNF instance resource is not present
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none 
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ GET Scale to level VNFInstance - Method not implemented
     ...    Test title: GET Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PUT Scale to level VNFInstance - Method not implemented
     ...    Test title: PUT Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ PATCH Scale to level VNFInstance - Method not implemented
     ...    Test title: PATCH Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ DELETE Scale to level VNFInstance - Method not implemented
     ...    Test title: DELETE Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ POST Scale a vnfInstance to level with Attribute instantiationLevelId and permit
     ...    Test title: POST Scale a vnfInstance to level with instantiationLevelId attribute and permitted authorization scope
     ...    Test objective: The objective is to scale a VNF instance to a target level using OAuth token with permitted scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ POST Scale a vnfInstance to level with Attribute instantiationLevelId and not pe
     ...    Test title: POST Scale a vnfInstance to level with instantiationLevelId attribute and not permitted authorization scope
     ...    Test objective: The objective is to scale a VNF instance to a target level using OAuth token with not permitted scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,13 +129,26 @@ POST Scale a vnfInstance to level with Attribute instantiationLevelId - Unauthor
     ...    Test title: POST Scale a vnfInstance to level with Attribute instantiationLevelId - Unauthorized
     ...    Test objective: The objective is to scale a VNF instance to a target level using without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
     POST Scale a vnfInstance to level with Attribute instantiationLevelId - Unauthorized
     Check HTTP Response Status Code Is    401
     Check HTTP Response Body Json Schema Is    ProblemDetails 
+POST Scale a vnfInstance to level with attribute powerProfileId
+    [Documentation]    Test ID: 6.3.5.5.11
+    ...    Test title: POST Scale a vnfInstance to level with powerProfileId attribute
+    ...    Test objective: The objective is to scale a VNF instance to a target level.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST Scale vnfInstance to level with attribute powerProfileId   
+    Check HTTP Response Status Code Is    202
+    Check HTTP Response Header Contains    Location
+    Check Operation Occurrence Resource Available
 *** Keywords ***
 Check resource existence
     Set Headers    {"Accept":"${ACCEPT}"}
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index cad7891c5ae7bce267cdb7f749149478d9bd0a9a..067022b3e1e9f590759aa2b57d537039ae432a9d 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -15,7 +15,7 @@ POST Create a new subscription
     ...    Test title: POST Create a new subscription
     ...    Test objective: The POST method creates a new subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null
@@ -29,7 +29,7 @@ POST Create a new Subscription - DUPLICATION
     ...    Test title: POST Create a new subscription - DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should support duplication of subscription creation
     ...    Post-Conditions: in response header Location shall not be null
@@ -44,7 +44,7 @@ POST Create a new Subscription - NO-DUPLICATION
     ...    Test title: POST Create a new subscription - NO-DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should not support duplication of subscription creation
     ...    Post-Conditions: in response header Location shall not be null
@@ -60,7 +60,7 @@ GET Subscriptions
     ...    Test title: GET Subscriptions
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -73,7 +73,7 @@ GET Subscription - Filter
     ...    Test title: GET Subscriptions - Filter
     ...    Test objective: The objective is Get the list of active subscriptions using a "filter"
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -86,7 +86,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 Get the list of active subscriptions using a filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -99,7 +99,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions with all_fields attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -112,7 +112,7 @@ GET subscriptions with exclude_default attribute selector
     ...    Test title: GET subscriptions with exclude_default attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -125,7 +125,7 @@ GET subscriptions with fields attribute selector
     ...    Test title: GET subscriptions with fields attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -138,7 +138,7 @@ GET subscriptions with exclude_fields attribute selector
     ...    Test title: GET subscriptions with exclude_fields attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -151,7 +151,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 implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -163,7 +163,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 implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -175,7 +175,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 implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: check that resources are not deleted
@@ -188,7 +188,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 content type of the message content is supported and the message content of a request contains syntactically correct data but the data cannot be processed.
     ...    re-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -201,7 +201,7 @@ GET information about multiple subscriptions to get Paged Response
     ...    Test title: GET information about multiple subscriptions to get Paged Response
     ...    Test objective: The objective is to retrieve information about the subscriptions to get paged response
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions:  
@@ -214,7 +214,7 @@ GET information about multiple subscriptions for Bad Request Response too big
     ...    Test title: GET information about multiple subscriptions for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about subscriptions when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -226,7 +226,7 @@ POST Create a new subscription with permitted authorization scope
     ...    Test title: POST Create a new subscription with permitted authorization scope
     ...    Test objective: The POST method creates a new subscription with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null
@@ -240,7 +240,7 @@ POST Create a new subscription with not permitted authorization scope
     ...    Test title: POST Create a new subscription with not permitted authorization scope
     ...    Test objective: The POST method creates a new subscription with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null
@@ -253,7 +253,7 @@ POST Create a new subscription - Unauthorized
     ...    Test title: POST Create a new subscription - Unauthorized
     ...    Test objective: The POST method creates a new subscription without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null
@@ -261,4 +261,15 @@ POST Create a new subscription - Unauthorized
     Check HTTP Response Status Code Is    401
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-
+GET Subscriptions - Unauthorized
+     [Documentation]    Test ID: 6.3.5.17.20
+    ...    Test title: GET Subscriptions - Unauthorized
+    ...    Test objective: The objective is to Get the list of active subscriptions without authorization
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get subscriptions - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 56cd751fee8ae79fd3d3d2a857212563728c274f..12ce3660a7e126d28b39bd074ed2a9429257ddd5 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -13,7 +13,7 @@ POST Terminate a vnfInstance
     ...    Test title: POST Terminate a vnfInstance
     ...    Test objective: The objective is to test that POST method terminate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set.  
     ...    Pre-conditions:  VNF instance resource is in NOT_INSTANTIATED state
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET Terminate VNFInstance - Method not implemented
     ...    Test title:  GET Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ PUT Terminate VNFInstance - Method not implemented
     ...    Test title:  PUT Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.8.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PATCH Terminate VNFInstance - Method not implemented
     ...    Test title:  PATCH Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.8.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ DELETE Terminate VNFInstance - Method not implemented
     ...    Test title:  DELETE Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ POST Terminate a vnfInstance with permited authorization scope
     ...    Test title: POST Terminate a vnfInstance with permited authorization scope
     ...    Test objective: The objective is to test that POST method terminate a VNF instance with permited authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -102,7 +102,7 @@ POST Terminate a vnfInstance with not permited authorization scope
     ...    Test title: POST Terminate a vnfInstance with not permited authorization scope
     ...    Test objective: The objective is to test that POST method terminate a VNF instance with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -115,7 +115,7 @@ POST Terminate a vnfInstance Not Found
     ...    Test title: POST Terminate a vnfInstance  Not Found
     ...    Test objective: The objective is to test that POST method cannot trigger terminate  because the VNF instance resource is not found. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -128,7 +128,7 @@ POST Terminate a vnfInstance - Unauthorized
     ...    Test title: POST Terminate a vnfInstance - Unauthorized
     ...    Test objective: The objective is to test that POST method cannot trigger terminate  without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
index 3b51a645185d1bd35344e12b4d1d81ad8061e808..34d8d5ff0b48e77a0831de3313190e04ff5ebfb2 100644
--- a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
@@ -12,7 +12,7 @@ POST Create a new vnfInstance
     ...    Test title: POST Create a new vnfInstance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF instance created
@@ -28,7 +28,7 @@ GET information about multiple VNF instances
     ...    Test title: GET information about multiple VNF instances
     ...    Test objective: The objective is to get information about multiples VNF instances
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ GET information about multiple VNF instances Bad Request Invalid attribute-based
     ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get information about multiples VNF instances with Invalid attribute-based filtering parameters
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ GET information about multiple VNF instances Bad Request Invalid attribute selec
     ...    Test title: GET information about multiple VNF instances Bad Request Invalid attribute selector
     ...    Test objective: The objective is to get information about multiples VNF instances with Invalid attribute-based filtering parameters
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ GET information about multiple VNF instances with "all_fields" attribute selecto
     ...    Test title: GET information about multiple VNF instances with "all_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -81,7 +81,7 @@ GET information about multiple VNF instances with "exclude_default" attribute se
     ...    Test title: GET information about multiple VNF instances with "exclude_default" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -94,7 +94,7 @@ GET information about multiple VNF instances with "fields" attribute selector
     ...    Test title: GET information about multiple VNF instances with "fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -107,7 +107,7 @@ GET information about multiple VNF instances with "exclude_fields" attribute sel
     ...    Test title: GET information about multiple VNF instances with "exclude_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -120,7 +120,7 @@ PUT VNFInstances - Method not implemented
     ...    Test title: PUT VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -132,7 +132,7 @@ PATCH VNFInstances - Method not implemented
     ...    Test title: PATCH VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 5.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -144,7 +144,7 @@ DELETE VNFInstances - Method not implemented
     ...    Test title: DELETE VNFInstances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 5.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF instance not deleted
@@ -156,7 +156,7 @@ GET information about multiple VNF instances with "exclude_default" and "fields"
     ...    Test title: GET information about multiple VNF instances with "exclude_default" and "fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -169,7 +169,7 @@ POST Create a new vnfInstance - UNPROCESSABLE CONTENT
     ...    Test title: POST Create a new vnfInstance - UNPROCESSABLE CONTENT
     ...    Test objective: The objective is to test that a new VNF instance resource is not created when 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: vnfdId of the referenced VNF package is not in ENABLED state or does not exist.
     ...    Post-Conditions: VNF instance created
@@ -181,7 +181,7 @@ POST Create a new vnfInstance with permitted authorization scope
     ...    Test title: POST Create a new vnfInstance with permitted authorization scope
     ...    Test objective: The objective is to create a new VNF instance resource with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF instance created
@@ -196,7 +196,7 @@ POST Create a new vnfInstance with not permitted authorization scope
     ...    Test title: POST Create a new vnfInstance with not permitted authorization scope
     ...    Test objective: The objective is to create a new VNF instance resource with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF instance created
@@ -208,7 +208,7 @@ GET information about multiple VNF instances - Bad Request Response too big
     ...    Test title: GET information about multiple VNF instances - Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving information about multiple VNF instances because Response is too big.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -221,7 +221,7 @@ GET information about multiple VNF instances to get Paged Response
     ...    Test title: GET information about multiple VNF instances to get Paged Response
     ...    Test objective: The objective is to query information about multiple VNF instances to get Paged Response.
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports response paging for the subscriptions resources
     ...    Post-Conditions: none
@@ -234,7 +234,7 @@ GET information about multiple VNF instances as a Paged Response with nextpage_o
     ...    Test title: GET information about multiple VNF instances as a Paged Response with nextpage_opauque_marker parameter 
     ...    Test objective: The objective is to query information about multiple VNF instances as a Paged Response and retrieve the next page using the nextpage_opaque_marker parameter
     ...    Pre-conditions: A request for retrieving multiple VNF instances as a paged response has been successfully issued (Test ID 6.3.5.2.17)
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports response paging for the VNF instance resources
     ...    Post-Conditions: none 
@@ -246,10 +246,22 @@ POST Create a new vnfInstance - Unauthorized
     ...    Test title: POST Create a new vnfInstance - Unauthorized 
     ...    Test objective: The objective is to Create a new vnfInstance without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
     POST Create a new vnfInstance - Unauthorized
     Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+GET information about multiple VNF instances  
+    [Documentation]    Test ID: 6.3.5.1.19
+    ...    Test title: GET information about multiple VNF instances - Unauthorized
+    ...    Test objective: The objective is to get information about multiples VNF instances without authorization.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple vnfInstances - Unauthorized
+    Check HTTP Response Status Code Is    401
     Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VNFSelectDeployableModules.robot b/SOL002/VNFLifecycleManagement-API/VNFSelectDeployableModules.robot
index 59026e9d3d9999b3ac680e295c55fe987ad71f32..ff7e683a2dab793c316db8139e193a95c1316d42 100644
--- a/SOL002/VNFLifecycleManagement-API/VNFSelectDeployableModules.robot
+++ b/SOL002/VNFLifecycleManagement-API/VNFSelectDeployableModules.robot
@@ -12,7 +12,7 @@ POST Select VNF Deployable Module
     ...    Test title: POST Select VNF Deployable Module
     ...    Test objective: The objective is to select VNF Deployable Module
     ...    Pre-conditions: The VNF instance resource is in INSTANTIATED state
-    ...    Reference: Clause 5.4.11b.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11b.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ POST Select VNF Deployable Module Not Found
     ...    Test title: POST Select VNF Deployable Module Not Found 
     ...    Test objective: The objective is to test that the POST Select VNF Deployable Module fails when the resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11b.3.1  - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11b.3.1  - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ POST Select VNF Deployable Module with conflict (Not Instantiated)
     ...    Test title: POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation fails when there is a conflict with the resource state.
     ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.11b.3.1  - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11b.3.1  - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ GET Select VNF Deployable Module - Method not implemented
     ...    Test title: GET Select VNF Deployable Module - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11b.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11b.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PUT Select VNF Deployable Module - Method not implemented
     ...    Test title: PUT Select VNF Deployable Module - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11b.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11b.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ PATCH Select VNF Deployable Module - Method Not implemented
     ...    Test title: PATCH Select VNF Deployable Module - Method Not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11b.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11b.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ DELETE Select VNF Deployable Module - Method Not implemented
     ...    Test title: DELETE Select VNF Deployable Module - Method Not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11b.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11b.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -100,7 +100,7 @@ POST Select VNF Deployable Module - Unauthorized
     ...    Test title: POST Select VNF Deployable Module - Unauthorized
     ...    Test objective: The objective is to test that POST method cannot trigger a Select VNF Deployable Module  without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11b.3.1  - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.11b.3.1  - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/VNFSnapshots.robot b/SOL002/VNFLifecycleManagement-API/VNFSnapshots.robot
index d7a8c7f25ce9cc60f86b00f281e477bb742fe9ba..b18a9da7957b8d4d384cb4cb0e89b81c5ccfe63f 100644
--- a/SOL002/VNFLifecycleManagement-API/VNFSnapshots.robot
+++ b/SOL002/VNFLifecycleManagement-API/VNFSnapshots.robot
@@ -8,7 +8,7 @@ POST Create a new VNF Snapshot
     ...    Test title: POST Create a new VNF Snapshot
     ...    Test objective: The objective is to create a new VNF snapshot
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.23.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF snapshot is created
@@ -24,7 +24,7 @@ GET information about multiple VNF Snapshots
     ...    Test title: GET information about multiple VNF Snapshots
     ...    Test objective: The objective is to get information about multiples VNF snapshots
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ GET information about multiple VNF Snapshots Bad Request Invalid attribute-based
     ...    Test title: GET information about multiple VNF Snapshots Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get information about multiples VNF Snapshots with Invalid attribute-based filtering parameters
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ GET information about multiple VNF Snapshots Bad Request Invalid attribute selec
     ...    Test title: GET information about multiple VNF Snapshots Bad Request Invalid attribute selector
     ...    Test objective: The objective is to get information about multiples VNF Snapshots with Invalid attribute-based filtering parameters
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ GET information about multiple VNF Snapshots with "all_fields" attribute selecto
     ...    Test title: GET information about multiple VNF Snapshots with "all_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF Snapshots
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ GET information about multiple VNF Snapshots with "exclude_default" attribute se
     ...    Test title: GET information about multiple VNF Snapshots with "exclude_default" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF Snapshots
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ GET information about multiple VNF Snapshots with "fields" attribute selector
     ...    Test title: GET information about multiple VNF Snapshots with "fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF Snapshots
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -102,7 +102,7 @@ GET information about multiple VNF Snapshots with "exclude_default" and "fields"
     ...    Test title: GET information about multiple VNF Snapshots with "exclude_default" and "fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF Snapshots
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -115,7 +115,7 @@ GET information about multiple VNF Snapshots with "exclude_fields" attribute sel
     ...    Test title: GET information about multiple VNF Snapshots with "exclude_fields" attribute selector
     ...    Test objective: The objective is to query information about multiple VNF Snapshots
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ GET VNF Snapshots - Bad Request Response too Big
     ...    Test title: GET VNF Snapshots - Bad Request Response too Big
     ...    Test objective: The objective is test that the retrieval of existing VNF Snapshots list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: VNFM does not support paged response.
     ...    Post-Conditions: none 
@@ -141,7 +141,7 @@ GET VNF Snapshots as Paged Response
     ...    Test title: GET VNF Snapshots as Paged Response
     ...    Test objective: The objective is to test that GET method retrieves the list of existing VNF Snapshots as paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: VNFM supports paged response.
     ...    Post-Conditions: none    
@@ -154,7 +154,7 @@ PUT VNF Snapshots - Method not implemented
     ...    Test title: PUT VNF Snapshots - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.23.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -166,7 +166,7 @@ PATCH VNF Snapshots - Method not implemented
     ...    Test title: PATCH VNF Snapshots - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 5.4.23.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -178,7 +178,7 @@ DELETE VNF Snapshots - Method not implemented
     ...    Test title: DELETE VNF Snapshots - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 5.4.23.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF instance not deleted
@@ -189,7 +189,7 @@ POST Create a new VNF Snapshot with permitted authorization scope
     ...    Test title: POST Create a new VNF Snapshot with permitted authorization scope
     ...    Test objective: The objective is to create a new VNF snapshot with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.23.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF snapshot is created
@@ -204,7 +204,7 @@ POST Create a new VNF Snapshot with not permitted authorization scope
     ...    Test title: POST Create a new VNF Snapshot with not permitted authorization scope
     ...    Test objective: The objective is to create a new VNF snapshot with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.23.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -217,10 +217,22 @@ POST Create a new VNF Snapshot - Unauthorized
     ...    Test title: POST Create a new VNF Snapshot  - Unauthorized
     ...    Test objective: The objective is to create a new VNF snapshot without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.23.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.23.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
     POST Create a new VNF Snapshot - Unauthorized
     Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+GET information about multiple VNF Snapshots - Unauthorized  
+    [Documentation]    Test ID: 6.3.5.25.18
+    ...    Test title: GET information about multiple VNF Snapshots - Unauthorized
+    ...    Test objective: The objective is to get information about multiples VNF snapshots without authorization.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple VNF Snapshots - Unauthorized
+    Check HTTP Response Status Code Is    401
     Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 178a3e016d431a875ace71a2792266e32f7360f3..94f65583e4cd639891f42760124d040c65779a93 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -275,6 +275,14 @@ POST Create a new vnfInstance - Unauthorized
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     ${body}=    Get File    jsons/createVnfRequest.json
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+GET multiple vnfInstances - Unauthorized
+    Log    Queries information about multiple VNF instances without authorization.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Version": "${API_VERSION}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 POST Create a new VNF Snapshot	
@@ -298,7 +306,14 @@ GET multiple VNF Snapshots
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots 
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 		
-
+GET multiple VNF Snapshots - Unauthorized	
+    Log    Queries information about multiple VNF snapshots without authorization.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Version": "${API_VERSION}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots 
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
 GET multiple VNF Snapshots with bad attribute	
     Log    Query VNF The GET method queries information about multiple VNF snapshots.
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -451,14 +466,44 @@ PATCH individual vnfInstance
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
-	
+PATCH individual vnfInstance - Unauthorized
+    log    Trying to modify an individual VNF instance without authorization
+    Set Headers    {"Accept":"${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
+    Set Headers    {"If-Match": "${original_etag}"}
+    ${body}=    Get File    jsons/VnfInfoModificationRequest.json
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+PATCH individual vnfInstance - Not Found
+    log    Trying to modify an individual VNF instance that does not exist
+    Set Headers    {"Accept":"${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
+    Set Headers    {"If-Match": "${original_etag}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${body}=    Get File    jsons/VnfInfoModificationRequest.json
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${NOT_EXISTANT_VNF_INSTANCE_ID}    ${body}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
 DELETE individual vnfInstance
     log    Trying to delete an individual VNF instance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
-
+DELETE individual vnfInstance - Unauthorized
+    log    Trying to delete an individual VNF instance without authorization
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+DELETE individual vnfInstance - Not Found
+    log    Trying to delete an individual VNF instance that does not exist
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${NOT_EXISTANT_VNF_INSTANCE_ID}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
 POST individual VNF Snapshot
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -515,10 +560,26 @@ DELETE individual VNF Snapshot
     Set Headers  {"Version": "${API_VERSION}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${vnfSnapshotInfoId} 		
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${vnfSnapshotInfoId} 		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
-
+DELETE individual VNF Snapshot - Unauthorized
+    log    Trying to DELETE an individual VNF Snapshot without authorization.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Version": "${API_VERSION}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${vnfSnapshotInfoId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+DELETE individual VNF Snapshot - Not Found
+    log    Trying to DELETE an individual VNF Snapshot that does not exist
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Version": "${API_VERSION}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${invalidVnfSnapshotInfoId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
 DELETE individual VNF Snapshot - CONFLICT
     log    Trying to DELETE an individual VNF Snapshot that is already in use by another operation
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -653,7 +714,18 @@ POST Scale vnfInstance to level with instantiationLevelId
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
-    
+
+POST Scale vnfInstance to level with attribute powerProfileId
+    Log    Trying to scale a vnf Instance to level
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Version": "${API_VERSION}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/scaleVnfToLevelRequestWithPowerProfileId.json
+    ${body}=        Format String   ${template}     powerProfileId=${powerProfileId} 
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
 GET Scale vnfInstance to level
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
@@ -1478,6 +1550,15 @@ Get subscriptions
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
+Get subscriptions - Unauthorized
+    Log    Trying to get the list of active subscriptions without authorization
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Version": "${API_VERSION}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
 Get subscriptions - filter
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept":"${ACCEPT}"}
@@ -1597,6 +1678,21 @@ Delete Individual subscription
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
+Delete Individual subscription - Unauthorized
+    log    Try to delete an individual subscription without authorization
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Version": "${API_VERSION}"}  
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+Delete Individual subscription - Not Found
+    log    Try to delete an individual subscription
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Version": "${API_VERSION}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${NOT_EXISTANT_SubscriptionId}	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
 Put Notification subscription
     log    Trying to perform a PUT. This method should not be implemented
     Put    ${callback_endpoint}	
@@ -2811,6 +2907,21 @@ GET reach the notification endpoint
     GET    ${callbackResp}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
+GET reach the notification endpoint - Unauthorized  
+    Log    Trying to reach the notification endpoint using GET method without authorization.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    GET    ${callbackResp}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
+GET reach the notification endpoint - Not Found 
+    Log    Trying to reach the not existing notification endpoint using GET method.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${invalid_callbackResp}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
 PUT notification endpoint  
     Log    Trying to perform a PUT. This method should not be implemented.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index b760c336201169e700900c2942fae7e6dd312c5d..d704b2edc620a3c3d76eb6c0769ca4c9ea980673 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -13,7 +13,7 @@ POST VNF LCM operation occurrences - Method not implemented
     ...    Test title: POST VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ GET status information about multiple VNF LCM operation occurrences
     ...    Test title: GET status information about multiple VNF LCM operation occurrences
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -39,7 +39,7 @@ GET status information about multiple VNF LCM operation occurrences Bad Request
     ...    Test title: GET status information about multiple VNF LCM operation occurrences Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -52,7 +52,7 @@ GET status information about multiple VNF LCM Operation occurrences Bad Request
     ...    Test title: GET status information about multiple VNF LCM Operation occurrences Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -65,7 +65,7 @@ GET status information about multiple VNF LCM Operation occurrences with "all_fi
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "all_fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -78,7 +78,7 @@ GET status information about multiple VNF LCM Operation occurrences with "exlude
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -91,7 +91,7 @@ GET status information about multiple VNF LCM Operation occurrences with "fields
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -104,7 +104,7 @@ GET status information about multiple VNF LCM Operation occurrences with "exclud
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -117,7 +117,7 @@ PUT status information about multiple VNF LCM operation occurrences - Method not
     ...    Test title: PUT status information about multiple VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -129,7 +129,7 @@ PATCH status information about multiple VNF LCM operation occurrences - Method n
     ...    Test title: PATCH status information about multiple VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -141,7 +141,7 @@ DELETE status information about multiple VNF LCM operation occurrences - Method
     ...    Test title: DELETE status information about multiple VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ GET status information about multiple VNF LCM operation occurances to get Paged
     ...    Test title: GET status information about multiple VNF LCM operation occurances to get Paged Response
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences to get paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -166,7 +166,7 @@ GET status information about multiple VNF LCM Operation occurrences Bad Request
     ...    Test title: GET status information about multiple VNF LCM Operation occurrences Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because Response is too big.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -179,7 +179,7 @@ GET status information about multiple VNF LCM Operation occurrences with "exlude
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default" and "fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -191,7 +191,7 @@ GET status information about multiple VNF LCM operation occurrences with permitt
     ...    Test title: GET status information about multiple VNF LCM operation occurrences with permitted authorization scope
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -204,7 +204,7 @@ GET status information about multiple VNF LCM operation occurrences with not per
     ...    Test title: GET status information about multiple VNF LCM operation occurrences with not permitted authorization scope
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences with not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -216,7 +216,7 @@ GET information about multiple VNF instances - Bad Request Response too big
     ...    Test title: GET information about multiple VNF instances - Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving information about multiple VNF LCM operation occurrences because Response is too big.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -229,7 +229,7 @@ GET status information about multiple VNF LCM operation occurrences - Unauthoriz
     ...    Test title: GET status information about multiple VNF LCM operation occurrences - Unauthorized
     ...    Test objective: The objective is to test that GET method cannot retrieve Query status information about multiple VNF lifecycle management operation occurrences without authorization
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index cf0457ce101d766bce69db9c47f471d899e7aaaa..eed436083fa3d809a243d44900272fe969de93c1 100644
--- a/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -44,7 +44,7 @@ node_types:
         type: list
         entry_schema:
           type: string
-        default: [ 'etsivnfm:v5.2.1' ]
+        default: [ 'etsivnfm:v5.3.1' ]
     interfaces:
       Vnflcm:
         type: "tosca.interfaces.nfv.Vnflcm"
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 09ee4c66680d6b59aa833dc3141186904dd6be63..1b61f9447f81ec4d41e31d500b918c9813cc688f 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -13,7 +13,7 @@ ${ACCEPT_JSON}         application/json
 ${apiRoot}        /
 ${apiName}        vnflcm
 ${apiMajorVersion}    v2
-${API_VERSION}      2.15.0
+${API_VERSION}      2.16.0
 ${AUTH_USAGE}     1
 ${OAUTH_Encryption_ALGORITHM}   HS256
 ${NEG_SCOPE}    vnflcm:v2:invalid
@@ -50,7 +50,7 @@ ${VNFM_DUPLICATION}    0
 ${sub_filter}    filter
 ${sub_filter_invalid}    filter_invalid
 ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
-
+${NOT_EXISTANT_SubscriptionId}   NOT_EXISTANT_SubscriptionId
 ${notInstantiatedVnfInstanceId}    NOT_INSTANTIATED_VNF_INSTANCE_ID
 ${NOT_EXISTANT_VNF_INSTANCE_ID}    NOT_EXISTANT_VNF_INSTANCE_ID    
 
@@ -86,7 +86,8 @@ ${flavourId}    vnf flavour
 
 ${scaleVnfRequesttype}    SCALE_OUT
 ${scaleVnfRequestAspect}    Aspect
-${instantiationLevelId}     
+${instantiationLevelId} 
+${powerProfileId}    
 
 ${newFlavourId}    5a7d81f-e602-4afa-8e13-962fb5a7d81f
 
@@ -99,7 +100,7 @@ ${changeStateTo}    STOPPED
 ${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 
 ${callbackResp}    localhost
-
+${invalid_callbackResp}    invalid_callback
 ${check_descriptors}    1
 ${descriptorType}    SOL006
 ${check_multiple_instances}    0
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequestWithPowerProfileId.json b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequestWithPowerProfileId.json
new file mode 100644
index 0000000000000000000000000000000000000000..e926d0290312dabd18fdec01001ec7141f160f4c
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/jsons/scaleVnfToLevelRequestWithPowerProfileId.json
@@ -0,0 +1,4 @@
+{{
+  "powerProfileId": "{powerProfileId}",
+  "additionalParams": {}
+}}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json
index 700e00990380ece3250913bdcf3939b1b828b860..5f002702b429254221221c308eff66cb4016d118 100644
--- a/SOL002/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json
+++ b/SOL002/VNFLifecycleManagement-API/schemas/VnfLcmOperationOccurrenceNotification.schema.json
@@ -61,7 +61,7 @@
 			"type": "string"
 		},
 		"operation": {
-			"description": "The enumeration LcmOpType defines the permitted values to represent  VNF lifecycle operation types in VNF lifecycle management operation  occurrence resources and VNF lifecycle management operation occurrence  notifications.\nValue | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation. CREATE_SNAPSHOT | Represents the \"Create VNF Snapshot\" LCM operation. REVERT_TO_SNAPSHOT | Represents the /"Revert-To VNF Snapshot\" LCM operation. CHANGE_VNFPKG | Represents the \"Change current VNF package\" LCM operation. SELECT_DEPL_MODS  | Represents the \"Select VNF deployable modules\" LCM operation \n",
+			"description": "The enumeration LcmOpType defines the permitted values to represent  VNF lifecycle operation types in VNF lifecycle management operation  occurrence resources and VNF lifecycle management operation occurrence  notifications.\nValue | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation. CREATE_SNAPSHOT | Represents the \"Create VNF Snapshot\" LCM operation. REVERT_TO_SNAPSHOT | Represents the \"Revert-To VNF Snapshot\" LCM operation. CHANGE_VNFPKG | Represents the \"Change current VNF package\" LCM operation. SELECT_DEPL_MODS  | Represents the \"Select VNF deployable modules\" LCM operation \n",
 			"type": "string",
 			"enum": [
 				"INSTANTIATE",
@@ -814,10 +814,10 @@
 									"type": "string"
 								},
 								"cpConfig": {
-   									"description": "Map of instance data that need to be configured on the CP instances created from the respective CPD. The key of the map which identifies the individual VnfExtCpConfig entries is of type \"IdentifierInVnf\" and is managed by the NFVO. The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). See notes 2, 3, 4, 5 and 6. In case of deleting an external CP, the list of instances to be deleted. \n",
+									"description": "Map of instance data that need to be configured on the CP instances created from the respective CPD. The key of the map which identifies the individual VnfExtCpConfig entries is of type \"IdentifierInVnf\" and is managed by the NFVO. The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). See notes 2, 3, 4, 5 and 6. In case of deleting an external CP, the list of instances to be deleted. \n",
 									"type": "object",
 									"additionalProperties": {
-										"description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes /"netAttDefResourceId/" and /"cpProtocolData/" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
+										"description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes \"netAttDefResourceId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
 										"anyOf": [
 											{
 												"required": [
@@ -838,7 +838,7 @@
 										"type": "object",
 										"properties": {
 											"parentCpConfigId": {
-                           						"description": "Value of the key that identifies the  \"VnfExtCpConfig\" map entry which corresponds to the parent port of the trunk.mOnly present in \"VnfExtCpConfig\" structures that provide configuration information for a CP which represents a sub-port in a trunk, and if parent ports are supported. In case of deletion of an external CP, the identifier of the external CP instance to delete.  Shall be present if this instance has already been created.\n",
+												"description": "Value of the key that identifies the  \"VnfExtCpConfig\" map entry which corresponds to the parent port of the trunk.mOnly present in \"VnfExtCpConfig\" structures that provide configuration information for a CP which represents a sub-port in a trunk, and if parent ports are supported. In case of deletion of an external CP, the identifier of the external CP instance to delete.  Shall be present if this instance has already been created.\n",
 												"type": "string"
 											},
 											"linkPortId": {
@@ -1028,27 +1028,54 @@
 															}
 														},
 														"fullyQualifiedDomainNames": {
-														"description": "Specifies the fully qualified domain names (FQDN) to apply to the CP.\n",
-														"type": "array",
-														"items": {
-															"type": "string"
+															"description": "Specifies the fully qualified domain names (FQDN) to apply to the CP.\n",
+															"type": "array",
+															"items": {
+																"type": "string"
+															}
 														},
 														"relativeDomainNames": {
-														"description": "Specifies values of relative domain names to be considered when setting  the fully qualified domain names.\n",
-														"type": "array",
-														"items": {
-															"type": "string"
+															"description": "Specifies values of relative domain names to be considered when setting  the fully qualified domain names.\n",
+															"type": "array",
+															"items": {
+																"type": "string"
+															}
 														}
 													}
 												}
 											},
 											"netAttDefResourceId": {
-												"description": "Identifier of the /"NetAttDefResourceData/" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
+												"description": "Identifier of the \"NetAttDefResourceData\" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
 												"type": "array",
 												"items": {
 													"description": "An identifier with the intention of being globally unique.\n",
 													"type": "string"
 												}
+											},
+											"cpSecurityGroupData": {
+												"description": "Parameters for modifying and overriding security groups information bound to this CP. The parameters identify which \"SecurityGroupRule\" specified in the VNFD is activated/deactivated and for an activated security group rule the values of attributes defined in the VNFD that can be overridden such as \"portRangeMin\" and \"portRangeMax\". If no security group configuration is provided for a given \"SecurityGroupRule\" specified in the VNFD as part of this attribute, the VNFM shall use the configuration as specified in the VNFD.\n",
+												"type": "object",
+												"required": [
+													"securityGroupRuleId"
+												],
+												"properties": {
+													"securityGroupRuleId": {
+														"description": "Identifier of the security group rule policy in the VNFD.\n",
+														"type": "string"
+													},
+													"isActivated": {
+														"description": "Indicates whether the rule is to be active (true) or inactive (false). If no attribute value is provided, the Security Group Rule is activated by default.\n",
+														"type": "boolean"
+													},
+													"portRangeMin": {
+														"description": "Value for the minimum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+														"type": "integer"
+													},
+													"portRangeMax": {
+														"description": "Value for the maximum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+														"type": "integer"
+													}
+												}
 											}
 										}
 									}
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotInfo.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotInfo.schema.json
index be3d4b5c3a3f6b87f71e6bfee0bf42237f17b406..a6de2453e06cf3ecd4e8c994b90a51dfae1d1517 100644
--- a/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotInfo.schema.json
+++ b/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotInfo.schema.json
@@ -48,7 +48,7 @@
 					"type": "string"
 				},
 				"vnfInstance": {
-					"description": "This type represents a VNF instance. * NOTE 1:\tModifying the value of this attribute shall not be performed when conflicts exist\n          between the previous and the newly referred VNF package, i.e. when the new VNFD is\n          changed with respect to the previous VNFD in other aspects than merely referencing\n          to other VNF software images. In order to avoid misalignment of the VnfInstance with\n          the current VNF's on-boarded VNF package, the values of attributes in the VnfInstance\n          that have corresponding attributes in the VNFD shall be kept in sync with the values in the VNFD.\n* NOTE 2:\tETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. * NOTE 3:\tThese attributes are sometimes also referred to as configuration parameters\n          applicable to a VNF. Some of these are set prior to instantiation and cannot be modified\n          if the VNF is instantiated, some are set prior to instantiation (are part of initial configuration)\n          and can be modified later, and others can be set only after instantiation.\n          The applicability of certain configuration may depend on the VNF and the required operation of\n          the VNF at a certain point in time.\n* NOTE 4:\tUpon creation of the VnfInstance structure, the VNFM shall create and initialize all child\n          attributes of \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that were declared\n          in the VNFD with a defined initial value. The defined initial values can be declared in the VNFD,\n          and/or, in case of \"metadata\", obtained from the \"CreateVnfRequest\" structure. Child attributes of\n          \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that have no defined initial value shall\n          not be created, in order to be consistent with the semantics of the JSON Merge Patch method\n          (see IETF RFC 7396) that interprets null values as deletion request.\n* NOTE 5:\tIt is possible to have several ExtManagedVirtualLinkInfo for the same VNF internal VL in case\n          of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkInfo corresponding\n          to the same VNF internal VL shall indicate so by referencing to the same VnfVirtualLinkDesc\n          and externally-managed multi-site VL instance (refer to clause 5.5.3.5).\n* NOTE 6:\tEven though externally-managed internal VLs are also used for VNF-internal connectivity,\n          they shall not be listed in the \"vnfVirtualLinkResourceInfo\" attribute as this would be redundant.\n* NOTE 7: Subports need not be used for containerized VNFCs. The application container can send and receive IP \n          packets with any VLAN tag as long as the network interface to connect to the secondary container cluster \n          network has been configured appropriately. Thus, no individual extCpInfo, except the one representing the \n          trunk, need be modelled to allow traffic tagged with a particular VLAN through the connection point.\n* NOTE 8: For a scaling aspect whose related VNFCs have not been instantiated due to the selection of deployable \n          modules, the /"scaleStatus/" indicates the scale level that would be applicable to the aspect if a VNF LCM \n          operation changes the selected deployable modules and the related VNFCs are instantiated, unless the VNF \n          LCM operation explicitly indicates the scale level for the aspect.\n",
+					"description": "This type represents a VNF instance. * NOTE 1:\tModifying the value of this attribute shall not be performed when conflicts exist\n          between the previous and the newly referred VNF package, i.e. when the new VNFD is\n          changed with respect to the previous VNFD in other aspects than merely referencing\n          to other VNF software images. In order to avoid misalignment of the VnfInstance with\n          the current VNF's on-boarded VNF package, the values of attributes in the VnfInstance\n          that have corresponding attributes in the VNFD shall be kept in sync with the values in the VNFD.\n* NOTE 2:\tETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. * NOTE 3:\tThese attributes are sometimes also referred to as configuration parameters\n          applicable to a VNF. Some of these are set prior to instantiation and cannot be modified\n          if the VNF is instantiated, some are set prior to instantiation (are part of initial configuration)\n          and can be modified later, and others can be set only after instantiation.\n          The applicability of certain configuration may depend on the VNF and the required operation of\n          the VNF at a certain point in time.\n* NOTE 4:\tUpon creation of the VnfInstance structure, the VNFM shall create and initialize all child\n          attributes of \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that were declared\n          in the VNFD with a defined initial value. The defined initial values can be declared in the VNFD,\n          and/or, in case of \"metadata\", obtained from the \"CreateVnfRequest\" structure. Child attributes of\n          \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that have no defined initial value shall\n          not be created, in order to be consistent with the semantics of the JSON Merge Patch method\n          (see IETF RFC 7396) that interprets null values as deletion request.\n* NOTE 5:\tIt is possible to have several ExtManagedVirtualLinkInfo for the same VNF internal VL in case\n          of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkInfo corresponding\n          to the same VNF internal VL shall indicate so by referencing to the same VnfVirtualLinkDesc\n          and externally-managed multi-site VL instance (refer to clause 5.5.3.5).\n* NOTE 6:\tEven though externally-managed internal VLs are also used for VNF-internal connectivity,\n          they shall not be listed in the \"vnfVirtualLinkResourceInfo\" attribute as this would be redundant.\n* NOTE 7: Subports need not be used for containerized VNFCs. The application container can send and receive IP \n          packets with any VLAN tag as long as the network interface to connect to the secondary container cluster \n          network has been configured appropriately. Thus, no individual extCpInfo, except the one representing the \n          trunk, need be modelled to allow traffic tagged with a particular VLAN through the connection point.\n* NOTE 8: For a scaling aspect whose related VNFCs have not been instantiated due to the selection of deployable \n          modules, the \"scaleStatus\" indicates the scale level that would be applicable to the aspect if a VNF LCM \n          operation changes the selected deployable modules and the related VNFCs are instantiated, unless the VNF \n          LCM operation explicitly indicates the scale level for the aspect.\n",
 					"type": "object",
 					"required": [
 						"id",
@@ -401,6 +401,47 @@
 										"STOPPED"
 									]
 								},
+								"vnfPowerState": {
+									"description": "The power state of the VNF instance. Only present if the VNF instance\n is in a power state or a scale status (refer to attribute \"scaleStatus\")\n that has an associated power profile, as defined in the VNFD.\n",
+									"type": "object",
+									"required": [
+										"powerProfileId",
+										"name"
+									],
+									"properties": {
+										"powerProfileId": {
+											"description": "Identifier of the power profile, as defined in the VNFD, applied to the VNF instance.\n",
+											"type": "string"
+										},
+										"name": {
+											"description": "Name of the power profile as provided in the VNFD.\n",
+											"type": "string"
+										},
+										"powerConsumptionInfo": {
+											"description": "Estimated power consumption information of the resources associated with this power profile, as provided in the VNFD. VNFM exposes and can use this information to control the VNF instance to operate according to the power profile and selected power state, e.g. monitoring actual energy or power consumption of the VNF instance and compare against the estimated one.\n",
+											"type": "object",
+											"required": [
+												"minPowerConsumption",
+												"maxPowerConsumption",
+												"averagePowerConsumption"
+											],
+											"properties": {
+												"minPowerConsumption": {
+													"description": "Minimum power consumption of this power profile. Unit is KW/h.\n",
+													"type": "integer"
+												},
+												"maxPowerConsumption": {
+													"description": "Maximum power consumption of this power profile. Unit is KW/h.\n",
+													"type": "integer"
+												},
+												"averagePowerConsumption": {
+													"description": "Average power consumption of this power profile. Unit is KW/h.\n",
+													"type": "integer"
+												}
+											}
+										}
+									}
+								},
 								"scaleStatus": {
 									"description": "Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how \"big\" the VNF has been scaled w.r.t. that aspect. This attribute shall be present if the VNF supports scaling. See clause B.2 for an explanation of VNF scaling. For an aspect that has not been deployed because the related deployableModule has not been selected, it indicates the scale level that has been requested in the instantiation or in a scaling operation, or, if none has been requested in any of them, the scale level applicable to the aspect based on the default instantiation level. See note 8.\n",
 									"type": "array",
@@ -595,6 +636,27 @@
 																"description": "A number defined in IETF RFC 8259.\n",
 																"type": "number"
 															}
+														},
+														"cpuPowerStateRequirements": {
+															"description": "Requirements of virtual CPU power state configuration data for the OS container resource.\n",
+															"type": "object",
+															"required": [
+																"cpuPowerStateManagementPolicy"
+															],
+															"properties": {
+																"cpuPowerStateManagementPolicy": {
+                            										"description": "Indicates the policy for CPU power state management. Permitted values:\n  * STATIC\n  * DYNAMIC\nIn case of \"STATIC\", the virtual CPU cores are requested to be allocated to logical CPU cores according to the cpuOperationalPowerStates attribute. In case of \"DYNAMIC\", the CPU power states of virtual CPU cores can be allocated to logical CPU cores whose power states can be adjusted dynamically depending on core utilization\n* NOTE 1: In case the value of the \"cpuPowerStateManagementPolicy\" attribute is \"DYNAMIC\", dynamic adjustment of CPU power states of logical CPU cores should adhere to the range of CPU P and C states defined in the \"cpuOperationalPowerStates\" attribute.",
+																	"type": "string",
+																	"enum": [
+																		"STATIC",
+																		"DYNAMIC"
+																	]
+																},
+																"cpuOperationalPowerStates": {
+                          											"description": "Provides the lists of operational power states (i.e. P and C states) defined for the virtual CPU.\n* NOTE 2: In case the value of the \"cpuPowerStateManagementPolicy\" attribute is \"STATIC\", the cpuOperationalPowerStates attribute shall contain only one set of CPU P and C states requested for the virtual CPU. If the value of the cpuPowerStateManagementPolicy attribute is \"DYNAMIC\", multiple CPU P and C states can be defined to indicate the range of allowed P/C state values during dynamic power state management.",
+																	"type": "object"
+																}
+															}
 														}
 													}
 												}
@@ -656,6 +718,27 @@
 															"description": "A number defined in IETF RFC 8259.\n",
 															"type": "number"
 														}
+													},
+													"cpuPowerStateRequirements": {
+														"description": "Requirements of virtual CPU power state configuration data for the virtual compute resource.\n",
+														"type": "object",
+														"required": [
+															"cpuPowerStateManagementPolicy"
+														],
+														"properties": {
+															"cpuPowerStateManagementPolicy": {
+																"description": "Indicates the policy for CPU power state management. Permitted values:\n  * STATIC\n  * DYNAMIC\nIn case of \"STATIC\", the virtual CPU cores are requested to be allocated to logical CPU cores according to the cpuOperationalPowerStates attribute. In case of \"DYNAMIC\", the CPU power states of virtual CPU cores can be allocated to logical CPU cores whose power states can be adjusted dynamically depending on core utilization (see note 1).\n",
+																"type": "string",
+																"enum": [
+																	"STATIC",
+																	"DYNAMIC"
+																]
+															},
+															"cpuOperationalPowerStates": {
+																"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"
+															}
+														}
 													}
 												}
 											},
@@ -689,7 +772,7 @@
 									"type": "array",
 									"minItems": 1,
 									"items": {
-										"description": "This type represents information about an external CP of a VNF.\nNOTE 1:\tThe attributes \"associatedVnfcCpId\", \"associatedVipCpId\", \"associatedVirtualCpId\" and \n        \"associatedVnfVirtualLinkId\" are mutually exclusive. Exactly one shall be present.\nNOTE 2:\tAn external CP instance is not associated to a link port in the cases indicated for the \n        /"extLinkPorts/" attribute in clause 4.4.1.11.\nNOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network \n        attachment definition resource is needed to fulfil the connectivity requirements of the external \n        CP, e.g. to build a link redundant mated pair in SR-IOV cases.\nNOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.\n",
+										"description": "This type represents information about an external CP of a VNF.\nNOTE 1:\tThe attributes \"associatedVnfcCpId\", \"associatedVipCpId\", \"associatedVirtualCpId\" and \n        \"associatedVnfVirtualLinkId\" are mutually exclusive. Exactly one shall be present.\nNOTE 2:\tAn external CP instance is not associated to a link port in the cases indicated for the \n        \"extLinkPorts\" attribute in clause 4.4.1.11.\nNOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network \n        attachment definition resource is needed to fulfil the connectivity requirements of the external \n        CP, e.g. to build a link redundant mated pair in SR-IOV cases.\nNOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.\n",
 										"type": "object",
 										"required": [
 											"id",
@@ -906,7 +989,7 @@
 												"type": "string"
 											},
 											"netAttDefResourceId": {
-												"description": "Identifier of the /"NetAttDefResourceInfo/" structure that provides the specification of the interface to attach the connection point to a secondary container cluster network. See notes 3 and 4. It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
+												"description": "Identifier of the \"NetAttDefResourceInfo\" structure that provides the specification of the interface to attach the connection point to a secondary container cluster network. See notes 3 and 4. It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
 												"type": "array",
 												"items": {
 													"description": "An identifier with the intention of being globally unique.\n",
@@ -920,6 +1003,47 @@
 													"description": "An identifier with the intention of being globally unique.\n",
 													"type": "string"
 												}
+											},
+											"cpSecurityGroupInfo": {
+												"description": "List of active security group rules applied to this external CP instance. The attribute identifies which \"SecurityGroupRule\" specified in the VNFD are activated and the values of its attributes.\n",
+												"type": "object",
+												"required": [
+													"securityGroupRuleId",
+													"etherType",
+													"protocol",
+													"portRangeMin",
+													"portRangeMax"
+												],
+												"properties": {
+													"securityGroupRuleId": {
+														"description": "Identifier of the security group rule policy in the VNFD.\n",
+														"type": "string"
+													},
+													"description": {
+														"description": "Human readable description of the security group rule.\n",
+														"type": "string"
+													},
+													"etherType": {
+														"description": "Indicates the protocol carried over the Ethernet layer. Permitted values: IPV4, IPV6.\n",
+														"type": "string",
+														"enum": [
+															"IPV4",
+															"IPV6"
+														]
+													},
+													"protocol": {
+														"description": "Indicates the protocol carried over the IP layer. Permitted values: any protocol defined in the IANA protocol registry (refer to clause 9.10.1.2 ofd ETSI GS NFV-SOL 001 for further information).\n",
+														"type": "string"
+													},
+													"portRangeMin": {
+														"description": "Value for the minimum port number in the range that is matched by the security group rule.\n",
+														"type": "integer"
+													},
+													"portRangeMax": {
+														"description": "Value for the maximum port number in the range that is matched by the security group rule.\n",
+														"type": "integer"
+													}
+												}
 											}
 										}
 									}
@@ -1092,13 +1216,12 @@
 															}
 														},
 														"fullyQualifiedDomainNames": {
-                                                            "description": "Fully qualified domain names that have been configured (statically or dynamically) and been  associated to the CP.\n",
-                                                            "type": "array",
-                                                            "items": {
-                                                                "type": "string"
-                                                            }
-                                                        }
-												
+															"description": "Fully qualified domain names that have been configured (statically or dynamically) and been  associated to the CP.\n",
+															"type": "array",
+															"items": {
+																"type": "string"
+															}
+														}
 													}
 												}
 											},
@@ -1571,7 +1694,7 @@
 															"description": "Map of instance data that need to be configured on the CP instances created from the respective CPD. The key of the map which identifies the individual VnfExtCpConfig entries is of type \"IdentifierInVnf\" and is managed by the NFVO. The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). See notes 2, 3, 4, 5 and 6. In case of deleting an external CP, the list of instances to be deleted. \n",
 															"type": "object",
 															"additionalProperties": {
-																"description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes /"netAttDefResourceId/" and /"cpProtocolData/" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
+																"description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes \"netAttDefResourceId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
 																"anyOf": [
 																	{
 																		"required": [
@@ -1799,12 +1922,37 @@
 																		}
 																	},
 																	"netAttDefResourceId": {
-																		"description": "Identifier of the /"NetAttDefResourceData/" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
+																		"description": "Identifier of the \"NetAttDefResourceData\" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
 																		"type": "array",
 																		"items": {
 																			"description": "An identifier with the intention of being globally unique.\n",
 																			"type": "string"
 																		}
+																	},
+																	"cpSecurityGroupData": {
+																		"description": "Parameters for modifying and overriding security groups information bound to this CP. The parameters identify which \"SecurityGroupRule\" specified in the VNFD is activated/deactivated and for an activated security group rule the values of attributes defined in the VNFD that can be overridden such as \"portRangeMin\" and \"portRangeMax\". If no security group configuration is provided for a given \"SecurityGroupRule\" specified in the VNFD as part of this attribute, the VNFM shall use the configuration as specified in the VNFD.\n",
+																		"type": "object",
+																		"required": [
+																			"securityGroupRuleId"
+																		],
+																		"properties": {
+																			"securityGroupRuleId": {
+																				"description": "Identifier of the security group rule policy in the VNFD.\n",
+																				"type": "string"
+																			},
+																			"isActivated": {
+																				"description": "Indicates whether the rule is to be active (true) or inactive (false). If no attribute value is provided, the Security Group Rule is activated by default.\n",
+																				"type": "boolean"
+																			},
+																			"portRangeMin": {
+																				"description": "Value for the minimum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+																				"type": "integer"
+																			},
+																			"portRangeMax": {
+																				"description": "Value for the maximum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+																				"type": "integer"
+																			}
+																		}
 																	}
 																}
 															}
@@ -1948,7 +2096,7 @@
 									}
 								},
 								"extManagedVirtualLinkInfo": {
-          							"description": "Information about the externally managed internal VLs of the VNF instance. See notes 5 and 6.",
+									"description": "Information about the externally managed internal VLs of the VNF instance. See notes 5 and 6.",
 									"type": "array",
 									"items": {
 										"description": "This type provides information about an externally-managed virtual link.\n NOTE: Both vnfLinkPort and vnfNetAttDefResource can be present in an ExtManagedVirtualLinkInfo to indicate that a single internal virtual link is providing connectivity for both VM-based and container-based VNFCs.\n",
@@ -2535,7 +2683,7 @@
 															"type": "string"
 														},
 														"netAttDefResourceId": {
-															"description": "Identifier of the /"NetAttDefResourceInfo/" structure that provides the specification of the interface  to attach the connection point to a secondary container cluster network. See notes 5 and 6. It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS  containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
+															"description": "Identifier of the \"NetAttDefResourceInfo\" structure that provides the specification of the interface  to attach the connection point to a secondary container cluster network. See notes 5 and 6. It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS  containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
 															"type": "array",
 															"items": {
 																"description": "An identifier with the intention of being globally unique.\n",
@@ -2861,7 +3009,7 @@
 									"description": "Information on the MCIO(s) representing VNFC instance(s) realized by one or a set of OS containers  and created from the same VDU for the VNF instance.\n",
 									"type": "array",
 									"items": {
-										"description": "This type provides information about an MCIO representing the set of VNFC instances realized by one  or a set of OS containers which have been created based on the same VDU. Within the CISM, an MCIO controller monitors the actual state of an MCIO representing the set of VNFC  instances realized by one or a set of OS containers and compare it to the desired state. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to FALSE the desired state is specified in the respective declarative descriptor. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to TRUE, the desired state is determined by the number of CIS-nodes in the cluster that fulfil the VDU requirements. It triggers actions toward the CIS to align the actual to the desired state. Monitoring the actual state includes monitoring the number of MCIO instances available at any specific point in time. In addition, an MCIO controller maintains properties and runtime information  on the MCIO instances which have been created based on the same VDU. The McioInfo data structure provides the runtime information on the MCIOs obtained from the MCIO controller.\nNOTE: There are different types of MCIOs. The set of VNFC instances based on the same VDU is represented \n      by one MCIO, e.g. of type Deployment. Each individual VNFC instance is represented by another type \n      of MCIO, e.g. a POD.\n\nRuntime information of the set of OS containers realizing an individual VNFC instance is not part of the  McioInfo data structure; such runtime information is provided in the ResourceHandle data structure  referenced from the VnfcResourceInfo. The McioInfo does not provide runtime information of a constituent  VNFC instance created based on a specific VDU.\nNOTE 1: The type of MCIO as specified in the declarative descriptor of the MCIO, and that can be read from \n        the CISM. EXAMPLE: In case of MCIOs managed by Kubernetes®, the type of MCIO corresponds to the \n        /"kind/" property of the declarative descriptor.\nNOTE 2: If the attribute additionalInfo is present, it may contain runtime information on the actual and \n        desired state of the MCIO(s).   \nNOTE 3: When the container infrastructure service is a Kubernetes® instance, the mcioId is the combined \n        values from the kind and name fields of the Kubernetes resource object, separated by a slash. \n        Example: \"Deployment/abcd\". \nNOTE 4: When the container infrastructure service is a Kubernetes® instance, the mcioName is the name \n        field of the resource object.          \n",
+										"description": "This type provides information about an MCIO representing the set of VNFC instances realized by one  or a set of OS containers which have been created based on the same VDU. Within the CISM, an MCIO controller monitors the actual state of an MCIO representing the set of VNFC  instances realized by one or a set of OS containers and compare it to the desired state. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to FALSE the desired state is specified in the respective declarative descriptor. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to TRUE, the desired state is determined by the number of CIS-nodes in the cluster that fulfil the VDU requirements. It triggers actions toward the CIS to align the actual to the desired state. Monitoring the actual state includes monitoring the number of MCIO instances available at any specific point in time. In addition, an MCIO controller maintains properties and runtime information  on the MCIO instances which have been created based on the same VDU. The McioInfo data structure provides the runtime information on the MCIOs obtained from the MCIO controller.\nNOTE: There are different types of MCIOs. The set of VNFC instances based on the same VDU is represented \n      by one MCIO, e.g. of type Deployment. Each individual VNFC instance is represented by another type \n      of MCIO, e.g. a POD.\n\nRuntime information of the set of OS containers realizing an individual VNFC instance is not part of the  McioInfo data structure; such runtime information is provided in the ResourceHandle data structure  referenced from the VnfcResourceInfo. The McioInfo does not provide runtime information of a constituent  VNFC instance created based on a specific VDU.\nNOTE 1: The type of MCIO as specified in the declarative descriptor of the MCIO, and that can be read from \n        the CISM. EXAMPLE: In case of MCIOs managed by Kubernetes®, the type of MCIO corresponds to the \n        \"kind\" property of the declarative descriptor.\nNOTE 2: If the attribute additionalInfo is present, it may contain runtime information on the actual and \n        desired state of the MCIO(s).   \nNOTE 3: When the container infrastructure service is a Kubernetes® instance, the mcioId is the combined \n        values from the kind and name fields of the Kubernetes resource object, separated by a slash. \n        Example: \"Deployment/abcd\". \nNOTE 4: When the container infrastructure service is a Kubernetes® instance, the mcioName is the name \n        field of the resource object.          \n",
 										"type": "object",
 										"required": [
 											"mcioId",
@@ -2995,7 +3143,7 @@
 							}
 						},
 						"metadata": {
-    						"description": "Additional VNF-specific attributes that provide metadata describing the VNF instance. These attributes represent values that are stored persistently in the VnfInstance  structure for consumption by functional blocks that invoke the VNF lifecycle management  interface. They are not consumed by the VNFM, or the lifecycle management scripts.\nModifying the values of these attributes has no effect on the VNF instance, it only  affects the information represented in the VnfInstance structure. Metadata that the VNF provider foresees are expected to be declared in the VNFD. (clause  6.2.35 in ETSI GS NFV-SOL 001 [12]), like information about supported protocols and data  models for configuring the VNF. The declaration of metadata in the VNFD can optionally contain the  specification of initial values. See notes 2 and 4. The VNFM shall accept requests to write metadata  that are not declared in the VNFD.\nThese attributes can be initialized with default values from VNFD (see note 4) and/or with values passed in the CreateVnfRequest structure (see clause 5.5.2.3).\nThese attributes can be created, modified or removed with the PATCH method.\n",
+							"description": "Additional VNF-specific attributes that provide metadata describing the VNF instance. These attributes represent values that are stored persistently in the VnfInstance  structure for consumption by functional blocks that invoke the VNF lifecycle management  interface. They are not consumed by the VNFM, or the lifecycle management scripts.\nModifying the values of these attributes has no effect on the VNF instance, it only  affects the information represented in the VnfInstance structure. Metadata that the VNF provider foresees are expected to be declared in the VNFD. (clause  6.2.35 in ETSI GS NFV-SOL 001 [12]), like information about supported protocols and data  models for configuring the VNF. The declaration of metadata in the VNFD can optionally contain the  specification of initial values. See notes 2 and 4. The VNFM shall accept requests to write metadata  that are not declared in the VNFD.\nThese attributes can be initialized with default values from VNFD (see note 4) and/or with values passed in the CreateVnfRequest structure (see clause 5.5.2.3).\nThese attributes can be created, modified or removed with the PATCH method.\n",
 							"type": "object"
 						},
 						"extensions": {
@@ -3179,6 +3327,194 @@
 									}
 								}
 							}
+						},
+						"recentVnfLcmOperationLinks": {
+							"description": "Links to the most recent LCM operation occurrences related to this resource. See note 9.\n",
+							"type": "object",
+							"properties": {
+								"recentVnfLcmOperation": {
+									"description": "Link to the most recent LCM operation occurrence of any type that has been triggered on this VNF instance, such as Instantiate, Scale or Heal.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmInstantiation": {
+									"description": "Link to the most recent LCM operation occurrence of type \"INSTANTIATE\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmScale": {
+									"description": "Link to the most recent LCM operation occurrence of type \"SCALE\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmScaleToLevel": {
+									"description": "Link to the most recent LCM operation occurrence of type \"SCALE_TO_LEVEL\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmChangeFlavour": {
+									"description": "Link to the most recent LCM operation occurrence of type \"CHANGE_FLAVOUR\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmTerminate": {
+									"description": "Link to the most recent LCM operation occurrence of type \"TERMINATE\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmHeal": {
+									"description": "Link to the most recent LCM operation occurrence of type \"HEAL\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmOperate": {
+									"description": "Link to the most recent LCM operation occurrence of type \"OPERATE\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmChangeExtConn": {
+									"description": "Link to the most recent LCM operation occurrence of type \"CHANGE_EXT_CONN\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmModifyInfo": {
+									"description": "Link to the most recent LCM operation occurrence of type \"MODIFY_INFO\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmCreateSnapshot": {
+									"description": "Link to the most recent LCM operation occurrence of type \"CREATE_SNAPSHOT\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmRevertToSnapshot": {
+									"description": "Link to the most recent LCM operation occurrence of type \"REVERT_TO_SNAPSHOT\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmChangeVnfPkg": {
+									"description": "Link to the most recent LCM operation occurrence of type \"CHANGE_VNFPKG\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								},
+								"recentVnfLcmSelectDplMods": {
+									"description": "Link to the most recent LCM operation occurrence of type \"SELECT_DEPL_MODS\" that has been triggered on this VNF instance.\n",
+									"type": "object",
+									"required": [
+										"href"
+									],
+									"properties": {
+										"href": {
+											"description": "String formatted according to IETF RFC 3986.\n",
+											"type": "string"
+										}
+									}
+								}
+							}
 						}
 					}
 				},
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotsInfo.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotsInfo.schema.json
index a6794101336153ac6a5b8dad26d281ed5b5b09c0..e985fe033e245f8b0aa48ef16e050101d0bbc8b0 100644
--- a/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotsInfo.schema.json
+++ b/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotsInfo.schema.json
@@ -50,7 +50,7 @@
 						"type": "string"
 					},
 					"vnfInstance": {
-						"description": "This type represents a VNF instance. * NOTE 1:\tModifying the value of this attribute shall not be performed when conflicts exist\n          between the previous and the newly referred VNF package, i.e. when the new VNFD is\n          changed with respect to the previous VNFD in other aspects than merely referencing\n          to other VNF software images. In order to avoid misalignment of the VnfInstance with\n          the current VNF's on-boarded VNF package, the values of attributes in the VnfInstance\n          that have corresponding attributes in the VNFD shall be kept in sync with the values in the VNFD.\n* NOTE 2:\tETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. * NOTE 3:\tThese attributes are sometimes also referred to as configuration parameters\n          applicable to a VNF. Some of these are set prior to instantiation and cannot be modified\n          if the VNF is instantiated, some are set prior to instantiation (are part of initial configuration)\n          and can be modified later, and others can be set only after instantiation.\n          The applicability of certain configuration may depend on the VNF and the required operation of\n          the VNF at a certain point in time.\n* NOTE 4:\tUpon creation of the VnfInstance structure, the VNFM shall create and initialize all child\n          attributes of \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that were declared\n          in the VNFD with a defined initial value. The defined initial values can be declared in the VNFD,\n          and/or, in case of \"metadata\", obtained from the \"CreateVnfRequest\" structure. Child attributes of\n          \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that have no defined initial value shall\n          not be created, in order to be consistent with the semantics of the JSON Merge Patch method\n          (see IETF RFC 7396) that interprets null values as deletion request.\n* NOTE 5:\tIt is possible to have several ExtManagedVirtualLinkInfo for the same VNF internal VL in case\n          of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkInfo corresponding\n          to the same VNF internal VL shall indicate so by referencing to the same VnfVirtualLinkDesc\n          and externally-managed multi-site VL instance (refer to clause 5.5.3.5).\n* NOTE 6:\tEven though externally-managed internal VLs are also used for VNF-internal connectivity,\n          they shall not be listed in the \"vnfVirtualLinkResourceInfo\" attribute as this would be redundant.\n* NOTE 7: Subports need not be used for containerized VNFCs. The application container can send and receive IP \n          packets with any VLAN tag as long as the network interface to connect to the secondary container cluster \n          network has been configured appropriately. Thus, no individual extCpInfo, except the one representing the \n          trunk, need be modelled to allow traffic tagged with a particular VLAN through the connection point.\n* NOTE 8: For a scaling aspect whose related VNFCs have not been instantiated due to the selection of deployable \n          modules, the /"scaleStatus/" indicates the scale level that would be applicable to the aspect if a VNF LCM \n          operation changes the selected deployable modules and the related VNFCs are instantiated, unless the VNF \n          LCM operation explicitly indicates the scale level for the aspect.\n",
+						"description": "This type represents a VNF instance. * NOTE 1:\tModifying the value of this attribute shall not be performed when conflicts exist\n          between the previous and the newly referred VNF package, i.e. when the new VNFD is\n          changed with respect to the previous VNFD in other aspects than merely referencing\n          to other VNF software images. In order to avoid misalignment of the VnfInstance with\n          the current VNF's on-boarded VNF package, the values of attributes in the VnfInstance\n          that have corresponding attributes in the VNFD shall be kept in sync with the values in the VNFD.\n* NOTE 2:\tETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. * NOTE 3:\tThese attributes are sometimes also referred to as configuration parameters\n          applicable to a VNF. Some of these are set prior to instantiation and cannot be modified\n          if the VNF is instantiated, some are set prior to instantiation (are part of initial configuration)\n          and can be modified later, and others can be set only after instantiation.\n          The applicability of certain configuration may depend on the VNF and the required operation of\n          the VNF at a certain point in time.\n* NOTE 4:\tUpon creation of the VnfInstance structure, the VNFM shall create and initialize all child\n          attributes of \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that were declared\n          in the VNFD with a defined initial value. The defined initial values can be declared in the VNFD,\n          and/or, in case of \"metadata\", obtained from the \"CreateVnfRequest\" structure. Child attributes of\n          \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that have no defined initial value shall\n          not be created, in order to be consistent with the semantics of the JSON Merge Patch method\n          (see IETF RFC 7396) that interprets null values as deletion request.\n* NOTE 5:\tIt is possible to have several ExtManagedVirtualLinkInfo for the same VNF internal VL in case\n          of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkInfo corresponding\n          to the same VNF internal VL shall indicate so by referencing to the same VnfVirtualLinkDesc\n          and externally-managed multi-site VL instance (refer to clause 5.5.3.5).\n* NOTE 6:\tEven though externally-managed internal VLs are also used for VNF-internal connectivity,\n          they shall not be listed in the \"vnfVirtualLinkResourceInfo\" attribute as this would be redundant.\n* NOTE 7: Subports need not be used for containerized VNFCs. The application container can send and receive IP \n          packets with any VLAN tag as long as the network interface to connect to the secondary container cluster \n          network has been configured appropriately. Thus, no individual extCpInfo, except the one representing the \n          trunk, need be modelled to allow traffic tagged with a particular VLAN through the connection point.\n* NOTE 8: For a scaling aspect whose related VNFCs have not been instantiated due to the selection of deployable \n          modules, the “scaleStatus” indicates the scale level that would be applicable to the aspect if a VNF LCM \n          operation changes the selected deployable modules and the related VNFCs are instantiated, unless the VNF \n          LCM operation explicitly indicates the scale level for the aspect.\n* NOTE 9: The recentVnfLcmOperationLinks attribute does not provide a complete historical record of LCM changes\n          that a VNF instance experienced during its lifecycle. The information in this attribute should not be used to\n          create a chronological order of events that cannot be inferred by looking only at the most recent operation\n          occurrences due to potential gaps in timeline. This is because there can be many possible combination of\n          LCM changes that a VNF may have gone through between two operation occurrences recorded in the\n          recentVnfLcmOperationLinks attribute. For example, there can be many scaling related LCM changes since\n          an individual VNF instance has been instantiated until the most recent scaling operation occurrence linked in\n          the attribute. In another example, the most recent LCM operation occurrence related to instantiate VNF\n          operation may be more recent than the one that caused the VNF instance to be terminated last time, which\n          prevents the possibility to create a meaningful chronological timeline of VNF LCM events.\n",
 						"type": "object",
 						"required": [
 							"id",
@@ -403,6 +403,47 @@
 											"STOPPED"
 										]
 									},
+									"vnfPowerState": {
+										"description": "The power state of the VNF instance. Only present if the VNF instance\n is in a power state or a scale status (refer to attribute \"scaleStatus\")\n that has an associated power profile, as defined in the VNFD.\n",
+										"type": "object",
+										"required": [
+											"powerProfileId",
+											"name"
+										],
+										"properties": {
+											"powerProfileId": {
+												"description": "Identifier of the power profile, as defined in the VNFD, applied to the VNF instance.\n",
+												"type": "string"
+											},
+											"name": {
+												"description": "Name of the power profile as provided in the VNFD.\n",
+												"type": "string"
+											},
+											"powerConsumptionInfo": {
+												"description": "Estimated power consumption information of the resources associated with this power profile, as provided in the VNFD. VNFM exposes and can use this information to control the VNF instance to operate according to the power profile and selected power state, e.g. monitoring actual energy or power consumption of the VNF instance and compare against the estimated one.\n",
+												"type": "object",
+												"required": [
+													"minPowerConsumption",
+													"maxPowerConsumption",
+													"averagePowerConsumption"
+												],
+												"properties": {
+													"minPowerConsumption": {
+														"description": "Minimum power consumption of this power profile. Unit is KW/h.\n",
+														"type": "integer"
+													},
+													"maxPowerConsumption": {
+														"description": "Maximum power consumption of this power profile. Unit is KW/h.\n",
+														"type": "integer"
+													},
+													"averagePowerConsumption": {
+														"description": "Average power consumption of this power profile. Unit is KW/h.\n",
+														"type": "integer"
+													}
+												}
+											}
+										}
+									},
 									"scaleStatus": {
 										"description": "Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how \"big\" the VNF has been scaled w.r.t. that aspect. This attribute shall be present if the VNF supports scaling. See clause B.2 for an explanation of VNF scaling. For an aspect that has not been deployed because the related deployableModule has not been selected, it indicates the scale level that has been requested in the instantiation or in a scaling operation, or, if none has been requested in any of them, the scale level applicable to the aspect based on the default instantiation level. See note 8.\n",
 										"type": "array",
@@ -597,6 +638,27 @@
 																	"description": "A number defined in IETF RFC 8259.\n",
 																	"type": "number"
 																}
+															},
+															"cpuPowerStateRequirements": {
+																"description": "Requirements of virtual CPU power state configuration data for the OS container resource.\n",
+																"type": "object",
+																"required": [
+																	"cpuPowerStateManagementPolicy"
+																],
+																"properties": {
+																	"cpuPowerStateManagementPolicy": {
+                            											"description": "Indicates the policy for CPU power state management. Permitted values:\n  * STATIC\n  * DYNAMIC\nIn case of \"STATIC\", the virtual CPU cores are requested to be allocated to logical CPU cores according to the cpuOperationalPowerStates attribute. In case of \"DYNAMIC\", the CPU power states of virtual CPU cores can be allocated to logical CPU cores whose power states can be adjusted dynamically depending on core utilization\n* NOTE 1: In case the value of the \"cpuPowerStateManagementPolicy\" attribute is \"DYNAMIC\", dynamic adjustment of CPU power states of logical CPU cores should adhere to the range of CPU P and C states defined in the \"cpuOperationalPowerStates\" attribute.",
+																		"type": "string",
+																		"enum": [
+																			"STATIC",
+																			"DYNAMIC"
+																		]
+																	},
+																	"cpuOperationalPowerStates": {
+                          												"description": "Provides the lists of operational power states (i.e. P and C states) defined for the virtual CPU.\n* NOTE 2: In case the value of the \"cpuPowerStateManagementPolicy\" attribute is \"STATIC\", the cpuOperationalPowerStates attribute shall contain only one set of CPU P and C states requested for the virtual CPU. If the value of the cpuPowerStateManagementPolicy attribute is \"DYNAMIC\", multiple CPU P and C states can be defined to indicate the range of allowed P/C state values during dynamic power state management.",
+																		"type": "object"
+																	}
+																}
 															}
 														}
 													}
@@ -658,6 +720,27 @@
 																"description": "A number defined in IETF RFC 8259.\n",
 																"type": "number"
 															}
+														},
+														"cpuPowerStateRequirements": {
+															"description": "Requirements of virtual CPU power state configuration data for the virtual compute resource.\n",
+															"type": "object",
+															"required": [
+																"cpuPowerStateManagementPolicy"
+															],
+															"properties": {
+																"cpuPowerStateManagementPolicy": {
+																	"description": "Indicates the policy for CPU power state management. Permitted values:\n  * STATIC\n  * DYNAMIC\nIn case of \"STATIC\", the virtual CPU cores are requested to be allocated to logical CPU cores according to the cpuOperationalPowerStates attribute. In case of \"DYNAMIC\", the CPU power states of virtual CPU cores can be allocated to logical CPU cores whose power states can be adjusted dynamically depending on core utilization (see note 1).\n",
+																	"type": "string",
+																	"enum": [
+																		"STATIC",
+																		"DYNAMIC"
+																	]
+																},
+																"cpuOperationalPowerStates": {
+																	"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"
+																}
+															}
 														}
 													}
 												},
@@ -691,7 +774,7 @@
 										"type": "array",
 										"minItems": 1,
 										"items": {
-											"description": "This type represents information about an external CP of a VNF.\nNOTE 1:\tThe attributes \"associatedVnfcCpId\", \"associatedVipCpId\", \"associatedVirtualCpId\" and \n        \"associatedVnfVirtualLinkId\" are mutually exclusive. Exactly one shall be present.\nNOTE 2:\tAn external CP instance is not associated to a link port in the cases indicated for the \n        /"extLinkPorts/" attribute in clause 4.4.1.11.\nNOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network \n        attachment definition resource is needed to fulfil the connectivity requirements of the external \n        CP, e.g. to build a link redundant mated pair in SR-IOV cases.\nNOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.\n",
+											"description": "This type represents information about an external CP of a VNF.\nNOTE 1:\tThe attributes \"associatedVnfcCpId\", \"associatedVipCpId\", \"associatedVirtualCpId\" and \n        \"associatedVnfVirtualLinkId\" are mutually exclusive. Exactly one shall be present.\nNOTE 2:\tAn external CP instance is not associated to a link port in the cases indicated for the \n        \"extLinkPorts\" attribute in clause 4.4.1.11.\nNOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network \n        attachment definition resource is needed to fulfil the connectivity requirements of the external \n        CP, e.g. to build a link redundant mated pair in SR-IOV cases.\nNOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.\n",
 											"type": "object",
 											"required": [
 												"id",
@@ -908,7 +991,7 @@
 													"type": "string"
 												},
 												"netAttDefResourceId": {
-													"description": "Identifier of the /"NetAttDefResourceInfo/" structure that provides the specification of the interface to attach the connection point to a secondary container cluster network. See notes 3 and 4. It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
+													"description": "Identifier of the \"NetAttDefResourceInfo\" structure that provides the specification of the interface to attach the connection point to a secondary container cluster network. See notes 3 and 4. It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
 													"type": "array",
 													"items": {
 														"description": "An identifier with the intention of being globally unique.\n",
@@ -922,6 +1005,47 @@
 														"description": "An identifier with the intention of being globally unique.\n",
 														"type": "string"
 													}
+												},
+												"cpSecurityGroupInfo": {
+													"description": "List of active security group rules applied to this external CP instance. The attribute identifies which \"SecurityGroupRule\" specified in the VNFD are activated and the values of its attributes.\n",
+													"type": "object",
+													"required": [
+														"securityGroupRuleId",
+														"etherType",
+														"protocol",
+														"portRangeMin",
+														"portRangeMax"
+													],
+													"properties": {
+														"securityGroupRuleId": {
+															"description": "Identifier of the security group rule policy in the VNFD.\n",
+															"type": "string"
+														},
+														"description": {
+															"description": "Human readable description of the security group rule.\n",
+															"type": "string"
+														},
+														"etherType": {
+															"description": "Indicates the protocol carried over the Ethernet layer. Permitted values: IPV4, IPV6.\n",
+															"type": "string",
+															"enum": [
+																"IPV4",
+																"IPV6"
+															]
+														},
+														"protocol": {
+															"description": "Indicates the protocol carried over the IP layer. Permitted values: any protocol defined in the IANA protocol registry (refer to clause 9.10.1.2 ofd ETSI GS NFV-SOL 001 for further information).\n",
+															"type": "string"
+														},
+														"portRangeMin": {
+															"description": "Value for the minimum port number in the range that is matched by the security group rule.\n",
+															"type": "integer"
+														},
+														"portRangeMax": {
+															"description": "Value for the maximum port number in the range that is matched by the security group rule.\n",
+															"type": "integer"
+														}
+													}
 												}
 											}
 										}
@@ -1572,7 +1696,7 @@
 																"description": "Map of instance data that need to be configured on the CP instances created from the respective CPD. The key of the map which identifies the individual VnfExtCpConfig entries is of type \"IdentifierInVnf\" and is managed by the NFVO. The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). See notes 2, 3, 4, 5 and 6. In case of deleting an external CP, the list of instances to be deleted. \n",
 																"type": "object",
 																"additionalProperties": {
-																	"description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes /"netAttDefResourceId/" and /"cpProtocolData/" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
+																	"description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes \"netAttDefResourceId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
 																	"anyOf": [
 																		{
 																			"required": [
@@ -1800,12 +1924,37 @@
 																			}
 																		},
 																		"netAttDefResourceId": {
-																			"description": "Identifier of the /"NetAttDefResourceData/" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
+																			"description": "Identifier of the \"NetAttDefResourceData\" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
 																			"type": "array",
 																			"items": {
 																				"description": "An identifier with the intention of being globally unique.\n",
 																				"type": "string"
 																			}
+																		},
+																		"cpSecurityGroupData": {
+																			"description": "Parameters for modifying and overriding security groups information bound to this CP. The parameters identify which \"SecurityGroupRule\" specified in the VNFD is activated/deactivated and for an activated security group rule the values of attributes defined in the VNFD that can be overridden such as \"portRangeMin\" and \"portRangeMax\". If no security group configuration is provided for a given \"SecurityGroupRule\" specified in the VNFD as part of this attribute, the VNFM shall use the configuration as specified in the VNFD.\n",
+																			"type": "object",
+																			"required": [
+																				"securityGroupRuleId"
+																			],
+																			"properties": {
+																				"securityGroupRuleId": {
+																					"description": "Identifier of the security group rule policy in the VNFD.\n",
+																					"type": "string"
+																				},
+																				"isActivated": {
+																					"description": "Indicates whether the rule is to be active (true) or inactive (false). If no attribute value is provided, the Security Group Rule is activated by default.\n",
+																					"type": "boolean"
+																				},
+																				"portRangeMin": {
+																					"description": "Value for the minimum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+																					"type": "integer"
+																				},
+																				"portRangeMax": {
+																					"description": "Value for the maximum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+																					"type": "integer"
+																				}
+																			}
 																		}
 																	}
 																}
@@ -1949,7 +2098,7 @@
 										}
 									},
 									"extManagedVirtualLinkInfo": {
-          								"description": "Information about the externally managed internal VLs of the VNF instance. See notes 5 and 6.\n",
+										"description": "Information about the externally managed internal VLs of the VNF instance. See notes 5 and 6.\n",
 										"type": "array",
 										"items": {
 											"description": "This type provides information about an externally-managed virtual link.\n NOTE: Both vnfLinkPort and vnfNetAttDefResource can be present in an ExtManagedVirtualLinkInfo to indicate that a single internal virtual link is providing connectivity for both VM-based and container-based VNFCs.\n",
@@ -2536,7 +2685,7 @@
 																"type": "string"
 															},
 															"netAttDefResourceId": {
-																"description": "Identifier of the /"NetAttDefResourceInfo/" structure that provides the specification of the interface  to attach the connection point to a secondary container cluster network. See notes 5 and 6. It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS  containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
+																"description": "Identifier of the \"NetAttDefResourceInfo\" structure that provides the specification of the interface  to attach the connection point to a secondary container cluster network. See notes 5 and 6. It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS  containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
 																"type": "array",
 																"items": {
 																	"description": "An identifier with the intention of being globally unique.\n",
@@ -2862,7 +3011,7 @@
 										"description": "Information on the MCIO(s) representing VNFC instance(s) realized by one or a set of OS containers  and created from the same VDU for the VNF instance.\n",
 										"type": "array",
 										"items": {
-											"description": "This type provides information about an MCIO representing the set of VNFC instances realized by one  or a set of OS containers which have been created based on the same VDU. Within the CISM, an MCIO controller monitors the actual state of an MCIO representing the set of VNFC  instances realized by one or a set of OS containers and compare it to the desired state. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to FALSE the desired state is specified in the respective declarative descriptor. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to TRUE, the desired state is determined by the number of CIS-nodes in the cluster that fulfil the VDU requirements. It triggers actions toward the CIS to align the actual to the desired state. Monitoring the actual state includes monitoring the number of MCIO instances available at any specific point in time. In addition, an MCIO controller maintains properties and runtime information  on the MCIO instances which have been created based on the same VDU. The McioInfo data structure provides the runtime information on the MCIOs obtained from the MCIO controller.\nNOTE: There are different types of MCIOs. The set of VNFC instances based on the same VDU is represented \n      by one MCIO, e.g. of type Deployment. Each individual VNFC instance is represented by another type \n      of MCIO, e.g. a POD.\n\nRuntime information of the set of OS containers realizing an individual VNFC instance is not part of the  McioInfo data structure; such runtime information is provided in the ResourceHandle data structure  referenced from the VnfcResourceInfo. The McioInfo does not provide runtime information of a constituent  VNFC instance created based on a specific VDU.\nNOTE 1: The type of MCIO as specified in the declarative descriptor of the MCIO, and that can be read from \n        the CISM. EXAMPLE: In case of MCIOs managed by Kubernetes®, the type of MCIO corresponds to the \n        /"kind/" property of the declarative descriptor.\nNOTE 2: If the attribute additionalInfo is present, it may contain runtime information on the actual and \n        desired state of the MCIO(s).   \nNOTE 3: When the container infrastructure service is a Kubernetes® instance, the mcioId is the combined \n        values from the kind and name fields of the Kubernetes resource object, separated by a slash. \n        Example: \"Deployment/abcd\". \nNOTE 4: When the container infrastructure service is a Kubernetes® instance, the mcioName is the name \n        field of the resource object.          \n",
+											"description": "This type provides information about an MCIO representing the set of VNFC instances realized by one  or a set of OS containers which have been created based on the same VDU. Within the CISM, an MCIO controller monitors the actual state of an MCIO representing the set of VNFC  instances realized by one or a set of OS containers and compare it to the desired state. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to FALSE the desired state is specified in the respective declarative descriptor. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to TRUE, the desired state is determined by the number of CIS-nodes in the cluster that fulfil the VDU requirements. It triggers actions toward the CIS to align the actual to the desired state. Monitoring the actual state includes monitoring the number of MCIO instances available at any specific point in time. In addition, an MCIO controller maintains properties and runtime information  on the MCIO instances which have been created based on the same VDU. The McioInfo data structure provides the runtime information on the MCIOs obtained from the MCIO controller.\nNOTE: There are different types of MCIOs. The set of VNFC instances based on the same VDU is represented \n      by one MCIO, e.g. of type Deployment. Each individual VNFC instance is represented by another type \n      of MCIO, e.g. a POD.\n\nRuntime information of the set of OS containers realizing an individual VNFC instance is not part of the  McioInfo data structure; such runtime information is provided in the ResourceHandle data structure  referenced from the VnfcResourceInfo. The McioInfo does not provide runtime information of a constituent  VNFC instance created based on a specific VDU.\nNOTE 1: The type of MCIO as specified in the declarative descriptor of the MCIO, and that can be read from \n        the CISM. EXAMPLE: In case of MCIOs managed by Kubernetes®, the type of MCIO corresponds to the \n        \"kind\" property of the declarative descriptor.\nNOTE 2: If the attribute additionalInfo is present, it may contain runtime information on the actual and \n        desired state of the MCIO(s).   \nNOTE 3: When the container infrastructure service is a Kubernetes® instance, the mcioId is the combined \n        values from the kind and name fields of the Kubernetes resource object, separated by a slash. \n        Example: \"Deployment/abcd\". \nNOTE 4: When the container infrastructure service is a Kubernetes® instance, the mcioName is the name \n        field of the resource object.          \n",
 											"type": "object",
 											"required": [
 												"mcioId",
@@ -2996,7 +3145,7 @@
 								}
 							},
 							"metadata": {
-    							"description": "Additional VNF-specific attributes that provide metadata describing the VNF instance. These attributes represent values that are stored persistently in the VnfInstance  structure for consumption by functional blocks that invoke the VNF lifecycle management  interface. They are not consumed by the VNFM, or the lifecycle management scripts.\nModifying the values of these attributes has no effect on the VNF instance, it only  affects the information represented in the VnfInstance structure. Metadata that the VNF provider foresees are expected to be declared in the VNFD. (clause  6.2.35 in ETSI GS NFV-SOL 001 [12]), like information about supported protocols and data  models for configuring the VNF. The declaration of metadata in the VNFD can optionally contain the  specification of initial values. See notes 2 and 4. The VNFM shall accept requests to write metadata  that are not declared in the VNFD.\nThese attributes can be initialized with default values from VNFD (see note 4) and/or with values passed in the CreateVnfRequest structure (see clause 5.5.2.3).\nThese attributes can be created, modified or removed with the PATCH method.\n",
+								"description": "Additional VNF-specific attributes that provide metadata describing the VNF instance. These attributes represent values that are stored persistently in the VnfInstance  structure for consumption by functional blocks that invoke the VNF lifecycle management  interface. They are not consumed by the VNFM, or the lifecycle management scripts.\nModifying the values of these attributes has no effect on the VNF instance, it only  affects the information represented in the VnfInstance structure. Metadata that the VNF provider foresees are expected to be declared in the VNFD. (clause  6.2.35 in ETSI GS NFV-SOL 001 [12]), like information about supported protocols and data  models for configuring the VNF. The declaration of metadata in the VNFD can optionally contain the  specification of initial values. See notes 2 and 4. The VNFM shall accept requests to write metadata  that are not declared in the VNFD.\nThese attributes can be initialized with default values from VNFD (see note 4) and/or with values passed in the CreateVnfRequest structure (see clause 5.5.2.3).\nThese attributes can be created, modified or removed with the PATCH method.\n",
 								"type": "object"
 							},
 							"extensions": {
@@ -3180,6 +3329,194 @@
 										}
 									}
 								}
+							},
+							"recentVnfLcmOperationLinks": {
+								"description": "Links to the most recent LCM operation occurrences related to this resource. See note 9.\n",
+								"type": "object",
+								"properties": {
+									"recentVnfLcmOperation": {
+										"description": "Link to the most recent LCM operation occurrence of any type that has been triggered on this VNF instance, such as Instantiate, Scale or Heal.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmInstantiation": {
+										"description": "Link to the most recent LCM operation occurrence of type \"INSTANTIATE\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmScale": {
+										"description": "Link to the most recent LCM operation occurrence of type \"SCALE\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmScaleToLevel": {
+										"description": "Link to the most recent LCM operation occurrence of type \"SCALE_TO_LEVEL\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmChangeFlavour": {
+										"description": "Link to the most recent LCM operation occurrence of type \"CHANGE_FLAVOUR\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmTerminate": {
+										"description": "Link to the most recent LCM operation occurrence of type \"TERMINATE\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmHeal": {
+										"description": "Link to the most recent LCM operation occurrence of type \"HEAL\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmOperate": {
+										"description": "Link to the most recent LCM operation occurrence of type \"OPERATE\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmChangeExtConn": {
+										"description": "Link to the most recent LCM operation occurrence of type \"CHANGE_EXT_CONN\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmModifyInfo": {
+										"description": "Link to the most recent LCM operation occurrence of type \"MODIFY_INFO\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmCreateSnapshot": {
+										"description": "Link to the most recent LCM operation occurrence of type \"CREATE_SNAPSHOT\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmRevertToSnapshot": {
+										"description": "Link to the most recent LCM operation occurrence of type \"REVERT_TO_SNAPSHOT\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmChangeVnfPkg": {
+										"description": "Link to the most recent LCM operation occurrence of type \"CHANGE_VNFPKG\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									},
+									"recentVnfLcmSelectDplMods": {
+										"description": "Link to the most recent LCM operation occurrence of type \"SELECT_DEPL_MODS\" that has been triggered on this VNF instance.\n",
+										"type": "object",
+										"required": [
+											"href"
+										],
+										"properties": {
+											"href": {
+												"description": "String formatted according to IETF RFC 3986.\n",
+												"type": "string"
+											}
+										}
+									}
+								}
 							}
 						}
 					},
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/vnfInstance.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/vnfInstance.schema.json
index 22fd0df67a1154f99eea8c053fcc826073323c7e..0b12d11754af2a7ae63537da8f302ddb5c95dda7 100644
--- a/SOL002/VNFLifecycleManagement-API/schemas/vnfInstance.schema.json
+++ b/SOL002/VNFLifecycleManagement-API/schemas/vnfInstance.schema.json
@@ -1,5 +1,5 @@
 {
-  "description": "This type represents a VNF instance. * NOTE 1:\tModifying the value of this attribute shall not be performed when conflicts exist\n          between the previous and the newly referred VNF package, i.e. when the new VNFD is\n          changed with respect to the previous VNFD in other aspects than merely referencing\n          to other VNF software images. In order to avoid misalignment of the VnfInstance with\n          the current VNF's on-boarded VNF package, the values of attributes in the VnfInstance\n          that have corresponding attributes in the VNFD shall be kept in sync with the values in the VNFD.\n* NOTE 2:\tETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. * NOTE 3:\tThese attributes are sometimes also referred to as configuration parameters\n          applicable to a VNF. Some of these are set prior to instantiation and cannot be modified\n          if the VNF is instantiated, some are set prior to instantiation (are part of initial configuration)\n          and can be modified later, and others can be set only after instantiation.\n          The applicability of certain configuration may depend on the VNF and the required operation of\n          the VNF at a certain point in time.\n* NOTE 4:\tUpon creation of the VnfInstance structure, the VNFM shall create and initialize all child\n          attributes of \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that were declared\n          in the VNFD with a defined initial value. The defined initial values can be declared in the VNFD,\n          and/or, in case of \"metadata\", obtained from the \"CreateVnfRequest\" structure. Child attributes of\n          \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that have no defined initial value shall\n          not be created, in order to be consistent with the semantics of the JSON Merge Patch method\n          (see IETF RFC 7396) that interprets null values as deletion request.\n* NOTE 5:\tIt is possible to have several ExtManagedVirtualLinkInfo for the same VNF internal VL in case\n          of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkInfo corresponding\n          to the same VNF internal VL shall indicate so by referencing to the same VnfVirtualLinkDesc\n          and externally-managed multi-site VL instance (refer to clause 5.5.3.5).\n* NOTE 6:\tEven though externally-managed internal VLs are also used for VNF-internal connectivity,\n          they shall not be listed in the \"vnfVirtualLinkResourceInfo\" attribute as this would be redundant.\n* NOTE 7: Subports need not be used for containerized VNFCs. The application container can send and receive IP \n          packets with any VLAN tag as long as the network interface to connect to the secondary container cluster \n          network has been configured appropriately. Thus, no individual extCpInfo, except the one representing the \n          trunk, need be modelled to allow traffic tagged with a particular VLAN through the connection point.\n* NOTE 8: For a scaling aspect whose related VNFCs have not been instantiated due to the selection of deployable \n          modules, the /"scaleStatus/" indicates the scale level that would be applicable to the aspect if a VNF LCM \n          operation changes the selected deployable modules and the related VNFCs are instantiated, unless the VNF \n          LCM operation explicitly indicates the scale level for the aspect.\n",
+  "description": "This type represents a VNF instance. * NOTE 1:\tModifying the value of this attribute shall not be performed when conflicts exist\n          between the previous and the newly referred VNF package, i.e. when the new VNFD is\n          changed with respect to the previous VNFD in other aspects than merely referencing\n          to other VNF software images. In order to avoid misalignment of the VnfInstance with\n          the current VNF's on-boarded VNF package, the values of attributes in the VnfInstance\n          that have corresponding attributes in the VNFD shall be kept in sync with the values in the VNFD.\n* NOTE 2:\tETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. * NOTE 3:\tThese attributes are sometimes also referred to as configuration parameters\n          applicable to a VNF. Some of these are set prior to instantiation and cannot be modified\n          if the VNF is instantiated, some are set prior to instantiation (are part of initial configuration)\n          and can be modified later, and others can be set only after instantiation.\n          The applicability of certain configuration may depend on the VNF and the required operation of\n          the VNF at a certain point in time.\n* NOTE 4:\tUpon creation of the VnfInstance structure, the VNFM shall create and initialize all child\n          attributes of \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that were declared\n          in the VNFD with a defined initial value. The defined initial values can be declared in the VNFD,\n          and/or, in case of \"metadata\", obtained from the \"CreateVnfRequest\" structure. Child attributes of\n          \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that have no defined initial value shall\n          not be created, in order to be consistent with the semantics of the JSON Merge Patch method\n          (see IETF RFC 7396) that interprets null values as deletion request.\n* NOTE 5:\tIt is possible to have several ExtManagedVirtualLinkInfo for the same VNF internal VL in case\n          of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkInfo corresponding\n          to the same VNF internal VL shall indicate so by referencing to the same VnfVirtualLinkDesc\n          and externally-managed multi-site VL instance (refer to clause 5.5.3.5).\n* NOTE 6:\tEven though externally-managed internal VLs are also used for VNF-internal connectivity,\n          they shall not be listed in the \"vnfVirtualLinkResourceInfo\" attribute as this would be redundant.\n* NOTE 7: Subports need not be used for containerized VNFCs. The application container can send and receive IP \n          packets with any VLAN tag as long as the network interface to connect to the secondary container cluster \n          network has been configured appropriately. Thus, no individual extCpInfo, except the one representing the \n          trunk, need be modelled to allow traffic tagged with a particular VLAN through the connection point.\n* NOTE 8: For a scaling aspect whose related VNFCs have not been instantiated due to the selection of deployable \n          modules, the “scaleStatus” indicates the scale level that would be applicable to the aspect if a VNF LCM \n          operation changes the selected deployable modules and the related VNFCs are instantiated, unless the VNF \n          LCM operation explicitly indicates the scale level for the aspect.\n* NOTE 9: The recentVnfLcmOperationLinks attribute does not provide a complete historical record of LCM changes\n          that a VNF instance experienced during its lifecycle. The information in this attribute should not be used to\n          create a chronological order of events that cannot be inferred by looking only at the most recent operation\n          occurrences due to potential gaps in timeline. This is because there can be many possible combination of\n          LCM changes that a VNF may have gone through between two operation occurrences recorded in the\n          recentVnfLcmOperationLinks attribute. For example, there can be many scaling related LCM changes since\n          an individual VNF instance has been instantiated until the most recent scaling operation occurrence linked in\n          the attribute. In another example, the most recent LCM operation occurrence related to instantiate VNF\n          operation may be more recent than the one that caused the VNF instance to be terminated last time, which\n          prevents the possibility to create a meaningful chronological timeline of VNF LCM events.\n",
   "type": "object",
   "required": [
     "id",
@@ -352,6 +352,47 @@
             "STOPPED"
           ]
         },
+        "vnfPowerState": {
+          "description": "The power state of the VNF instance. Only present if the VNF instance\n is in a power state or a scale status (refer to attribute \"scaleStatus\")\n that has an associated power profile, as defined in the VNFD.\n",
+          "type": "object",
+          "required": [
+            "powerProfileId",
+            "name"
+          ],
+          "properties": {
+            "powerProfileId": {
+              "description": "Identifier of the power profile, as defined in the VNFD, applied to the VNF instance.\n",
+              "type": "string"
+            },
+            "name": {
+              "description": "Name of the power profile as provided in the VNFD.\n",
+              "type": "string"
+            },
+            "powerConsumptionInfo": {
+              "description": "Estimated power consumption information of the resources associated with this power profile, as provided in the VNFD. VNFM exposes and can use this information to control the VNF instance to operate according to the power profile and selected power state, e.g. monitoring actual energy or power consumption of the VNF instance and compare against the estimated one.\n",
+              "type": "object",
+              "required": [
+                "minPowerConsumption",
+                "maxPowerConsumption",
+                "averagePowerConsumption"
+              ],
+              "properties": {
+                "minPowerConsumption": {
+                  "description": "Minimum power consumption of this power profile. Unit is KW/h.\n",
+                  "type": "integer"
+                },
+                "maxPowerConsumption": {
+                  "description": "Maximum power consumption of this power profile. Unit is KW/h.\n",
+                  "type": "integer"
+                },
+                "averagePowerConsumption": {
+                  "description": "Average power consumption of this power profile. Unit is KW/h.\n",
+                  "type": "integer"
+                }
+              }
+            }
+          }
+        },
         "scaleStatus": {
           "description": "Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how \"big\" the VNF has been scaled w.r.t. that aspect. This attribute shall be present if the VNF supports scaling. See clause B.2 for an explanation of VNF scaling. For an aspect that has not been deployed because the related deployableModule has not been selected, it indicates the scale level that has been requested in the instantiation or in a scaling operation, or, if none has been requested in any of them, the scale level applicable to the aspect based on the default instantiation level. See note 8.\n",
           "type": "array",
@@ -541,6 +582,27 @@
                         "description": "A number defined in IETF RFC 8259.\n",
                         "type": "number"
                       }
+                    },
+                    "cpuPowerStateRequirements": {
+                      "description": "Requirements of virtual CPU power state configuration data for the OS container resource.\n",
+                      "type": "object",
+                      "required": [
+                        "cpuPowerStateManagementPolicy"
+                      ],
+                      "properties": {
+                        "cpuPowerStateManagementPolicy": {
+                          "description": "Indicates the policy for CPU power state management. Permitted values:\n  * STATIC\n  * DYNAMIC\nIn case of \"STATIC\", the virtual CPU cores are requested to be allocated to logical CPU cores according to the cpuOperationalPowerStates attribute. In case of \"DYNAMIC\", the CPU power states of virtual CPU cores can be allocated to logical CPU cores whose power states can be adjusted dynamically depending on core utilization\n* NOTE 1: In case the value of the \"cpuPowerStateManagementPolicy\" attribute is \"DYNAMIC\", dynamic adjustment of CPU power states of logical CPU cores should adhere to the range of CPU P and C states defined in the \"cpuOperationalPowerStates\" attribute.",
+                          "type": "string",
+                          "enum": [
+                            "STATIC",
+                            "DYNAMIC"
+                          ]
+                        },
+                        "cpuOperationalPowerStates": {
+                          "description": "Provides the lists of operational power states (i.e. P and C states) defined for the virtual CPU.\n* NOTE 2: In case the value of the \"cpuPowerStateManagementPolicy\" attribute is \"STATIC\", the cpuOperationalPowerStates attribute shall contain only one set of CPU P and C states requested for the virtual CPU. If the value of the cpuPowerStateManagementPolicy attribute is \"DYNAMIC\", multiple CPU P and C states can be defined to indicate the range of allowed P/C state values during dynamic power state management.",
+                          "type": "object"
+                        }
+                      }
                     }
                   }
                 }
@@ -602,6 +664,27 @@
                       "description": "A number defined in IETF RFC 8259.\n",
                       "type": "number"
                     }
+                  },
+                  "cpuPowerStateRequirements": {
+                    "description": "Requirements of virtual CPU power state configuration data for the virtual compute resource.\n",
+                    "type": "object",
+                    "required": [
+                      "cpuPowerStateManagementPolicy"
+                    ],
+                    "properties": {
+                      "cpuPowerStateManagementPolicy": {
+                        "description": "Indicates the policy for CPU power state management. Permitted values:\n  * STATIC\n  * DYNAMIC\nIn case of \"STATIC\", the virtual CPU cores are requested to be allocated to logical CPU cores according to the cpuOperationalPowerStates attribute. In case of \"DYNAMIC\", the CPU power states of virtual CPU cores can be allocated to logical CPU cores whose power states can be adjusted dynamically depending on core utilization (see note 1).\n",
+                        "type": "string",
+                        "enum": [
+                          "STATIC",
+                          "DYNAMIC"
+                        ]
+                      },
+                      "cpuOperationalPowerStates": {
+                        "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"
+                      }
+                    }
                   }
                 }
               },
@@ -635,7 +718,7 @@
           "type": "array",
           "minItems": 1,
           "items": {
-            "description": "This type represents information about an external CP of a VNF.\nNOTE 1:\tThe attributes \"associatedVnfcCpId\", \"associatedVipCpId\", \"associatedVirtualCpId\" and \n        \"associatedVnfVirtualLinkId\" are mutually exclusive. Exactly one shall be present.\nNOTE 2:\tAn external CP instance is not associated to a link port in the cases indicated for the \n        /"extLinkPorts/" attribute in clause 4.4.1.11.\nNOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network \n        attachment definition resource is needed to fulfil the connectivity requirements of the external \n        CP, e.g. to build a link redundant mated pair in SR-IOV cases.\nNOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.\n",
+            "description": "This type represents information about an external CP of a VNF.\nNOTE 1:\tThe attributes \"associatedVnfcCpId\", \"associatedVipCpId\", \"associatedVirtualCpId\" and \n        \"associatedVnfVirtualLinkId\" are mutually exclusive. Exactly one shall be present.\nNOTE 2:\tAn external CP instance is not associated to a link port in the cases indicated for the \n        \"extLinkPorts\" attribute in clause 4.4.1.11.\nNOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network \n        attachment definition resource is needed to fulfil the connectivity requirements of the external \n        CP, e.g. to build a link redundant mated pair in SR-IOV cases.\nNOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.\n",
             "type": "object",
             "required": [
               "id",
@@ -852,7 +935,7 @@
                 "type": "string"
               },
               "netAttDefResourceId": {
-                "description": "Identifier of the /"NetAttDefResourceInfo/" structure that provides the specification of the interface to attach the connection point to a secondary container cluster network. See notes 3 and 4. It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
+                "description": "Identifier of the \"NetAttDefResourceInfo\" structure that provides the specification of the interface to attach the connection point to a secondary container cluster network. See notes 3 and 4. It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
                 "type": "array",
                 "items": {
                   "description": "An identifier with the intention of being globally unique.\n",
@@ -866,6 +949,47 @@
                   "description": "An identifier with the intention of being globally unique.\n",
                   "type": "string"
                 }
+              },
+              "cpSecurityGroupInfo": {
+                "description": "List of active security group rules applied to this external CP instance. The attribute identifies which \"SecurityGroupRule\" specified in the VNFD are activated and the values of its attributes.\n",
+                "type": "object",
+                "required": [
+                  "securityGroupRuleId",
+                  "etherType",
+                  "protocol",
+                  "portRangeMin",
+                  "portRangeMax"
+                ],
+                "properties": {
+                  "securityGroupRuleId": {
+                    "description": "Identifier of the security group rule policy in the VNFD.\n",
+                    "type": "string"
+                  },
+                  "description": {
+                    "description": "Human readable description of the security group rule.\n",
+                    "type": "string"
+                  },
+                  "etherType": {
+                    "description": "Indicates the protocol carried over the Ethernet layer. Permitted values: IPV4, IPV6.\n",
+                    "type": "string",
+                    "enum": [
+                      "IPV4",
+                      "IPV6"
+                    ]
+                  },
+                  "protocol": {
+                    "description": "Indicates the protocol carried over the IP layer. Permitted values: any protocol defined in the IANA protocol registry (refer to clause 9.10.1.2 ofd ETSI GS NFV-SOL 001 for further information).\n",
+                    "type": "string"
+                  },
+                  "portRangeMin": {
+                    "description": "Value for the minimum port number in the range that is matched by the security group rule.\n",
+                    "type": "integer"
+                  },
+                  "portRangeMax": {
+                    "description": "Value for the maximum port number in the range that is matched by the security group rule.\n",
+                    "type": "integer"
+                  }
+                }
               }
             }
           }
@@ -1516,7 +1640,7 @@
                       "description": "Map of instance data that need to be configured on the CP instances created from the respective CPD. The key of the map which identifies the individual VnfExtCpConfig entries is of type \"IdentifierInVnf\" and is managed by the NFVO. The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). See notes 2, 3, 4, 5 and 6. In case of deleting an external CP, the list of instances to be deleted. \n",
                       "type": "object",
                       "additionalProperties": {
-                        "description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes /"netAttDefResourceId/" and /"cpProtocolData/" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
+                        "description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes \"netAttDefResourceId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
                         "anyOf": [
                           {
                             "required": [
@@ -1731,25 +1855,50 @@
                                   "type": "array",
                                   "items": {
                                     "type": "string"
-                                  } 
+                                  }
                                 },
                                 "relativeDomainNames": {
                                   "description": "Specifies values of relative domain names to be considered when setting  the fully qualified domain names.\n",
                                   "type": "array",
                                   "items": {
-                                    "type": "string"  
+                                    "type": "string"
                                   }
                                 }
                               }
                             }
                           },
                           "netAttDefResourceId": {
-                            "description": "Identifier of the /"NetAttDefResourceData/" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
+                            "description": "Identifier of the \"NetAttDefResourceData\" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
                             "type": "array",
                             "items": {
                               "description": "An identifier with the intention of being globally unique.\n",
                               "type": "string"
                             }
+                          },
+                          "cpSecurityGroupData": {
+                            "description": "Parameters for modifying and overriding security groups information bound to this CP. The parameters identify which \"SecurityGroupRule\" specified in the VNFD is activated/deactivated and for an activated security group rule the values of attributes defined in the VNFD that can be overridden such as \"portRangeMin\" and \"portRangeMax\". If no security group configuration is provided for a given \"SecurityGroupRule\" specified in the VNFD as part of this attribute, the VNFM shall use the configuration as specified in the VNFD.\n",
+                            "type": "object",
+                            "required": [
+                              "securityGroupRuleId"
+                            ],
+                            "properties": {
+                              "securityGroupRuleId": {
+                                "description": "Identifier of the security group rule policy in the VNFD.\n",
+                                "type": "string"
+                              },
+                              "isActivated": {
+                                "description": "Indicates whether the rule is to be active (true) or inactive (false). If no attribute value is provided, the Security Group Rule is activated by default.\n",
+                                "type": "boolean"
+                              },
+                              "portRangeMin": {
+                                "description": "Value for the minimum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+                                "type": "integer"
+                              },
+                              "portRangeMax": {
+                                "description": "Value for the maximum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+                                "type": "integer"
+                              }
+                            }
                           }
                         }
                       }
@@ -2480,7 +2629,7 @@
                       "type": "string"
                     },
                     "netAttDefResourceId": {
-                      "description": "Identifier of the /"NetAttDefResourceInfo/" structure that provides the specification of the interface  to attach the connection point to a secondary container cluster network. See notes 5 and 6. It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS  containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
+                      "description": "Identifier of the \"NetAttDefResourceInfo\" structure that provides the specification of the interface  to attach the connection point to a secondary container cluster network. See notes 5 and 6. It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS  containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
                       "type": "array",
                       "items": {
                         "description": "An identifier with the intention of being globally unique.\n",
@@ -2488,13 +2637,13 @@
                       }
                     },
                     "certificateContentId": {
-                        "description": "Identifier(s) of the \"CertificateContent\" structure that provides the information of the certificate(s) that this VNFC CP instance uses. Shall be present when using in delegation-mode. Otherwise shall not be present. This attribute shall be supported when delegation mode in certificate management is applicable.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "An identifier with the intention of being globally unique.\n",
-                          "type": "string"
-                        }
-                      },
+                      "description": "Identifier(s) of the \"CertificateContent\" structure that provides the information of the certificate(s) that this VNFC CP instance uses. Shall be present when using in delegation-mode. Otherwise shall not be present. This attribute shall be supported when delegation mode in certificate management is applicable.\n",
+                      "type": "array",
+                      "items": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      }
+                    },
                     "metadata": {
                       "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"
@@ -2512,7 +2661,7 @@
                 "items": {
                   "description": "An identifier with the intention of being globally unique.\n",
                   "type": "string"
-                }    
+                }
               }
             }
           }
@@ -2806,7 +2955,7 @@
           "description": "Information on the MCIO(s) representing VNFC instance(s) realized by one or a set of OS containers  and created from the same VDU for the VNF instance.\n",
           "type": "array",
           "items": {
-            "description": "This type provides information about an MCIO representing the set of VNFC instances realized by one  or a set of OS containers which have been created based on the same VDU. Within the CISM, an MCIO controller monitors the actual state of an MCIO representing the set of VNFC  instances realized by one or a set of OS containers and compare it to the desired state. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to FALSE the desired state is specified in the respective declarative descriptor. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to TRUE, the desired state is determined by the number of CIS-nodes in the cluster that fulfil the VDU requirements. It triggers actions toward the CIS to align the actual to the desired state. Monitoring the actual state includes monitoring the number of MCIO instances available at any specific point in time. In addition, an MCIO controller maintains properties and runtime information  on the MCIO instances which have been created based on the same VDU. The McioInfo data structure provides the runtime information on the MCIOs obtained from the MCIO controller.\nNOTE: There are different types of MCIOs. The set of VNFC instances based on the same VDU is represented \n      by one MCIO, e.g. of type Deployment. Each individual VNFC instance is represented by another type \n      of MCIO, e.g. a POD.\n\nRuntime information of the set of OS containers realizing an individual VNFC instance is not part of the  McioInfo data structure; such runtime information is provided in the ResourceHandle data structure  referenced from the VnfcResourceInfo. The McioInfo does not provide runtime information of a constituent  VNFC instance created based on a specific VDU.\nNOTE 1: The type of MCIO as specified in the declarative descriptor of the MCIO, and that can be read from \n        the CISM. EXAMPLE: In case of MCIOs managed by Kubernetes®, the type of MCIO corresponds to the \n        /"kind/" property of the declarative descriptor.\nNOTE 2: If the attribute additionalInfo is present, it may contain runtime information on the actual and \n        desired state of the MCIO(s).   \nNOTE 3: When the container infrastructure service is a Kubernetes® instance, the mcioId is the combined \n        values from the kind and name fields of the Kubernetes resource object, separated by a slash. \n        Example: \"Deployment/abcd\". \nNOTE 4: When the container infrastructure service is a Kubernetes® instance, the mcioName is the name \n        field of the resource object.          \n",
+            "description": "This type provides information about an MCIO representing the set of VNFC instances realized by one  or a set of OS containers which have been created based on the same VDU. Within the CISM, an MCIO controller monitors the actual state of an MCIO representing the set of VNFC  instances realized by one or a set of OS containers and compare it to the desired state. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to FALSE the desired state is specified in the respective declarative descriptor. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to TRUE, the desired state is determined by the number of CIS-nodes in the cluster that fulfil the VDU requirements. It triggers actions toward the CIS to align the actual to the desired state. Monitoring the actual state includes monitoring the number of MCIO instances available at any specific point in time. In addition, an MCIO controller maintains properties and runtime information  on the MCIO instances which have been created based on the same VDU. The McioInfo data structure provides the runtime information on the MCIOs obtained from the MCIO controller.\nNOTE: There are different types of MCIOs. The set of VNFC instances based on the same VDU is represented \n      by one MCIO, e.g. of type Deployment. Each individual VNFC instance is represented by another type \n      of MCIO, e.g. a POD.\n\nRuntime information of the set of OS containers realizing an individual VNFC instance is not part of the  McioInfo data structure; such runtime information is provided in the ResourceHandle data structure  referenced from the VnfcResourceInfo. The McioInfo does not provide runtime information of a constituent  VNFC instance created based on a specific VDU.\nNOTE 1: The type of MCIO as specified in the declarative descriptor of the MCIO, and that can be read from \n        the CISM. EXAMPLE: In case of MCIOs managed by Kubernetes®, the type of MCIO corresponds to the \n        \"kind\" property of the declarative descriptor.\nNOTE 2: If the attribute additionalInfo is present, it may contain runtime information on the actual and \n        desired state of the MCIO(s).   \nNOTE 3: When the container infrastructure service is a Kubernetes® instance, the mcioId is the combined \n        values from the kind and name fields of the Kubernetes resource object, separated by a slash. \n        Example: \"Deployment/abcd\". \nNOTE 4: When the container infrastructure service is a Kubernetes® instance, the mcioName is the name \n        field of the resource object.          \n",
             "type": "object",
             "required": [
               "mcioId",
@@ -2940,7 +3089,7 @@
       }
     },
     "metadata": {
-    	"description": "Additional VNF-specific attributes that provide metadata describing the VNF instance. These attributes represent values that are stored persistently in the VnfInstance  structure for consumption by functional blocks that invoke the VNF lifecycle management  interface. They are not consumed by the VNFM, or the lifecycle management scripts.\nModifying the values of these attributes has no effect on the VNF instance, it only  affects the information represented in the VnfInstance structure. Metadata that the VNF provider foresees are expected to be declared in the VNFD. (clause  6.2.35 in ETSI GS NFV-SOL 001 [12]), like information about supported protocols and data  models for configuring the VNF. The declaration of metadata in the VNFD can optionally contain the  specification of initial values. See notes 2 and 4. The VNFM shall accept requests to write metadata  that are not declared in the VNFD.\nThese attributes can be initialized with default values from VNFD (see note 4) and/or with values passed in the CreateVnfRequest structure (see clause 5.5.2.3).\nThese attributes can be created, modified or removed with the PATCH method.\n",
+      "description": "Additional VNF-specific attributes that provide metadata describing the VNF instance. These attributes represent values that are stored persistently in the VnfInstance  structure for consumption by functional blocks that invoke the VNF lifecycle management  interface. They are not consumed by the VNFM, or the lifecycle management scripts.\nModifying the values of these attributes has no effect on the VNF instance, it only  affects the information represented in the VnfInstance structure. Metadata that the VNF provider foresees are expected to be declared in the VNFD. (clause  6.2.35 in ETSI GS NFV-SOL 001 [12]), like information about supported protocols and data  models for configuring the VNF. The declaration of metadata in the VNFD can optionally contain the  specification of initial values. See notes 2 and 4. The VNFM shall accept requests to write metadata  that are not declared in the VNFD.\nThese attributes can be initialized with default values from VNFD (see note 4) and/or with values passed in the CreateVnfRequest structure (see clause 5.5.2.3).\nThese attributes can be created, modified or removed with the PATCH method.\n",
       "type": "object"
     },
     "extensions": {
@@ -3124,6 +3273,194 @@
           }
         }
       }
+    },
+    "recentVnfLcmOperationLinks": {
+      "description": "Links to the most recent LCM operation occurrences related to this resource. See note 9.\n",
+      "type": "object",
+      "properties": {
+        "recentVnfLcmOperation": {
+          "description": "Link to the most recent LCM operation occurrence of any type that has been triggered on this VNF instance, such as Instantiate, Scale or Heal.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmInstantiation": {
+          "description": "Link to the most recent LCM operation occurrence of type \"INSTANTIATE\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmScale": {
+          "description": "Link to the most recent LCM operation occurrence of type \"SCALE\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmScaleToLevel": {
+          "description": "Link to the most recent LCM operation occurrence of type \"SCALE_TO_LEVEL\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmChangeFlavour": {
+          "description": "Link to the most recent LCM operation occurrence of type \"CHANGE_FLAVOUR\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmTerminate": {
+          "description": "Link to the most recent LCM operation occurrence of type \"TERMINATE\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmHeal": {
+          "description": "Link to the most recent LCM operation occurrence of type \"HEAL\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmOperate": {
+          "description": "Link to the most recent LCM operation occurrence of type \"OPERATE\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmChangeExtConn": {
+          "description": "Link to the most recent LCM operation occurrence of type \"CHANGE_EXT_CONN\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmModifyInfo": {
+          "description": "Link to the most recent LCM operation occurrence of type \"MODIFY_INFO\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmCreateSnapshot": {
+          "description": "Link to the most recent LCM operation occurrence of type \"CREATE_SNAPSHOT\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmRevertToSnapshot": {
+          "description": "Link to the most recent LCM operation occurrence of type \"REVERT_TO_SNAPSHOT\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmChangeVnfPkg": {
+          "description": "Link to the most recent LCM operation occurrence of type \"CHANGE_VNFPKG\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "recentVnfLcmSelectDplMods": {
+          "description": "Link to the most recent LCM operation occurrence of type \"SELECT_DEPL_MODS\" that has been triggered on this VNF instance.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        }
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/vnfInstances.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/vnfInstances.schema.json
index b8b526e57d5c198cd77a68aa9ad10e9bfa1154dc..acf9f478758de5eeb891893ebd9539a52c558864 100644
--- a/SOL002/VNFLifecycleManagement-API/schemas/vnfInstances.schema.json
+++ b/SOL002/VNFLifecycleManagement-API/schemas/vnfInstances.schema.json
@@ -1,7 +1,7 @@
 {
   "type": "array",
   "items": {
-    "description": "This type represents a VNF instance. * NOTE 1:\tModifying the value of this attribute shall not be performed when conflicts exist\n          between the previous and the newly referred VNF package, i.e. when the new VNFD is\n          changed with respect to the previous VNFD in other aspects than merely referencing\n          to other VNF software images. In order to avoid misalignment of the VnfInstance with\n          the current VNF's on-boarded VNF package, the values of attributes in the VnfInstance\n          that have corresponding attributes in the VNFD shall be kept in sync with the values in the VNFD.\n* NOTE 2:\tETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. * NOTE 3:\tThese attributes are sometimes also referred to as configuration parameters\n          applicable to a VNF. Some of these are set prior to instantiation and cannot be modified\n          if the VNF is instantiated, some are set prior to instantiation (are part of initial configuration)\n          and can be modified later, and others can be set only after instantiation.\n          The applicability of certain configuration may depend on the VNF and the required operation of\n          the VNF at a certain point in time.\n* NOTE 4:\tUpon creation of the VnfInstance structure, the VNFM shall create and initialize all child\n          attributes of \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that were declared\n          in the VNFD with a defined initial value. The defined initial values can be declared in the VNFD,\n          and/or, in case of \"metadata\", obtained from the \"CreateVnfRequest\" structure. Child attributes of\n          \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that have no defined initial value shall\n          not be created, in order to be consistent with the semantics of the JSON Merge Patch method\n          (see IETF RFC 7396) that interprets null values as deletion request.\n* NOTE 5:\tIt is possible to have several ExtManagedVirtualLinkInfo for the same VNF internal VL in case\n          of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkInfo corresponding\n          to the same VNF internal VL shall indicate so by referencing to the same VnfVirtualLinkDesc\n          and externally-managed multi-site VL instance (refer to clause 5.5.3.5).\n* NOTE 6:\tEven though externally-managed internal VLs are also used for VNF-internal connectivity,\n          they shall not be listed in the \"vnfVirtualLinkResourceInfo\" attribute as this would be redundant.\n* NOTE 7: Subports need not be used for containerized VNFCs. The application container can send and receive IP \n          packets with any VLAN tag as long as the network interface to connect to the secondary container cluster \n          network has been configured appropriately. Thus, no individual extCpInfo, except the one representing the \n          trunk, need be modelled to allow traffic tagged with a particular VLAN through the connection point.\n* NOTE 8: For a scaling aspect whose related VNFCs have not been instantiated due to the selection of deployable \n          modules, the /"scaleStatus/" indicates the scale level that would be applicable to the aspect if a VNF LCM \n          operation changes the selected deployable modules and the related VNFCs are instantiated, unless the VNF \n          LCM operation explicitly indicates the scale level for the aspect.\n",
+    "description": "This type represents a VNF instance. * NOTE 1:\tModifying the value of this attribute shall not be performed when conflicts exist\n          between the previous and the newly referred VNF package, i.e. when the new VNFD is\n          changed with respect to the previous VNFD in other aspects than merely referencing\n          to other VNF software images. In order to avoid misalignment of the VnfInstance with\n          the current VNF's on-boarded VNF package, the values of attributes in the VnfInstance\n          that have corresponding attributes in the VNFD shall be kept in sync with the values in the VNFD.\n* NOTE 2:\tETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. * NOTE 3:\tThese attributes are sometimes also referred to as configuration parameters\n          applicable to a VNF. Some of these are set prior to instantiation and cannot be modified\n          if the VNF is instantiated, some are set prior to instantiation (are part of initial configuration)\n          and can be modified later, and others can be set only after instantiation.\n          The applicability of certain configuration may depend on the VNF and the required operation of\n          the VNF at a certain point in time.\n* NOTE 4:\tUpon creation of the VnfInstance structure, the VNFM shall create and initialize all child\n          attributes of \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that were declared\n          in the VNFD with a defined initial value. The defined initial values can be declared in the VNFD,\n          and/or, in case of \"metadata\", obtained from the \"CreateVnfRequest\" structure. Child attributes of\n          \"vnfConfigurableProperties\", \"metadata\" and \"extensions\" that have no defined initial value shall\n          not be created, in order to be consistent with the semantics of the JSON Merge Patch method\n          (see IETF RFC 7396) that interprets null values as deletion request.\n* NOTE 5:\tIt is possible to have several ExtManagedVirtualLinkInfo for the same VNF internal VL in case\n          of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkInfo corresponding\n          to the same VNF internal VL shall indicate so by referencing to the same VnfVirtualLinkDesc\n          and externally-managed multi-site VL instance (refer to clause 5.5.3.5).\n* NOTE 6:\tEven though externally-managed internal VLs are also used for VNF-internal connectivity,\n          they shall not be listed in the \"vnfVirtualLinkResourceInfo\" attribute as this would be redundant.\n* NOTE 7: Subports need not be used for containerized VNFCs. The application container can send and receive IP \n          packets with any VLAN tag as long as the network interface to connect to the secondary container cluster \n          network has been configured appropriately. Thus, no individual extCpInfo, except the one representing the \n          trunk, need be modelled to allow traffic tagged with a particular VLAN through the connection point.\n* NOTE 8: For a scaling aspect whose related VNFCs have not been instantiated due to the selection of deployable \n          modules, the “scaleStatus” indicates the scale level that would be applicable to the aspect if a VNF LCM \n          operation changes the selected deployable modules and the related VNFCs are instantiated, unless the VNF \n          LCM operation explicitly indicates the scale level for the aspect.\n* NOTE 9: The recentVnfLcmOperationLinks attribute does not provide a complete historical record of LCM changes\n          that a VNF instance experienced during its lifecycle. The information in this attribute should not be used to\n          create a chronological order of events that cannot be inferred by looking only at the most recent operation\n          occurrences due to potential gaps in timeline. This is because there can be many possible combination of\n          LCM changes that a VNF may have gone through between two operation occurrences recorded in the\n          recentVnfLcmOperationLinks attribute. For example, there can be many scaling related LCM changes since\n          an individual VNF instance has been instantiated until the most recent scaling operation occurrence linked in\n          the attribute. In another example, the most recent LCM operation occurrence related to instantiate VNF\n          operation may be more recent than the one that caused the VNF instance to be terminated last time, which\n          prevents the possibility to create a meaningful chronological timeline of VNF LCM events.\n",
     "type": "object",
     "required": [
       "id",
@@ -354,6 +354,47 @@
               "STOPPED"
             ]
           },
+          "vnfPowerState": {
+            "description": "The power state of the VNF instance. Only present if the VNF instance\n is in a power state or a scale status (refer to attribute \"scaleStatus\")\n that has an associated power profile, as defined in the VNFD.\n",
+            "type": "object",
+            "required": [
+              "powerProfileId",
+              "name"
+            ],
+            "properties": {
+              "powerProfileId": {
+                "description": "Identifier of the power profile, as defined in the VNFD, applied to the VNF instance.\n",
+                "type": "string"
+              },
+              "name": {
+                "description": "Name of the power profile as provided in the VNFD.\n",
+                "type": "string"
+              },
+              "powerConsumptionInfo": {
+                "description": "Estimated power consumption information of the resources associated with this power profile, as provided in the VNFD. VNFM exposes and can use this information to control the VNF instance to operate according to the power profile and selected power state, e.g. monitoring actual energy or power consumption of the VNF instance and compare against the estimated one.\n",   
+                "type": "object",
+                "required": [
+                  "minPowerConsumption",
+                  "maxPowerConsumption",
+                  "averagePowerConsumption"
+                ],
+                "properties": {
+                  "minPowerConsumption": {
+                    "description": "Minimum power consumption of this power profile. Unit is KW/h.\n",
+                    "type": "integer"
+                  },
+                  "maxPowerConsumption": {
+                    "description": "Maximum power consumption of this power profile. Unit is KW/h.\n",
+                    "type": "integer"
+                  },
+                  "averagePowerConsumption": {
+                    "description": "Average power consumption of this power profile. Unit is KW/h.\n",
+                    "type": "integer"
+                  }
+                }
+              }
+            }
+          },
           "scaleStatus": {
             "description": "Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how \"big\" the VNF has been scaled w.r.t. that aspect. This attribute shall be present if the VNF supports scaling. See clause B.2 for an explanation of VNF scaling. For an aspect that has not been deployed because the related deployableModule has not been selected, it indicates the scale level that has been requested in the instantiation or in a scaling operation, or, if none has been requested in any of them, the scale level applicable to the aspect based on the default instantiation level. See note 8.\n",
             "type": "array",
@@ -543,6 +584,27 @@
                           "description": "A number defined in IETF RFC 8259.\n",
                           "type": "number"
                         }
+                      },
+                      "cpuPowerStateRequirements": {
+                        "description": "Requirements of virtual CPU power state configuration data for the OS container resource.\n",
+                        "type": "object",
+                        "required": [
+                          "cpuPowerStateManagementPolicy"
+                        ],
+                        "properties": {
+                          "cpuPowerStateManagementPolicy": {
+                            "description": "Indicates the policy for CPU power state management. Permitted values:\n  * STATIC\n  * DYNAMIC\nIn case of \"STATIC\", the virtual CPU cores are requested to be allocated to logical CPU cores according to the cpuOperationalPowerStates attribute. In case of \"DYNAMIC\", the CPU power states of virtual CPU cores can be allocated to logical CPU cores whose power states can be adjusted dynamically depending on core utilization\n* NOTE 1: In case the value of the \"cpuPowerStateManagementPolicy\" attribute is \"DYNAMIC\", dynamic adjustment of CPU power states of logical CPU cores should adhere to the range of CPU P and C states defined in the \"cpuOperationalPowerStates\" attribute.",
+                            "type": "string",
+                            "enum": [
+                              "STATIC",
+                              "DYNAMIC"
+                            ]
+                          },
+                          "cpuOperationalPowerStates": {
+                            "description": "Provides the lists of operational power states (i.e. P and C states) defined for the virtual CPU.\n* NOTE 2: In case the value of the \"cpuPowerStateManagementPolicy\" attribute is \"STATIC\", the cpuOperationalPowerStates attribute shall contain only one set of CPU P and C states requested for the virtual CPU. If the value of the cpuPowerStateManagementPolicy attribute is \"DYNAMIC\", multiple CPU P and C states can be defined to indicate the range of allowed P/C state values during dynamic power state management.",
+                            "type": "object"
+                          }
+                        }
                       }
                     }
                   }
@@ -604,6 +666,27 @@
                         "description": "A number defined in IETF RFC 8259.\n",
                         "type": "number"
                       }
+                    },
+                    "cpuPowerStateRequirements": {
+                      "description": "Requirements of virtual CPU power state configuration data for the virtual compute resource.\n",
+                      "type": "object",
+                      "required": [
+                        "cpuPowerStateManagementPolicy"
+                      ],
+                      "properties": {
+                        "cpuPowerStateManagementPolicy": {
+                          "description": "Indicates the policy for CPU power state management. Permitted values:\n  * STATIC\n  * DYNAMIC\nIn case of \"STATIC\", the virtual CPU cores are requested to be allocated to logical CPU cores according to the cpuOperationalPowerStates attribute. In case of \"DYNAMIC\", the CPU power states of virtual CPU cores can be allocated to logical CPU cores whose power states can be adjusted dynamically depending on core utilization (see note 1).\n",
+                          "type": "string",
+                          "enum": [
+                            "STATIC",
+                            "DYNAMIC"
+                          ]
+                        },
+                        "cpuOperationalPowerStates": {
+                          "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"
+                        }
+                      }
                     }
                   }
                 },
@@ -637,7 +720,7 @@
             "type": "array",
             "minItems": 1,
             "items": {
-              "description": "This type represents information about an external CP of a VNF.\nNOTE 1:\tThe attributes \"associatedVnfcCpId\", \"associatedVipCpId\", \"associatedVirtualCpId\" and \n        \"associatedVnfVirtualLinkId\" are mutually exclusive. Exactly one shall be present.\nNOTE 2:\tAn external CP instance is not associated to a link port in the cases indicated for the \n        /"extLinkPorts/" attribute in clause 4.4.1.11.\nNOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network \n        attachment definition resource is needed to fulfil the connectivity requirements of the external \n        CP, e.g. to build a link redundant mated pair in SR-IOV cases.\nNOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.\n",
+              "description": "This type represents information about an external CP of a VNF.\nNOTE 1:\tThe attributes \"associatedVnfcCpId\", \"associatedVipCpId\", \"associatedVirtualCpId\" and \n        \"associatedVnfVirtualLinkId\" are mutually exclusive. Exactly one shall be present.\nNOTE 2:\tAn external CP instance is not associated to a link port in the cases indicated for the \n        \"extLinkPorts\" attribute in clause 4.4.1.11.\nNOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network \n        attachment definition resource is needed to fulfil the connectivity requirements of the external \n        CP, e.g. to build a link redundant mated pair in SR-IOV cases.\nNOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.\n",
               "type": "object",
               "required": [
                 "id",
@@ -854,7 +937,7 @@
                   "type": "string"
                 },
                 "netAttDefResourceId": {
-                  "description": "Identifier of the /"NetAttDefResourceInfo/" structure that provides the specification of the interface to attach the connection point to a secondary container cluster network. See notes 3 and 4. It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
+                  "description": "Identifier of the \"NetAttDefResourceInfo\" structure that provides the specification of the interface to attach the connection point to a secondary container cluster network. See notes 3 and 4. It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
                   "type": "array",
                   "items": {
                     "description": "An identifier with the intention of being globally unique.\n",
@@ -868,6 +951,47 @@
                     "description": "An identifier with the intention of being globally unique.\n",
                     "type": "string"
                   }
+                },
+                "cpSecurityGroupInfo": {
+                  "description": "List of active security group rules applied to this external CP instance. The attribute identifies which \"SecurityGroupRule\" specified in the VNFD are activated and the values of its attributes.\n",
+                  "type": "object",
+                  "required": [
+                    "securityGroupRuleId",
+                    "etherType",
+                    "protocol",
+                    "portRangeMin",
+                    "portRangeMax"
+                  ],
+                  "properties": {
+                    "securityGroupRuleId": {
+                      "description": "Identifier of the security group rule policy in the VNFD.\n",
+                      "type": "string"
+                    },
+                    "description": {
+                      "description": "Human readable description of the security group rule.\n",
+                      "type": "string"
+                    },
+                    "etherType": {
+                      "description": "Indicates the protocol carried over the Ethernet layer. Permitted values: IPV4, IPV6.\n",
+                      "type": "string",
+                      "enum": [
+                        "IPV4",
+                        "IPV6"
+                      ]
+                    },
+                    "protocol": {
+                      "description": "Indicates the protocol carried over the IP layer. Permitted values: any protocol defined in the IANA protocol registry (refer to clause 9.10.1.2 ofd ETSI GS NFV-SOL 001 for further information).\n",
+                      "type": "string"
+                    },
+                    "portRangeMin": {
+                      "description": "Value for the minimum port number in the range that is matched by the security group rule.\n",
+                      "type": "integer"
+                    },
+                    "portRangeMax": {
+                      "description": "Value for the maximum port number in the range that is matched by the security group rule.\n",
+                      "type": "integer"
+                    }
+                  }
                 }
               }
             }
@@ -1518,7 +1642,7 @@
                         "description": "Map of instance data that need to be configured on the CP instances created from the respective CPD. The key of the map which identifies the individual VnfExtCpConfig entries is of type \"IdentifierInVnf\" and is managed by the NFVO. The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). See notes 2, 3, 4, 5 and 6. In case of deleting an external CP, the list of instances to be deleted. \n",
                         "type": "object",
                         "additionalProperties": {
-                          "description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes /"netAttDefResourceId/" and /"cpProtocolData/" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
+                          "description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes \"netAttDefResourceId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
                           "anyOf": [
                             {
                               "required": [
@@ -1739,19 +1863,44 @@
                                     "description": "Specifies values of relative domain names to be considered when setting  the fully qualified domain names.\n",
                                     "type": "array",
                                     "items": {
-                                      "type": "string"  
-                                    } 
+                                      "type": "string"
+                                    }
                                   }
                                 }
                               }
                             },
                             "netAttDefResourceId": {
-                              "description": "Identifier of the /"NetAttDefResourceData/" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
+                              "description": "Identifier of the \"NetAttDefResourceData\" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
                               "type": "array",
                               "items": {
                                 "description": "An identifier with the intention of being globally unique.\n",
                                 "type": "string"
                               }
+                            },
+                            "cpSecurityGroupData": {
+                              "description": "Parameters for modifying and overriding security groups information bound to this CP. The parameters identify which \"SecurityGroupRule\" specified in the VNFD is activated/deactivated and for an activated security group rule the values of attributes defined in the VNFD that can be overridden such as \"portRangeMin\" and \"portRangeMax\". If no security group configuration is provided for a given \"SecurityGroupRule\" specified in the VNFD as part of this attribute, the VNFM shall use the configuration as specified in the VNFD.\n",
+                              "type": "object",
+                              "required": [
+                                "securityGroupRuleId"
+                              ],
+                              "properties": {
+                                "securityGroupRuleId": {
+                                  "description": "Identifier of the security group rule policy in the VNFD.\n",
+                                  "type": "string"
+                                },
+                                "isActivated": {
+                                  "description": "Indicates whether the rule is to be active (true) or inactive (false). If no attribute value is provided, the Security Group Rule is activated by default.\n",
+                                  "type": "boolean"
+                                },
+                                "portRangeMin": {
+                                  "description": "Value for the minimum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+                                  "type": "integer"
+                                },
+                                "portRangeMax": {
+                                  "description": "Value for the maximum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+                                  "type": "integer"
+                                }
+                              }
                             }
                           }
                         }
@@ -2482,7 +2631,7 @@
                         "type": "string"
                       },
                       "netAttDefResourceId": {
-                        "description": "Identifier of the /"NetAttDefResourceInfo/" structure that provides the specification of the interface  to attach the connection point to a secondary container cluster network. See notes 5 and 6. It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS  containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
+                        "description": "Identifier of the \"NetAttDefResourceInfo\" structure that provides the specification of the interface  to attach the connection point to a secondary container cluster network. See notes 5 and 6. It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS  containers and is connected to a secondary container cluster network. It shall not be present otherwise.\n",
                         "type": "array",
                         "items": {
                           "description": "An identifier with the intention of being globally unique.\n",
@@ -2808,7 +2957,7 @@
             "description": "Information on the MCIO(s) representing VNFC instance(s) realized by one or a set of OS containers  and created from the same VDU for the VNF instance.\n",
             "type": "array",
             "items": {
-              "description": "This type provides information about an MCIO representing the set of VNFC instances realized by one  or a set of OS containers which have been created based on the same VDU. Within the CISM, an MCIO controller monitors the actual state of an MCIO representing the set of VNFC  instances realized by one or a set of OS containers and compare it to the desired state. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to FALSE the desired state is specified in the respective declarative descriptor. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to TRUE, the desired state is determined by the number of CIS-nodes in the cluster that fulfil the VDU requirements. It triggers actions toward the CIS to align the actual to the desired state. Monitoring the actual state includes monitoring the number of MCIO instances available at any specific point in time. In addition, an MCIO controller maintains properties and runtime information  on the MCIO instances which have been created based on the same VDU. The McioInfo data structure provides the runtime information on the MCIOs obtained from the MCIO controller.\nNOTE: There are different types of MCIOs. The set of VNFC instances based on the same VDU is represented \n      by one MCIO, e.g. of type Deployment. Each individual VNFC instance is represented by another type \n      of MCIO, e.g. a POD.\n\nRuntime information of the set of OS containers realizing an individual VNFC instance is not part of the  McioInfo data structure; such runtime information is provided in the ResourceHandle data structure  referenced from the VnfcResourceInfo. The McioInfo does not provide runtime information of a constituent  VNFC instance created based on a specific VDU.\nNOTE 1: The type of MCIO as specified in the declarative descriptor of the MCIO, and that can be read from \n        the CISM. EXAMPLE: In case of MCIOs managed by Kubernetes®, the type of MCIO corresponds to the \n        /"kind/" property of the declarative descriptor.\nNOTE 2: If the attribute additionalInfo is present, it may contain runtime information on the actual and \n        desired state of the MCIO(s).   \nNOTE 3: When the container infrastructure service is a Kubernetes® instance, the mcioId is the combined \n        values from the kind and name fields of the Kubernetes resource object, separated by a slash. \n        Example: \"Deployment/abcd\". \nNOTE 4: When the container infrastructure service is a Kubernetes® instance, the mcioName is the name \n        field of the resource object.          \n",
+              "description": "This type provides information about an MCIO representing the set of VNFC instances realized by one  or a set of OS containers which have been created based on the same VDU. Within the CISM, an MCIO controller monitors the actual state of an MCIO representing the set of VNFC  instances realized by one or a set of OS containers and compare it to the desired state. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to FALSE the desired state is specified in the respective declarative descriptor. For an MCIO related to a VDU that has the attribute \"isNumOfInstancesClusterBased\" set to TRUE, the desired state is determined by the number of CIS-nodes in the cluster that fulfil the VDU requirements. It triggers actions toward the CIS to align the actual to the desired state. Monitoring the actual state includes monitoring the number of MCIO instances available at any specific point in time. In addition, an MCIO controller maintains properties and runtime information  on the MCIO instances which have been created based on the same VDU. The McioInfo data structure provides the runtime information on the MCIOs obtained from the MCIO controller.\nNOTE: There are different types of MCIOs. The set of VNFC instances based on the same VDU is represented \n      by one MCIO, e.g. of type Deployment. Each individual VNFC instance is represented by another type \n      of MCIO, e.g. a POD.\n\nRuntime information of the set of OS containers realizing an individual VNFC instance is not part of the  McioInfo data structure; such runtime information is provided in the ResourceHandle data structure  referenced from the VnfcResourceInfo. The McioInfo does not provide runtime information of a constituent  VNFC instance created based on a specific VDU.\nNOTE 1: The type of MCIO as specified in the declarative descriptor of the MCIO, and that can be read from \n        the CISM. EXAMPLE: In case of MCIOs managed by Kubernetes®, the type of MCIO corresponds to the \n        \"kind\" property of the declarative descriptor.\nNOTE 2: If the attribute additionalInfo is present, it may contain runtime information on the actual and \n        desired state of the MCIO(s).   \nNOTE 3: When the container infrastructure service is a Kubernetes® instance, the mcioId is the combined \n        values from the kind and name fields of the Kubernetes resource object, separated by a slash. \n        Example: \"Deployment/abcd\". \nNOTE 4: When the container infrastructure service is a Kubernetes® instance, the mcioName is the name \n        field of the resource object.          \n",
               "type": "object",
               "required": [
                 "mcioId",
@@ -2942,7 +3091,7 @@
         }
       },
       "metadata": {
-    		"description": "Additional VNF-specific attributes that provide metadata describing the VNF instance. These attributes represent values that are stored persistently in the VnfInstance  structure for consumption by functional blocks that invoke the VNF lifecycle management  interface. They are not consumed by the VNFM, or the lifecycle management scripts.\nModifying the values of these attributes has no effect on the VNF instance, it only  affects the information represented in the VnfInstance structure. Metadata that the VNF provider foresees are expected to be declared in the VNFD. (clause  6.2.35 in ETSI GS NFV-SOL 001 [12]), like information about supported protocols and data  models for configuring the VNF. The declaration of metadata in the VNFD can optionally contain the  specification of initial values. See notes 2 and 4. The VNFM shall accept requests to write metadata  that are not declared in the VNFD.\nThese attributes can be initialized with default values from VNFD (see note 4) and/or with values passed in the CreateVnfRequest structure (see clause 5.5.2.3).\nThese attributes can be created, modified or removed with the PATCH method.\n",
+        "description": "Additional VNF-specific attributes that provide metadata describing the VNF instance. These attributes represent values that are stored persistently in the VnfInstance  structure for consumption by functional blocks that invoke the VNF lifecycle management  interface. They are not consumed by the VNFM, or the lifecycle management scripts.\nModifying the values of these attributes has no effect on the VNF instance, it only  affects the information represented in the VnfInstance structure. Metadata that the VNF provider foresees are expected to be declared in the VNFD. (clause  6.2.35 in ETSI GS NFV-SOL 001 [12]), like information about supported protocols and data  models for configuring the VNF. The declaration of metadata in the VNFD can optionally contain the  specification of initial values. See notes 2 and 4. The VNFM shall accept requests to write metadata  that are not declared in the VNFD.\nThese attributes can be initialized with default values from VNFD (see note 4) and/or with values passed in the CreateVnfRequest structure (see clause 5.5.2.3).\nThese attributes can be created, modified or removed with the PATCH method.\n",
         "type": "object"
       },
       "extensions": {
@@ -3126,6 +3275,194 @@
             }
           }
         }
+      },
+      "recentVnfLcmOperationLinks": {
+        "description": "Links to the most recent LCM operation occurrences related to this resource. See note 9.\n",
+        "type": "object",
+        "properties": {
+          "recentVnfLcmOperation": {
+            "description": "Link to the most recent LCM operation occurrence of any type that has been triggered on this VNF instance, such as Instantiate, Scale or Heal.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmInstantiation": {
+            "description": "Link to the most recent LCM operation occurrence of type \"INSTANTIATE\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmScale": {
+            "description": "Link to the most recent LCM operation occurrence of type \"SCALE\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmScaleToLevel": {
+            "description": "Link to the most recent LCM operation occurrence of type \"SCALE_TO_LEVEL\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmChangeFlavour": {
+            "description": "Link to the most recent LCM operation occurrence of type \"CHANGE_FLAVOUR\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmTerminate": {
+            "description": "Link to the most recent LCM operation occurrence of type \"TERMINATE\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmHeal": {
+            "description": "Link to the most recent LCM operation occurrence of type \"HEAL\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmOperate": {
+            "description": "Link to the most recent LCM operation occurrence of type \"OPERATE\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmChangeExtConn": {
+            "description": "Link to the most recent LCM operation occurrence of type \"CHANGE_EXT_CONN\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmModifyInfo": {
+            "description": "Link to the most recent LCM operation occurrence of type \"MODIFY_INFO\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmCreateSnapshot": {
+            "description": "Link to the most recent LCM operation occurrence of type \"CREATE_SNAPSHOT\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmRevertToSnapshot": {
+            "description": "Link to the most recent LCM operation occurrence of type \"REVERT_TO_SNAPSHOT\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmChangeVnfPkg": {
+            "description": "Link to the most recent LCM operation occurrence of type \"CHANGE_VNFPKG\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "recentVnfLcmSelectDplMods": {
+            "description": "Link to the most recent LCM operation occurrence of type \"SELECT_DEPL_MODS\" that has been triggered on this VNF instance.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json
index ecbdb7d2b0b38a274b6542a2e9a845363370145e..faa9cad8878a96a4639b061ba545132f80ad393e 100644
--- a/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json
+++ b/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOcc.schema.json
@@ -61,7 +61,7 @@
       "type": "string"
     },
     "operation": {
-      "description": "The enumeration LcmOpType defines the permitted values to represent  VNF lifecycle operation types in VNF lifecycle management operation  occurrence resources and VNF lifecycle management operation occurrence  notifications.\nValue | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation. CREATE_SNAPSHOT | Represents the \"Create VNF Snapshot\" LCM operation. REVERT_TO_SNAPSHOT | Represents the /"Revert-To VNF Snapshot\" LCM operation. CHANGE_VNFPKG | Represents the \"Change current VNF package\" LCM operation. SELECT_DEPL_MODS  | Represents the \"Select VNF deployable modules\" LCM operation \n",
+      "description": "The enumeration LcmOpType defines the permitted values to represent  VNF lifecycle operation types in VNF lifecycle management operation  occurrence resources and VNF lifecycle management operation occurrence  notifications.\nValue | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation. CREATE_SNAPSHOT | Represents the \"Create VNF Snapshot\" LCM operation. REVERT_TO_SNAPSHOT | Represents the \"Revert-To VNF Snapshot\" LCM operation. CHANGE_VNFPKG | Represents the \"Change current VNF package\" LCM operation. SELECT_DEPL_MODS  | Represents the \"Select VNF deployable modules\" LCM operation \n",
       "type": "string",
       "enum": [
         "INSTANTIATE",
@@ -780,7 +780,7 @@
                   "description": "Map of instance data that need to be configured on the CP instances created from the respective CPD. The key of the map which identifies the individual VnfExtCpConfig entries is of type \"IdentifierInVnf\" and is managed by the NFVO. The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). See notes 2, 3, 4, 5 and 6. In case of deleting an external CP, the list of instances to be deleted. \n",
                   "type": "object",
                   "additionalProperties": {
-                    "description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes /"netAttDefResourceId/" and /"cpProtocolData/" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
+                    "description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes \"netAttDefResourceId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
                     "anyOf": [
                       {
                         "required": [
@@ -995,107 +995,142 @@
                               "type": "array",
                               "items": {
                                 "type": "string"
-                            },
-                            "relativeDomainNames": {
-                              "description": "Specifies values of relative domain names to be considered when setting  the fully qualified domain names.\n",
-                              "type": "array",
-                              "items": {
-                                "type": "string"      
+                              },
+                              "relativeDomainNames": {
+                                "description": "Specifies values of relative domain names to be considered when setting  the fully qualified domain names.\n",
+                                "type": "array",
+                                "items": {
+                                  "type": "string"
+                                }
+                              }
+                            }
+                          },
+                          "netAttDefResourceId": {
+                            "description": "Identifier of the \"NetAttDefResourceData\" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
+                            "type": "array",
+                            "items": {
+                              "description": "An identifier with the intention of being globally unique.\n",
+                              "type": "string"
                             }
                           }
                         }
-                      },    
+                      },
                       "netAttDefResourceId": {
-                        "description": "Identifier of the /"NetAttDefResourceData/" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
+                        "description": "Identifier of the \"NetAttDefResourceData\" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
                         "type": "array",
                         "items": {
                           "description": "An identifier with the intention of being globally unique.\n",
                           "type": "string"
                         }
+                      },
+                      "cpSecurityGroupData": {
+                        "description": "Parameters for modifying and overriding security groups information bound to this CP. The parameters identify which \"SecurityGroupRule\" specified in the VNFD is activated/deactivated and for an activated security group rule the values of attributes defined in the VNFD that can be overridden such as \"portRangeMin\" and \"portRangeMax\". If no security group configuration is provided for a given \"SecurityGroupRule\" specified in the VNFD as part of this attribute, the VNFM shall use the configuration as specified in the VNFD.\n",
+                        "type": "object",
+                        "required": [
+                          "securityGroupRuleId"
+                        ],
+                        "properties": {
+                          "securityGroupRuleId": {
+                            "description": "Identifier of the security group rule policy in the VNFD.\n",
+                            "type": "string"
+                          },
+                          "isActivated": {
+                            "description": "Indicates whether the rule is to be active (true) or inactive (false). If no attribute value is provided, the Security Group Rule is activated by default.\n",
+                            "type": "boolean"
+                          },
+                          "portRangeMin": {
+                            "description": "Value for the minimum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+                            "type": "integer"
+                          },
+                          "portRangeMax": {
+                            "description": "Value for the maximum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+                            "type": "integer"
+                          }
+                        }
                       }
                     }
                   }
                 }
-              }
-            }
-          },
-          "extNetAttDefResource": {
-            "description": "Network attachment definition resources that provide the specification of the interface to attach connection points  to this VL.\n",
-            "type": "array",
-            "items": {
-              "description": "This type contains information related to a network attachment definition resource that provides the  specification of the interface used to connect one or multiple connection points to a secondary container  cluster network.\n",
-              "type": "object",
-              "required": [
-                "netAttDefResourceInfoId",
-                "netAttDefResource"
-              ],
-              "properties": {
-                "netAttDefResourceInfoId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "netAttDefResource": {
+              },
+              "extNetAttDefResource": {
+                "description": "Network attachment definition resources that provide the specification of the interface to attach connection points  to this VL.\n",
+                "type": "array",
+                "items": {
+                  "description": "This type contains information related to a network attachment definition resource that provides the  specification of the interface used to connect one or multiple connection points to a secondary container  cluster network.\n",
+                  "type": "object",
                   "required": [
-                    "resourceId"
+                    "netAttDefResourceInfoId",
+                    "netAttDefResource"
                   ],
-                  "type": "object",
-                  "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n* NOTE 1: The information about the VIM or CISM connection referenced by the VIM connection id is known to the\n          VNFM. Moreover, the identifier of the VIM connection provides scope to the resourceId.\n\n* NOTE 2: The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or CISM or the resource \n          provider and can be used as information that complements the ResourceHandle. When the container\n          infrastructure service is a Kubernetes® instance the vimLevelResourceType is the type of resource, as would \n          correspond to the 'kind' field if the resource is declared in its own Kubernetes® manifest, e.g.: Pod, \n          PersistentVolumeClaim, NetworkAttachmentDefinition.\n\n* NOTE 3: When the container infrastructure service is a Kubernetes® instance the resourceId shall be populated in the \n          following way:\n          - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide \n          per resource type.\n          - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, \n          i.e. the value of the 'claimName' field in the Kubernetes® manifest, or a compound name built by \n          Kubernetes® if the persistent volume claim is defined inline in another template instead of in its own \n          manifest.\n          - For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of \n          the 'metadata.name' field in Kubernetes® manifest.\n",
                   "properties": {
-                    "vimConnectionId": {
-                      "description": "An identifier with the intention of being globally unique.\n",
-                      "type": "string"
-                    },
-                    "resourceProviderId": {
+                    "netAttDefResourceInfoId": {
                       "description": "An identifier with the intention of being globally unique.\n",
                       "type": "string"
                     },
-                    "resourceId": {
-                      "description": "An identifier maintained by the VIM  or the CISM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                      "type": "string"
-                    },
-                    "vimLevelResourceType": {
-                      "description": "Type of the resource in the scope of the VIM or the CISM or the resource provider. See note 2.\n",
-                      "type": "string"
-                    },
-                    "vimLevelAdditionalResourceInfo": {
-                      "description": "This type represents additional resource information which resource and resource type specific, and which is available from the VIM or the CISM or the resource provider.\n* NOTE: At least one attribute shall be present.\n",
+                    "netAttDefResource": {
+                      "required": [
+                        "resourceId"
+                      ],
                       "type": "object",
+                      "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n* NOTE 1: The information about the VIM or CISM connection referenced by the VIM connection id is known to the\n          VNFM. Moreover, the identifier of the VIM connection provides scope to the resourceId.\n\n* NOTE 2: The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or CISM or the resource \n          provider and can be used as information that complements the ResourceHandle. When the container\n          infrastructure service is a Kubernetes® instance the vimLevelResourceType is the type of resource, as would \n          correspond to the 'kind' field if the resource is declared in its own Kubernetes® manifest, e.g.: Pod, \n          PersistentVolumeClaim, NetworkAttachmentDefinition.\n\n* NOTE 3: When the container infrastructure service is a Kubernetes® instance the resourceId shall be populated in the \n          following way:\n          - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide \n          per resource type.\n          - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, \n          i.e. the value of the 'claimName' field in the Kubernetes® manifest, or a compound name built by \n          Kubernetes® if the persistent volume claim is defined inline in another template instead of in its own \n          manifest.\n          - For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of \n          the 'metadata.name' field in Kubernetes® manifest.\n",
                       "properties": {
-                        "hostName": {
-                          "description": "Name of the host where the resource is allocated. It shall be present for compute resources in the scope of the CISM and shall be absent otherwise. See note.\n",
+                        "vimConnectionId": {
+                          "description": "An identifier with the intention of being globally unique.\n",
                           "type": "string"
                         },
-                        "persistentVolume": {
-                          "description": "Name of the persistent volume to which the persistent volume claim representing the storage resource is bound. It may be present for storage resources in the scope of the CISM and shall be absent otherwise. See note.\n",
+                        "resourceProviderId": {
+                          "description": "An identifier with the intention of being globally unique.\n",
                           "type": "string"
                         },
-                        "additionalInfo": {
-                          "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"
+                        "resourceId": {
+                          "description": "An identifier maintained by the VIM  or the CISM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                          "type": "string"
+                        },
+                        "vimLevelResourceType": {
+                          "description": "Type of the resource in the scope of the VIM or the CISM or the resource provider. See note 2.\n",
+                          "type": "string"
+                        },
+                        "vimLevelAdditionalResourceInfo": {
+                          "description": "This type represents additional resource information which resource and resource type specific, and which is available from the VIM or the CISM or the resource provider.\n* NOTE: At least one attribute shall be present.\n",
+                          "type": "object",
+                          "properties": {
+                            "hostName": {
+                              "description": "Name of the host where the resource is allocated. It shall be present for compute resources in the scope of the CISM and shall be absent otherwise. See note.\n",
+                              "type": "string"
+                            },
+                            "persistentVolume": {
+                              "description": "Name of the persistent volume to which the persistent volume claim representing the storage resource is bound. It may be present for storage resources in the scope of the CISM and shall be absent otherwise. See note.\n",
+                              "type": "string"
+                            },
+                            "additionalInfo": {
+                              "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"
+                            }
+                          }
+                        },
+                        "containerNamespace": {
+                          "description": "The value of the namespace in which the MCIO corresponding to the resource is deployed. This attribute shall be present if the resource is managed by a CISM and it shall be absent otherwise.\n",
+                          "type": "string"
                         }
                       }
                     },
-                    "containerNamespace": {
-                      "description": "The value of the namespace in which the MCIO corresponding to the resource is deployed. This attribute shall be present if the resource is managed by a CISM and it shall be absent otherwise.\n",
-                      "type": "string"
+                    "associatedExtCpId": {
+                      "description": "Identifier of the external CP associated to this network attachment definition resource. Shall be present  when the network attachment definition resource is used for external connectivity by the VNF.\n",
+                      "type": "array",
+                      "items": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      }
+                    },
+                    "associatedVnfcCpId": {
+                      "description": "Identifier of the VNFC CP associated to this network attachment definition resource. May be present when  the network attachment definition resource is used for internal connectivity by the VNF.\n",
+                      "type": "array",
+                      "items": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      }
                     }
                   }
-                },
-                "associatedExtCpId": {
-                  "description": "Identifier of the external CP associated to this network attachment definition resource. Shall be present  when the network attachment definition resource is used for external connectivity by the VNF.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-                    "type": "string"
-                  }
-                },
-                "associatedVnfcCpId": {
-                  "description": "Identifier of the VNFC CP associated to this network attachment definition resource. May be present when  the network attachment definition resource is used for internal connectivity by the VNF.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-                    "type": "string"
-                  }
                 }
               }
             }
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOccs.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOccs.schema.json
index eae1d4797355d55f0391a9f3d074df4f11705b04..88b087c73da0450f6e7e678865d7a2d6a3f215bc 100644
--- a/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOccs.schema.json
+++ b/SOL002/VNFLifecycleManagement-API/schemas/vnfLcmOpOccs.schema.json
@@ -63,7 +63,7 @@
 				"type": "string"
 			},
 			"operation": {
-				"description": "The enumeration LcmOpType defines the permitted values to represent  VNF lifecycle operation types in VNF lifecycle management operation  occurrence resources and VNF lifecycle management operation occurrence  notifications.\nValue | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation. CREATE_SNAPSHOT | Represents the \"Create VNF Snapshot\" LCM operation. REVERT_TO_SNAPSHOT | Represents the /"Revert-To VNF Snapshot\" LCM operation. CHANGE_VNFPKG | Represents the \"Change current VNF package\" LCM operation. SELECT_DEPL_MODS  | Represents the \"Select VNF deployable modules\" LCM operation \n",
+				"description": "The enumeration LcmOpType defines the permitted values to represent  VNF lifecycle operation types in VNF lifecycle management operation  occurrence resources and VNF lifecycle management operation occurrence  notifications.\nValue | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation. CREATE_SNAPSHOT | Represents the \"Create VNF Snapshot\" LCM operation. REVERT_TO_SNAPSHOT | Represents the \"Revert-To VNF Snapshot\" LCM operation. CHANGE_VNFPKG | Represents the \"Change current VNF package\" LCM operation. SELECT_DEPL_MODS  | Represents the \"Select VNF deployable modules\" LCM operation \n",
 				"type": "string",
 				"enum": [
 					"INSTANTIATE",
@@ -779,10 +779,10 @@
 										"type": "string"
 									},
 									"cpConfig": {
-    									"description": "Map of instance data that need to be configured on the CP instances created from the respective CPD. The key of the map which identifies the individual VnfExtCpConfig entries is of type \"IdentifierInVnf\" and is managed by the NFVO. The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). See notes 2, 3, 4, 5 and 6. In case of deleting an external CP, the list of instances to be deleted. \n",
+										"description": "Map of instance data that need to be configured on the CP instances created from the respective CPD. The key of the map which identifies the individual VnfExtCpConfig entries is of type \"IdentifierInVnf\" and is managed by the NFVO. The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). See notes 2, 3, 4, 5 and 6. In case of deleting an external CP, the list of instances to be deleted. \n",
 										"type": "object",
 										"additionalProperties": {
-											"description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes /"netAttDefResourceId/" and /"cpProtocolData/" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
+											"description": "This type represents an externally provided link port, or a network attachment definition resource of secondary container cluster network, or network address information per instance of an external connection point. In the case of VM-based deployment of the VNFC exposing the external CP:\n  1.  In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the\n      external VL.\n  2.  In case a link port is not provided, the VNFM shall create a link port on the external VL and use that link port\n      to connect the external CP to the external VL.\nIn the case of container-based deployment of the VNFC exposing the external CP, the VNFM shall use the network attachment definition resource of secondary container cluster network when connecting the CP to the external VL.\n* NOTE 1: The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a virtual network not categorized as secondary container cluster network:\n          1) Void.\n          2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes shall be present for an external CP instance\n          representing a subport that is to be created, or an external CP instance that is to be created by creating the\n          corresponding VNFC or VNF instance during the current or a subsequent LCM operation, or for an existing\n          external CP instance that is to be re-configured or added to a particular external virtual link.\n          3) If the \"linkPortId\" attribute is absent, the VNFM shall create a link port.\n          4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\" attribute shall be provided referencing a\n          precreated link port, and the VNFM can use means outside the scope of the present document to obtain the\n          pre-configured address information for the connection point from the resource representing the link port.\n          5) If both \"cpProtocolData\" and \"linkportId\" are provided, the NFVO shall ensure that the\n          cpProtocolData can be used with the pre-created link port referenced by \"linkPortId\".\n\n* NOTE 2: The following conditions apply to the attributes \"netAttDefResourceId\" and \"cpProtocolData\" for an external CP\n          instance connected or to be connected to a secondary container cluster network:\n          1) Void.\n          2) The \"netAttDefResourceId\" attribute shall be present and the \"cpProtocolData\" attribute may be present for\n          a to-be-created external CP instance or an existing external CP instance.\n* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment\n          definition resource is needed to fulfil the connectivity requirements of the external CP, e.g. to build a link\n          redundant mated pair in SR-IOV cases. When more than one netAttDefResourceId is indicated, all shall belong\n          to the same namespace as defined by the corresponding \"containerNamespace\" attribute in the \"resourceHandle\" attribute\n          in the \"NetAttDefResourceData\".\n* NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.\n",
 											"anyOf": [
 												{
 													"required": [
@@ -803,7 +803,7 @@
 											"type": "object",
 											"properties": {
 												"parentCpConfigId": {
-                            						"description": "Value of the key that identifies the  \"VnfExtCpConfig\" map entry which corresponds to the parent port of the trunk.mOnly present in \"VnfExtCpConfig\" structures that provide configuration information for a CP which represents a sub-port in a trunk, and if parent ports are supported. In case of deletion of an external CP, the identifier of the external CP instance to delete.  Shall be present if this instance has already been created.\n",
+													"description": "Value of the key that identifies the  \"VnfExtCpConfig\" map entry which corresponds to the parent port of the trunk.mOnly present in \"VnfExtCpConfig\" structures that provide configuration information for a CP which represents a sub-port in a trunk, and if parent ports are supported. In case of deletion of an external CP, the identifier of the external CP instance to delete.  Shall be present if this instance has already been created.\n",
 													"type": "string"
 												},
 												"linkPortId": {
@@ -1003,21 +1003,44 @@
 																"description": "Specifies values of relative domain names to be considered when setting  the fully qualified domain names.\n",
 																"type": "array",
 																"items": {
-																	"type": "string"	
-
+																	"type": "string"
 																}
 															}
-
 														}
 													}
 												},
 												"netAttDefResourceId": {
-													"description": "Identifier of the /"NetAttDefResourceData/" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
+													"description": "Identifier of the \"NetAttDefResourceData\" structure that provides the specification of the interface to attach the external CP to a secondary container cluster network. It is only applicable if the external CP is connected or to be connected to a secondary container cluster network. It shall not be present if the external CP is related to a virtual network not categorized as secondary container cluster network. See notes 2, 3 and 4.\n",
 													"type": "array",
 													"items": {
 														"description": "An identifier with the intention of being globally unique.\n",
 														"type": "string"
 													}
+												},
+												"cpSecurityGroupData": {
+													"description": "Parameters for modifying and overriding security groups information bound to this CP. The parameters identify which \"SecurityGroupRule\" specified in the VNFD is activated/deactivated and for an activated security group rule the values of attributes defined in the VNFD that can be overridden such as \"portRangeMin\" and \"portRangeMax\". If no security group configuration is provided for a given \"SecurityGroupRule\" specified in the VNFD as part of this attribute, the VNFM shall use the configuration as specified in the VNFD.\n",
+													"type": "object",
+													"required": [
+														"securityGroupRuleId"
+													],
+													"properties": {
+														"securityGroupRuleId": {
+															"description": "Identifier of the security group rule policy in the VNFD.\n",
+															"type": "string"
+														},
+														"isActivated": {
+															"description": "Indicates whether the rule is to be active (true) or inactive (false). If no attribute value is provided, the Security Group Rule is activated by default.\n",
+															"type": "boolean"
+														},
+														"portRangeMin": {
+															"description": "Value for the minimum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+															"type": "integer"
+														},
+														"portRangeMax": {
+															"description": "Value for the maximum port number in the range that is matched by the security group rule. The value shall be within the range \"0 - 65535\".\n",
+															"type": "integer"
+														}
+													}
 												}
 											}
 										}
diff --git a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
index 341b9552cf8b65a90a232e078a3b0b1f169f3594..a837f6164c9a1f1922427243b48e2b84905b73f8 100644
--- a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
@@ -11,7 +11,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -23,7 +23,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -72,7 +72,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -84,7 +84,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,7 +109,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -121,7 +121,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.2.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index ab77669396b52d18ab4c3037aedd5e99011f6276..38cf5ab80187adf2b195904df8a50ad692aee7eb 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -14,7 +14,7 @@ GET individual VNF Performance Job
     ...    Test title: Get individual VNF Performance Job
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance monitoring job and perform a JSON schema and content validation of the collected job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -29,7 +29,7 @@ GET individual VNF Performance Job with invalid resource identifier
     ...    Test title: Get individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF 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 VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ DELETE Individual VNF Performance Job
     ...    Test title: Delete Individual VNF Performance Job
     ...    Test objective: The objective is to test the deletion of an individual VNF performance monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is no more available in the VNFM    
@@ -55,7 +55,7 @@ DELETE Individual VNF Performance Job with invalid resource identifier
     ...    Test title: Delete individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual VNF 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 VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ POST Individual VNF Performance Job - Method not implemented
     ...    Test title: POST Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Monitoring Job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -80,7 +80,7 @@ PUT Individual VNF Performance Job - Method not implemented
     ...    Test title: PUT Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance Monitoring Job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ PATCH Individual VNF Performance Job
     ...    Test title: PATCH Individual VNF Performance Job
     ...    Test objective: The objective is to test that PATCH method allows to modify an exsisting individual PM job resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -106,7 +106,7 @@ PATCH Individual VNF Performance Job - Precondition failed
     ...    Test title: PATCH Individual VNF Performance Job - Precondition failed
     ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
@@ -120,7 +120,7 @@ PATCH Individual VNF Performance Job - UNPROCESSABLE CONTENT
     ...    Test title: PATCH Individual VNF Performance Job - UNPROCESSABLE CONTENT
     ...    Test objective: The objective is to test that PATCH method cannot modify an exsisting individual PM job resource when the callback URI provided in the Request body is unreachable by the VNFM.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM cannot reach the Notification endpoint.
     ...    Post-Conditions: none
@@ -132,7 +132,7 @@ DELETE Individual VNF Performance Job with permitted authorization scope
     ...    Test title: Delete Individual VNF Performance Job with permitted authorization scope
     ...    Test objective: The objective is to test the deletion of an individual VNF performance monitoring job with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is no more available in the VNFM    
@@ -144,7 +144,7 @@ DELETE Individual VNF Performance Job with NOT permitted authorization scope
     ...    Test title: Delete Individual VNF Performance Job with NOT permitted authorization scope
     ...    Test objective: The objective is to test the deletion of an individual VNF performance monitoring job with NOT permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is no more available in the VNFM    
@@ -152,6 +152,55 @@ DELETE Individual VNF Performance Job with NOT permitted authorization scope
     Check HTTP Response Status Code Is    403
     Check HTTP Response Body Json Schema Is   ProblemDetails
 
+GET individual VNF Performance Job - Unauthorized
+    [Documentation]    Test ID: 6.3.3.2.12
+    ...    Test title: Get individual VNF Performance Job - Unauthorized
+    ...    Test objective: The objective is to test the retrieval of an individual VNF performance monitoring job and perform a JSON schema and content validation of the collected job data structure without authorization.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET individual VNF Performance Job - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+PATCH Individual VNF Performance Job - Unauthorized
+    [Documentation]    Test ID: 6.3.3.2.13
+    ...    Test title: PATCH Individual VNF Performance Job - Unauthorized
+    ...    Test objective: The objective is to test that PATCH method allows to modify an exsisting individual PM job resource without authorization.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Patch request for individual VNF Performance Job - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+PATCH Individual VNF Performance Job - Not Found
+    [Documentation]    Test ID: 6.3.3.2.14
+    ...    Test title: PATCH Individual VNF Performance Job - Not Found
+    ...    Test objective: The objective is to test that PATCH method fails to modify a non-existent individual PM job resource.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Patch request for individual VNF Performance Job - Not Found
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+DELETE Individual VNF Performance Job - Unauthorized
+    [Documentation]    Test ID: 6.3.3.2.15
+    ...    Test title: Delete Individual VNF Performance Job - Unauthorized
+    ...    Test objective: The objective is to test the deletion of an individual VNF performance monitoring job without authorization.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none  
+    Send Delete request for individual VNF Performance Job - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
 *** Keywords ***
 GET individual VNF Performance Job
     Log    Trying to get a Pm Job present in the NFVO Catalogue
@@ -162,6 +211,13 @@ GET individual VNF Performance Job
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
+GET individual VNF Performance Job - Unauthorized
+    Log    Trying to get a Pm Job present in the NFVO Catalogue without authorization
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 GET individual VNF Performance Job with invalid resource identifier  
     Log    Trying to perform a negative get, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -179,7 +235,13 @@ Send Delete request for individual VNF Performance Job
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-    
+Send Delete request for individual VNF Performance Job - Unauthorized
+    Log    Trying to delete an existing PM Job without authorization
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 Send Delete request for individual VNF Performance Job with invalid resource identifier
     Log    Trying to perform a negative delete, using erroneous PM Job identifier
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -199,7 +261,7 @@ Send Post request for individual VNF Performance Job
     Set Suite Variable    ${response}    ${output}
     
 Send Put request for individual VNF Performance Job    
-    Log    Trying to perform a POST (method should not be implemented)
+    Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
@@ -222,6 +284,27 @@ Send Patch request for individual VNF Performance Job
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
+Send Patch request for individual VNF Performance Job - Unauthorized    
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Set Headers    {"Version": "${API_VERSION}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
+    ${template}=    Get File    jsons/PMJobModification.json
+    ${body}=        Format String   ${template}     callback_uri=${new_callback_uri}:${callback_port}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}     ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+Send Patch request for individual VNF Performance Job - Not Found 
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Set Headers    {"Version": "${API_VERSION}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/PMJobModification.json
+    ${body}=        Format String   ${template}     callback_uri=${new_callback_uri}:${callback_port}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${not_existing_pmJobId}     ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 Send Patch request for individual VNF Performance Job with Unreachable Callback URI    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Version": "${API_VERSION}"}
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index 1624e7b6d9d301dda287b2f379d75be956b4f7b7..90e1030e2c51cf763ab2223698a356c81d7c6a41 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -11,7 +11,7 @@ Get Individual Performance Report
     ...    Test title: Get Individual Performance Report
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,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 VNF performance report associated to a monitoring job fails when using an invalid resource endpoint 
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,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 VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -49,7 +49,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 VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -61,7 +61,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 VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -73,7 +73,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 VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -84,7 +84,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 VNF performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -96,14 +96,25 @@ 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 VNF performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure with NOT permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
     Get Individual Performance Report with not permitted authorization scope
     Check HTTP Response Status Code Is    403
     Check HTTP Response Body Json Schema Is   ProblemDetails
-
+Get Individual Performance Report - Unauthorized
+    [Documentation]    Test ID: 6.3.3.3.9
+    ...    Test title: Get Individual Performance Report - Unauthorized
+    ...    Test objective: The objective is to test the retrieval of an individual VNF performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure without providing authorization.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Individual Performance Report - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 *** Keywords ***
 Get Individual Performance Report
     Log    Trying to get a performance report present in the VNFM
@@ -113,7 +124,13 @@ Get Individual Performance Report
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
+Get Individual Performance Report - Unauthorized
+    Log    Trying to get a performance report present in the VNFM without providing authorization.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 Get Individual Performance Report with invalid resource endpoint
     Log    Trying to get a performance report with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 527fae6c1cfa5a496b8a9c586376922103013c17..9eafaa30ec3ebda7a129524ca7f4adf6a85caaaf 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -13,7 +13,7 @@ GET Individual Threshold
     ...    Test title: GET Individual Threshold
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance threshold and perform a JSON schema and content validation of the collected threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,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 VNF performance threshold fails when using an invalid resource identifier
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ DELETE Individual Threshold
     ...    Test title: DELETE Individual Threshold
     ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not available anymore in the VNFM    
@@ -54,7 +54,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 VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -67,7 +67,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 VNF Performance Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not created on the VNFM
@@ -79,7 +79,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 VNF Performance threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ PATCH Individual Threshold
     ...    Test title: PATCH Individual Threshold 
     ...    Test objective: The objective is to test that PATCH method allows to modify an Individual threshold resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
@@ -105,7 +105,7 @@ PATCH Individual Threshold - Precondition failed
     ...    Test title: PATCH Individual Threshold - Preconition failed
     ...    Test objective: The objective is to attempt to modify an individual threshold resource, where the precondition was not met.
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
@@ -119,7 +119,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 PM job resource when the callback URI provided in the Request body is unreachable by the VNFM.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM cannot reach the Notification endpoint.
     ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
@@ -132,7 +132,7 @@ GET Individual Threshold with permitted authorization scope
     ...    Test title: GET Individual Threshold with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance threshold and perform a JSON schema and content validation of the collected threshold data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -146,13 +146,61 @@ GET Individual Threshold with NOT permitted authorization scope
     ...    Test title: GET Individual Threshold with NOT permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance threshold and perform a JSON schema and content validation of the collected threshold data structure with not permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
     GET Individual VNF Performance Threshold with not permitted authorization scope
     Check HTTP Response Status Code Is    403
     Check HTTP Response Body Json Schema Is   ProblemDetails
+GET Individual Threshold - Unauthorized
+    [Documentation]    Test ID: 6.3.3.5.12
+    ...    Test title: GET Individual Threshold - Unauthorized
+    ...    Test objective: The objective is to test the retrieval of an individual VNF performance threshold and perform a JSON schema and content validation of the collected threshold data structure without authorization
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET individual VNF Performance Threshold - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+PATCH Individual Threshold - Unauthorized
+    [Documentation]    Test ID: 6.3.3.5.13
+    ...    Test title: PATCH Individual Threshold - Unauthorized
+    ...    Test objective: The objective is to test that PATCH method does not allow to modify an Individual threshold resource without authorization.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Patch request for individual VNF Performance Threshold - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+PATCH Individual Threshold - Not Found
+    [Documentation]    Test ID: 6.3.3.5.14
+    ...    Test title: PATCH Individual Threshold - Not Found
+    ...    Test objective: The objective is to test that PATCH method does not allow to modify a not existing Individual threshold.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Patch request for individual VNF Performance Threshold - Not Found
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+DELETE Individual Threshold - Unauthorized
+    [Documentation]    Test ID: 6.3.3.5.15
+    ...    Test title: DELETE Individual Threshold - Unauthorized
+    ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold without authorization
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    Send Delete request for individual VNF Performance Threshold - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 *** Keywords ***
 GET Individual VNF Performance Threshold
@@ -164,6 +212,13 @@ GET Individual VNF Performance Threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
+GET Individual VNF Performance Threshold - Unauthorized
+    Log    Trying to get a Threhsold present in the VNFM without authorization
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 GET individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to get a Threhsold with invalid resource endpoint
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -180,6 +235,12 @@ Send Delete request for individual VNF Performance Threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
+Send Delete request for individual VNF Performance Threshold - Unauthorized
+    Log    Trying to delete a Threhsold in the VNFM without authorization
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
 Send Delete request for individual VNF Performance Threshold with invalid resource identifier
     Log    Trying to delete a Threhsold in the VNFM with invalid id
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
@@ -217,6 +278,31 @@ Send Patch request for individual VNF Performance Threshold
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
+Send Patch request for individual VNF Performance Threshold - Unauthorized
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
+    ${origOutput}=    Output    response
+    Set Suite Variable    ${origResponse}    ${origOutput}
+    ${template}=    Get File    jsons/ThresholdModification.json
+    ${body}=        Format String   ${template}     callback_uri=${new_callback_uri}:${callback_port}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}     ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+Send Patch request for individual VNF Performance Threshold - Not Found
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
+    ${origOutput}=    Output    response
+    Set Suite Variable    ${origResponse}    ${origOutput}
+    ${template}=    Get File    jsons/ThresholdModification.json
+    ${body}=        Format String   ${template}     callback_uri=${new_callback_uri}:${callback_port}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${not_existant_thresholdId}     ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 Send Patch request for individual VNF Performance Threshold with Unreachable Callback URI    
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Version": "${API_VERSION}"}
diff --git a/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot b/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot
index d826b26143ffd3430c5f9a01a2cbee853de7646b..adb57f07401e9d44af620f52c93a3a44c111b34d 100644
--- a/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot
@@ -14,7 +14,7 @@ VNF Performance Information Availability Notification
     ...    Test title: VNF Performance Information Availability Notification
     ...    Test objective: The objective is to test that VNF Performance Information Availability Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -26,7 +26,7 @@ VNF Threshold Crossed Notification
     ...    Test title: VNF Threshold Crossed Notification
     ...    Test objective: The objective is to test that VNF Threshold Crossed Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF performance job is created, and a subscription for Threshold Crossed Notification is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -37,7 +37,7 @@ Test the Notification Endpoint - Successful
     ...    Test title: Test the Notification Endpoint - Successful
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ PUT Notification endpoint - Method Not Implemented
     ...    Test title: PUT Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PUT method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 6.4.9.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.9.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -59,7 +59,7 @@ PATCH Notification endpoint - Method Not Implemented
     ...    Test title: PATCH Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PATCH method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 6.4.9.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.9.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -70,13 +70,48 @@ DELETE Notification endpoint - Method Not Implemented
     ...    Test title: DELETE Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the DELETE method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 6.4.9.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.9.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none
     DELETE notification endpoint
     Check HTTP Response Status Code Is    405
-    
+Test the Notification Endpoint - Unauthorized
+    [Documentation]    Test ID: 6.3.3.10.7
+    ...    Test title: Test the Notification Endpoint - Unauthorized
+    ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer without authorization.
+    ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET reach the notification endpoint - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+Test the Notification Endpoint - Not Found
+    [Documentation]    Test ID: 6.3.3.10.8
+    ...    Test title: Test the Notification Endpoint - Not Found
+    ...    Test objective: The objective is to test the not existing Notification Endpoint.
+    ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    GET reach the notification endpoint - Not found
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+VNF Performance Information Availability Notification - Unauthorized
+    [Documentation]    Test ID: 6.3.3.10.9
+    ...    Test title: VNF Performance Information Availability Notification - Unauthorized
+    ...    Test objective: The objective is to test that VNF Performance Information Availability Notification is not delivered to the notification consumer without authorization.
+    ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF Performance Information Availability Notification - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is    ProblemDetails  
 *** Keywords ***
 Check resource existence and get CallbackUri
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -105,7 +140,16 @@ Post VNF Performance Information Availability Notification
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
-
+Post VNF Performance Information Availability Notification - Unauthorized
+    log    Trying to perform a POST to get notification without authorization
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    ${template} =    Get File    jsons/PerformanceInformationAvaliableNotification.json
+    ${body}=        Format String   ${template}    objectInstanceId=${objectInstanceId} 
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
 Post VNF Threshold Crossed Notification
     log    Trying to perform a POST to get notification
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
diff --git a/SOL002/VNFPerformanceManagement-API/Notifications.robot b/SOL002/VNFPerformanceManagement-API/Notifications.robot
index bdcb75463cb1bb4ef7a5175ab72f7b3e55b56a01..e1608ffdc1e946fd080cc24bc4109f706efa8e5f 100644
--- a/SOL002/VNFPerformanceManagement-API/Notifications.robot
+++ b/SOL002/VNFPerformanceManagement-API/Notifications.robot
@@ -9,6 +9,7 @@ Library    OperatingSystem
 Library    BuiltIn
 Library    Collections
 Library    String
+Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
 
 *** Test Cases ***
@@ -17,26 +18,28 @@ VNF Performance Information Availability Notification
     ...    Test title: VNF Performance Information Availability Notification
     ...    Test objective: The objective is to test the dispatch of VNF Performance Information Availability Notification when new VNF performance information is available in the NFVO, 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 VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the availability of VNF Performance Information (external action) 
     Check Performance Information Available Notification Http POST Request Body Json Schema Is    PerformanceInformationAvailableNotification
     Check Performance Information Available Notification Http POST Request Body notificationType attribute Is    PerformanceInformationAvailableNotification
+    Check Performance Information Available Notification
 
 VNF Threshold Crossed Notification
     [Documentation]    Test ID: 6.3.3.8.2
     ...    Test title: VNF Threshold Crossed Notification
     ...    Test objective: The objective is to test the dispatch of VNF Threshold Crossed Notification when a previously set VNF 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 VNF performance job is created, and a threshold subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
     Trigger the cross of VNF Performance Threshold (external action) 
     Check Threshold Crossed Notification Http POST Request Body Json Schema Is    ThresholdCrossedNotification
     Check Threshold Crossed Notification Http POST Request Body notificationType attribute Is    ThresholdCrossedNotification
+    Check Threshold Crossed Notification
 
 
 *** Keywords ***
@@ -109,6 +112,50 @@ Configure Notification Forward
     &{notification_fwd}=  Create Mock Http Forward	${endpoint_fwd}
     Create Mock Expectation With Http Forward  ${notification_tmp}  ${notification_fwd}
 
+Check Performance Information Available Notification
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+    ${request_type}=    Evaluate    type(${requests})
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+    Log    Raw body: ${body_text}
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    ${pmJobId}=    Get From Dictionary    ${notification}    pmJobId
+    ${pmJobUrl}=    Set Variable    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${pmJobUrl}
+    Integer    response status    200
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
+Check Threshold Crossed Notification
+    ${requests}=    Retrieve Requests    ${callback_endpoint_fwd}
+    Should Not Be Empty    ${requests}    msg=No notification received at callback endpoint!
+    ${request_type}=    Evaluate    type(${requests})
+    ${last_request}=    Run Keyword If    "${request_type}" == "<class 'list'>"
+    ...    Get From List    ${requests}    -1
+    ...    ELSE
+    ...    Set Variable    ${requests}
+    ${body}=    Get From Dictionary    ${last_request}    body
+    ${body_text}=    Get From Dictionary    ${body}    string
+    Log    Raw body: ${body_text}
+    ${notification}=    Evaluate    json.loads(r'''${body_text}''')    json
+    ${thresholdId}=    Get From Dictionary    ${notification}    thresholdId
+    ${thresholdUrl}=    Set Variable    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1
+    ...    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${thresholdUrl}
+    Integer    response status    200
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
 Create Sessions
     Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 8bfa5871409d6886201bbb596bc4371bc9bf8df2..71476cc1b1a8cd522f056c8e33921ad694fcc6bd 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -13,7 +13,7 @@ GET all VNF Performance Monitoring Jobs
     ...    Test title: GET all VNF Performance Monitoring Jobs
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs and perform a JSON schema and content validation of the collected jobs data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test title: GET all VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF performance monitoring jobs using attribute-based filter, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs all_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued all_fileds selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_default selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -82,7 +82,7 @@ GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -96,7 +96,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF 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 VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -109,7 +109,7 @@ GET VNF Performance Monitoring Jobs with invalid resource endpoint
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -122,7 +122,7 @@ POST Create new VNF Performance Monitoring Job - SUCCESSFUL
     ...    Test title:  POST Create a new VNF Performance Monitoring Job - SUCCESSFUL
     ...    Test objective: The objective is to test that the POST method creates a new VNF performance monitoring job and perform the JSON schema validation of the returned job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is successfully created on the VNFM
@@ -138,7 +138,7 @@ PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -150,7 +150,7 @@ PATCH all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: PATCH all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -162,7 +162,7 @@ DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -174,7 +174,7 @@ GET VNF Performance Monitoring Jobs to get Paged Response
     ...    Test title: GET VNF Performance Monitoring Jobs to get Paged Response
     ...    Test objective: The objective is to test the retrieval of VNF performance monitoring jobs to get Paged response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -187,7 +187,7 @@ GET VNF Performance Monitoring Jobs for Bad Request Response too big
     ...    Test title: GET VNF Performance Monitoring Jobs for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about VNF Performance Monitoring when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -200,7 +200,7 @@ GET all VNF Performance Monitoring Jobs with exclude_default and fields attribut
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_default and fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs with exclude_default and fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_default selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -213,7 +213,7 @@ POST Create new VNF Performance Monitoring Job - UNPROCESSABLE CONTENT
     ...    Test title:  POST Create a new VNF Performance Monitoring Job - UNPROCESSABLE CONTENT
     ...    Test objective: The objective is to test that the POST method cannot create a new VNF performance monitoring job when the callback URI provided in the Request body is unreachable by the VNFM.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM cannot reach the Notification endpoint.
     ...    Post-Conditions: none
@@ -225,7 +225,7 @@ GET all VNF Performance Monitoring Jobs with permitted authorization scope
     ...    Test title: GET all VNF Performance Monitoring Jobs with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs and perform a JSON schema and content validation of the collected jobs data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -237,7 +237,7 @@ GET all VNF Performance Monitoring Jobs with NOT permitted authorization scope
     ...    Test title: GET all VNF Performance Monitoring Jobs with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs and perform a JSON schema and content validation of the collected jobs data structure with not permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -245,6 +245,31 @@ GET all VNF Performance Monitoring Jobs with NOT permitted authorization scope
     Check HTTP Response Status Code Is    403
     Check HTTP Response Body Json Schema Is   ProblemDetails
 
+GET all VNF Performance Monitoring Jobs - Unauthorized
+    [Documentation]    Test ID: 6.3.3.1.19
+    ...    Test title: GET all VNF Performance Monitoring Jobs - Unauthorized
+    ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs and perform a JSON schema and content validation of the collected jobs data structure without authorization.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET all VNF Performance Monitoring Jobs - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+POST Create new VNF Performance Monitoring Job - Unauthorized
+    [Documentation]    Test ID: 6.3.3.1.20
+    ...    Test title:  POST Create a new VNF Performance Monitoring Job - Unauthorized
+    ...    Test objective: The objective is to test that the POST method fails without authorization
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Post Request Create new VNF Performance Monitoring Job - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
 *** Keywords ***
 GET all VNF Performance Monitoring Jobs
     Log    Trying to get all PM Jobs present in the VNFM
@@ -255,6 +280,13 @@ GET all VNF Performance Monitoring Jobs
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
+GET all VNF Performance Monitoring Jobs - Unauthorized
+    Log    Trying to get all PM Jobs present in the VNFM without authorization
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 GET VNF Performance Monitoring Jobs with attribute-based filter
     Log    Trying to get all PM Jobs present in the VNFM, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -341,6 +373,16 @@ Send Post Request Create new VNF Performance Monitoring Job
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
+Send Post Request Create new VNF Performance Monitoring Job - Unauthorized
+    Log    Creating a new PM Job without authorization
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    ${template}=    Get File    jsons/CreatePmJobRequest.json
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}:${callback_port}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs    ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 Send Post Request Create new VNF Performance Monitoring Job with Unreachable Callback URI
     Log    Creating a new PM Job
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index a0bb9ac8c85288c996f3373fc654f400d2e9f382..b7c1713bb889d0e10d6c46ba956caca77b537211 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -13,7 +13,7 @@ GET All Performance Thresholds
     ...    Test title: GET All Performance Thresholds
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds and perform a JSON schema validation of the collected thresholds data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,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 VNF 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 VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ GET Performance Thresholds with invalid attribute-based filter
     ...    Test title: GET Performance Thresholds with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ GET Performance Thresholds with invalid resource endpoint
     ...    Test title: GET Performance Thresholds with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ POST Create new Performance Threshold
     ...    Test title:  POST Create new Performance Threshold
     ...    Test objective: The objective is to test that the POST method creates a new VNF performance threshold and perform the JSON schema validation of the returned threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is successfully created on the VNFM
@@ -82,7 +82,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 VNF Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -94,7 +94,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 VNF Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -106,7 +106,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 VNF Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -118,7 +118,7 @@ GET Performance Thresholds with Paged Response
     ...    Test title: GET Performance Thresholds with Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds with Paged response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -131,7 +131,7 @@ GET Performance Thresholds for Bad Request Response too big
     ...    Test title: GET Performance Thresholds for Bad Request Response too big
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -144,7 +144,7 @@ POST Create new Performance Threshold - UNPROCESSABLE CONTENT
     ...    Test title:  POST Create new Performance Threshold - UNPROCESSABLE CONTENT
     ...    Test objective: The objective is to test that the POST method does not create a new VNF performance threshold when the callback URI provided in the Request body is unreachable by the VNFM.
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM cannot reach the Notification endpoint.
     ...    Post-Conditions: none
@@ -156,7 +156,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 that the POST method creates a new VNF performance threshold and perform the JSON schema validation of the returned threshold data structure when the authorization scope is permitted
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is successfully created on the VNFM
@@ -172,15 +172,38 @@ POST Create new Performance Threshold with NOT permitted authorization scope
     ...    Test title:  POST Create new Performance Threshold with permitted authorization scope
     ...    Test objective: The objective is to test that the POST method creates a new VNF performance threshold and perform the JSON schema validation of the returned threshold data structure when the authorization scope is not permitted
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.2.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is successfully created on the VNFM
     Send Post Request Create new Performance Threshold with not permitted authorization scope
     Check HTTP Response Status Code Is    403
     Check HTTP Response Body Json Schema Is   ProblemDetails
-
-    
+GET All Performance Thresholds - Unauthorized
+    [Documentation]    Test ID: 6.3.3.4.14
+    ...    Test title: GET All Performance Thresholds - Unauthorized
+    ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds and perform a JSON schema validation of the collected thresholds data structure withput authorization
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET all Performance Thresholds - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+POST Create new Performance Threshold - Unauthorized
+    [Documentation]    Test ID: 6.3.3.4.15
+    ...    Test title:  POST Create new Performance Threshold - Unauthorized
+    ...    Test objective: The objective is to test that the POST method creates a new VNF performance threshold and perform the JSON schema validation of the returned threshold data structure without providing authorization
+    ...    Pre-conditions: A VNF instance is instantiated.
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Post Request Create new Performance Threshold - Unauthorized
+    Check HTTP Response Status Code Is    401
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+  
 *** Keywords ***
 GET all Performance Thresholds
     Log    Trying to get all thresholds present in the VNFM    
@@ -190,7 +213,13 @@ GET all Performance Thresholds
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
+GET all Performance Thresholds - Unauthorized
+    Log    Trying to get all thresholds present in the VNFM  without authorization   
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 GET Performance Thresholds with attribute-based filter
     Log    Trying to get thresholds present in the VNFM with filter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -229,7 +258,16 @@ Send Post Request Create new Performance Threshold
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-
+Send Post Request Create new Performance Threshold - Unauthorized
+    Log    Creating a new THreshold withput authorization
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    ${template}=    Get File    jsons/CreateThresholdRequest.json
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}:${callback_port}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 Send Post Request Create new Performance Threshold with Unreachable Callback URI
     Log    Creating a new THreshold
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index 4cb915c881ada16e211599179f0fae916082e883..b2a8386c81a00be9e8b5786956e0ca1df4479b98 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -481,6 +481,21 @@ GET reach the notification endpoint
     GET    ${callbackResp}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
+GET reach the notification endpoint - Unauthorized
+    Log    Trying to reach the notification endpoint using GET method without authorization.  
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    GET    ${callbackResp}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
+GET reach the notification endpoint - Not Found 
+    Log    Trying to reach the not existing notification endpoint using GET method.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${not_existant_callbackResp}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
 PUT notification endpoint  
     Log    Trying to perform a PUT. This method should not be implemented.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index f74d963b16eef189200e329d0a63542993f03e61..36b3cd796ec4c36259e2b2bc87370c44a8bb3021 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
@@ -40,11 +40,13 @@ ${objectInstanceIds}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
 
 
 ${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
+${not_existing_pmJobId}     not_existing_pmJobId
 ${erroneousPmJobId}    erroneousPmJobId
 ${newPmJobId}    newPmJobId
 
 
 ${thresholdId}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${not_existant_thresholdId}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
 ${erroneousThresholdId}    erroneousThresholdId
 ${newThresholdId}    newThresholdId
 
@@ -71,5 +73,5 @@ ${total_polling_time}   2 min
 ${polling_interval}     10 sec
 
 ${callbackResp}    localhost
-
+${not_existant_callbackResp}    not_existant_callbackResp
 ${objectInstanceId}    
\ No newline at end of file