diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
index 5becb1c2d32a02b0732128f0af0c8a1ce8d2e958..806b40f8691d36b8712137455e6160493cc866b3 100644
--- a/SOL002/VNFFaultManagement-API/Alarms.robot
+++ b/SOL002/VNFFaultManagement-API/Alarms.robot
@@ -13,7 +13,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -103,7 +103,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -128,7 +128,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -140,7 +140,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -152,7 +152,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -165,7 +165,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -178,7 +178,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -192,7 +192,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -206,7 +206,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -220,7 +220,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -234,7 +234,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -248,7 +248,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] v3.6.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFFaultManagement-API/ApiVersion.robot b/SOL002/VNFFaultManagement-API/ApiVersion.robot
index 1a44e71cbcb5b56fcc9847ddeff6feddfbf7db5c..630a5705ec97ef3567adc542e8daa7dc673c9e86 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] v3.5.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v4.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] v3.5.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v4.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] v3.5.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v4.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] v3.5.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v4.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] v3.5.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v4.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] v3.5.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v4.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] v3.5.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v4.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] v3.5.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v4.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] v3.5.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v4.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] v3.5.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v4.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 3b3d3cf8ac52373420e4dcf0f307f7a09c7302be..66bbc3465bdac0a97f0908beca234d227b75fd90 100644
--- a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
+++ b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
@@ -2,6 +2,8 @@
 Resource    environment/variables.txt 
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library    JSONSchemaLibrary
+Library    OperatingSystem
+Library    String
 Suite Setup    Check resource existence
 
 *** Test Cases ***
@@ -10,7 +12,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] v3.6.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -22,7 +24,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] v3.6.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:   none
@@ -34,7 +36,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] v3.6.1
+    ...    Reference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -46,7 +48,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] v3.6.1
+    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +60,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] v3.6.1
+    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,9 +79,12 @@ POST escalate severity
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate    ${PerceivedSeverity}
+    ${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 bb549e1e37129ec1272615aaf65b9f4351e30006..07c739c29d5474c2efe384509d7870390389f0b0 100644
--- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
@@ -15,7 +15,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] v3.6.1
+    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,12 +27,13 @@ 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] v3.6.1
+    ...    Reference: Clause 7.4.3.3.2  - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none 
     ...    Post-Conditions: none
     GET Alarm Task
     Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Contains ETag and Last-Modified
     Check HTTP Response Body Json Schema Is    alarm
     
 PUT Individual Alarm - Method not implemented
@@ -40,7 +41,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] v3.6.1
+    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,12 +53,13 @@ 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] v3.6.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
     PATCH Alarm Task
     Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Contains ETag and Last-Modified
     Check HTTP Response Body Json Schema Is     alarmModifications
     
 PATCH Individual Alarm - Precondition failed
@@ -65,7 +67,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] v3.6.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The alarm resource is not modified
@@ -79,7 +81,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] v3.6.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The alarm resource is not modified
@@ -93,7 +95,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] v3.6.1
+    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -105,7 +107,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] v3.6.1
+    ...    Reference: Clause 7.4.3.3.2  - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -168,6 +170,13 @@ GET Alarm Task
     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']}
+    Should Contain    ${response['headers']}    Etag
+    Should Contain    ${response['headers']}    Last-Modified
+    Log    Etag and Last-Modified Headers are present
 GET Alarm Task with filter
 	Log    Query VNF The GET method queries information about individual alarm with filters.
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -202,3 +211,8 @@ Check Postcondition VNF individual alarm Unmodified (Implicit)
     GET Alarm Task
     Should Be Equal As Strings    ${origResponse['body']['callbackUri']}    ${response['body']['callbackUri']}
 
+Check HTTP Response Header Contains
+    [Arguments]    ${CONTENT_TYPE}
+    Should Contain    ${response['headers']}    ${CONTENT_TYPE}
+    Log    Header is present
+
diff --git a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
index a5a755b4e99fd23f52388228603019d0d12fae7c..52438e58acaf8fc90e7183e69a356c2c21c368c1 100644
--- a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
@@ -13,7 +13,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] v3.6.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,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] v3.6.1
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -38,7 +38,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] v3.6.1
+    ...    Reference: Clause 7.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,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] v3.6.1
+    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,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] v3.6.1
+    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: the subscription is deleted
@@ -75,7 +75,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] v3.6.1
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
index c6991d698e8c06043668f6497c2d42b70dcea7cc..7432ceebe2cb54c16a4531ad5d7916ac0ac180e5 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] v3.6.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v4.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] v3.6.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v4.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] v3.6.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFFaultManagement-API/Notifications.robot b/SOL002/VNFFaultManagement-API/Notifications.robot
index 688643ef15386c209467b5e8ba85ae26af75d9a9..7f2da3b2cac8d56f095896ff8d41bad642ee5043 100644
--- a/SOL002/VNFFaultManagement-API/Notifications.robot
+++ b/SOL002/VNFFaultManagement-API/Notifications.robot
@@ -15,7 +15,7 @@ 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] v3.6.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -28,7 +28,7 @@ VNF Fault Alarm Cleared Notification
     ...    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] v3.6.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -41,7 +41,7 @@ VNF Fault Alarm List Rebuilt Notification
     ...    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] v3.6.1
+    ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 7d47f126fc61b422555c5aebb31c2589a8768990..bfee46e5c62923bf6501d3d90e38af1498ecc8b3 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -16,7 +16,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: Resource created successfully
@@ -31,7 +31,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v4.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
@@ -54,7 +54,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -67,7 +67,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -80,7 +80,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -93,7 +93,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -106,7 +106,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -119,7 +119,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -132,7 +132,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -145,7 +145,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -157,7 +157,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -169,7 +169,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -181,7 +181,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -194,7 +194,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -207,7 +207,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -221,7 +221,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -235,7 +235,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -249,7 +249,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -263,7 +263,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -277,7 +277,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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -291,7 +291,7 @@ POST Create a new Subscription - Unprocessable Entity
     ...    Test title: POST Create a new Subscription - Unprocessable Entity
     ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body 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] v3.6.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFFaultManagement-API/environment/variables.txt b/SOL002/VNFFaultManagement-API/environment/variables.txt
index ce47ccabbd7228a50f97614a64fea45890ddef78..7641e281857ab2a1a011c535db87530d3cc3f9b6 100644
--- a/SOL002/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL002/VNFFaultManagement-API/environment/variables.txt
@@ -15,6 +15,8 @@ ${apiName}        vnffm
 ${apiMajorVersion}     v1
 ${CONTENT_TYPE}    application/json
 
+${HEADER_TEST_SUPPORTED}    0
+
 ${origResponse}=    httpresponse
 
 ${VNFM_ALLOWS_DUPLICATE_SUBS}    0
diff --git a/SOL002/VNFFaultManagement-API/jsons/EscalatePerceivedSeverity.json b/SOL002/VNFFaultManagement-API/jsons/EscalatePerceivedSeverity.json
new file mode 100644
index 0000000000000000000000000000000000000000..8a8f5a6a878b716450d88607594209b8e364a834
--- /dev/null
+++ b/SOL002/VNFFaultManagement-API/jsons/EscalatePerceivedSeverity.json
@@ -0,0 +1,3 @@
+{{
+    "proposedPerceivedSeverity": "{perceivedSeverity}"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/schemas/FmSubscription.schema.json b/SOL002/VNFFaultManagement-API/schemas/FmSubscription.schema.json
index d691e415c7711efda628223032a7d084eff4dbed..e6fc6b8aeb8ad0696cbd4ce3bf10e001c6d554c4 100644
--- a/SOL002/VNFFaultManagement-API/schemas/FmSubscription.schema.json
+++ b/SOL002/VNFFaultManagement-API/schemas/FmSubscription.schema.json
@@ -1,5 +1,5 @@
 {
-  "description": "This type represents a subscription related to notifications related to the availability of the virtualised resources quotas.\n",
+  "description": "This type represents a subscription related to notifications about VNF faults.\n",
   "type": "object",
   "required": [
     "id",
@@ -12,29 +12,141 @@
       "type": "string"
     },
     "filter": {
-      "description": "This type represents a subscription filter related to notifications about the availability of the virtualised resources quotas. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
+      "description": "This type represents a subscription filter related to notifications about VNF faults.\nAt a particular nesting level in the filter structure, the following applies: All attributes  shall match in order for the filter to match (logical \"and\" between different filter attributes).  If an attribute is an array, the attribute shall match if at least one of the values in the array  matches (logical \"or\" between the values of one filter attribute).\nNOTE:\tThe permitted values of the \"notificationTypes\" attribute are spelled exactly as the names \n      of the notification types to facilitate automated code generation systems.\n",
       "type": "object",
       "properties": {
-        "vimIds": {
-          "description": "Match VIMs that were created the quota for a consumer of the virtualised resources. This attribute shall only be supported when VNF-related Resource Management in direct mode is applicable.\n",
-          "type": "array",
-          "items": {
-            "description": "An identifier with the intention of being globally unique.\n",
-            "type": "string"
+        "vnfInstanceSubscriptionFilter": {
+          "description": "This type represents subscription filter criteria to match VNF instances. * NOTE 1:\tThe attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances\n          that are based on certain VNFDs in a filter. They should not be used both in the same filter instance,\n          but one alternative should be chosen.\n  NOTE 2:\tThe attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF\n          instances in a filter. They should not be used both in the same filter instance, but one alternative\n          should be chosen.\n",
+          "type": "object",
+          "anyOf": [
+            {
+              "oneOf": [
+                {
+                  "required": [
+                    "vnfdId"
+                  ]
+                },
+                {
+                  "required": [
+                    "vnfProductsFromProviders"
+                  ]
+                }
+              ]
+            },
+            {
+              "oneOf": [
+                {
+                  "required": [
+                    "vnfInstanceIds"
+                  ]
+                },
+                {
+                  "required": [
+                    "vnfInstanceNames"
+                  ]
+                }
+              ]
+            }
+          ],
+          "properties": {
+            "vnfdIds": {
+              "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. See note 1.\n",
+              "type": "array",
+              "items": {
+                "description": "An identifier with the intention of being globally unique.\n",
+                "type": "string"
+              }
+            },
+            "vnfProductsFromProviders": {
+              "description": "If present, match VNF instances that belong to VNF products from certain providers. See note 1.\n",
+              "type": "array",
+              "items": {
+                "type": "object",
+                "required": [
+                  "vnfProvider"
+                ],
+                "properties": {
+                  "vnfProvider": {
+                    "description": "Name of the VNF provider to match.\n",
+                    "type": "string"
+                  },
+                  "vnfProducts": {
+                    "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "required": [
+                        "vnfProductName"
+                      ],
+                      "properties": {
+                        "vnfProductName": {
+                          "description": "Name of the VNF product to match.\n",
+                          "type": "string"
+                        },
+                        "versions": {
+                          "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",
+                          "type": "array",
+                          "items": {
+                            "type": "object",
+                            "required": [
+                              "vnfSoftwareVersion"
+                            ],
+                            "properties": {
+                              "vnfSoftwareVersion": {
+                                "description": "A version.\n",
+                                "type": "string"
+                              },
+                              "vnfdVersions": {
+                                "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
+                                "type": "array",
+                                "items": {
+                                  "description": "A version.\n",
+                                  "type": "string"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "vnfInstanceIds": {
+              "description": "If present, match VNF instances with an instance identifier listed in this attribute. See note 2.\n",
+              "type": "array",
+              "items": {
+                "description": "An identifier with the intention of being globally unique.\n",
+                "type": "string"
+              }
+            },
+            "vnfInstanceNames": {
+              "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. See note 2.\n",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
           }
         },
-        "resourceProviderIds": {
-          "description": "Match the entities responsible for the management of the virtualised resources that were allocated by the NFVO. This attribute shall only be supported when VNF-related Resource Management in indirect mode is applicable. The identification scheme is outside the scope of the present document.\n",
+        "notificationTypes": {
+          "description": "Match particular notification types. \nPermitted values: -\tAlarmNotification -\tAlarmClearedNotification -\tAlarmListRebuiltNotification See note.\n",
           "type": "array",
           "items": {
-            "description": "An identifier with the intention of being globally unique.\n",
-            "type": "string"
+            "type": "string",
+            "enum": [
+              "AlarmNotification",
+              "AlarmClearedNotification",
+              "AlarmListRebuiltNotification"
+            ]
           }
         },
-        "resourceTypes": {
-          "description": "Match particular resource types.\n",
+        "faultyResourceTypes": {
+          "description": "Match VNF alarms with a faulty resource type listed in this attribute.\n",
           "type": "array",
           "items": {
+            "description": "The enumeration FaultyResourceType represents those types of faulty resource.\n",
             "type": "string",
             "enum": [
               "COMPUTE",
@@ -43,11 +155,41 @@
             ]
           }
         },
-        "resourceGroupIds": {
-          "description": "Match the \"infrastructure resource groups\" that are logical groupings of the virtualised resources assigned to a tenant within an infrastructure Domain.\n",
+        "perceivedSeverities": {
+          "description": "Match VNF alarms with a perceived severity listed in this attribute.\n",
+          "type": "array",
+          "items": {
+            "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service\n  affecting condition has occurred and an immediate corrective action\n  is required. Such a severity can be reported, for example, when a\n  managed object becomes totally out of service and its capability needs\n  to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting\n  condition has developed and an urgent corrective action is required.\n  Such a severity can be reported, for example, when there is a severe\n  degradation in the capability of the managed object and its full\n  capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a\n  non-service affecting fault condition and that corrective action\n  should be taken in order to prevent a more serious (for example,\n  service affecting) fault. Such a severity can be reported, for\n  example, when the detected alarm condition is not currently degrading\n  the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a\n  potential or impending service affecting fault, before any significant\n  effects have been felt. Action should be taken to further diagnose (if\n  necessary) and correct the problem in order to prevent it from\n  becoming a more serious service affecting fault (ITU-T Recommendation\n  X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the\n  severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or\n  more previously reported alarms. This alarm clears all alarms for this\n  managed object that have the same Alarm type, Probable cause and\n  Specific problems (if given) (ITU-T Recommendation X.733).\n",
+            "type": "string",
+            "enum": [
+              "CRITICAL",
+              "MAJOR",
+              "MINOR",
+              "WARNING",
+              "INDETERMINATE",
+              "CLEARED"
+            ]
+          }
+        },
+        "eventTypes": {
+          "description": "Match VNF alarms with an event type listed in this attribute.\n",
+          "type": "array",
+          "items": {
+            "description": "The enumeration EventType represents those types of events that trigger an alarm. * COMMUNICATIONS_ALARM: An alarm of this type is associated with the\n  procedure and/or process required conveying information from one point\n  to another (ITU-T Recommendation X.733).\n* PROCESSING_ERROR_ALARM: An alarm of this type is associated with a\n  software or processing fault (ITU-T Recommendation X.733).\n* ENVIRONMENTAL_ALARM: An alarm of this type is associated with a\n  condition related to an enclosure in which the equipment resides\n  (ITU-T Recommendation X.733).\n* QOS_ALARM: An alarm of this type is associated with degradation in the\n  quality of a service (ITU-T Recommendation X.733).\n* EQUIPMENT_ALARM: An alarm of this type is associated with an equipment\n  fault (ITU-T Recommendation X.733).\n",
+            "type": "string",
+            "enum": [
+              "COMMUNICATIONS_ALARM",
+              "PROCESSING_ERROR_ALARM",
+              "ENVIRONMENTAL_ALARM",
+              "QOS_ALARM",
+              "EQUIPMENT_ALARM"
+            ]
+          }
+        },
+        "probableCauses": {
+          "description": "Match VNF alarms with a probable cause listed in this attribute.\n",
           "type": "array",
           "items": {
-            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
             "type": "string"
           }
         }
@@ -58,23 +200,22 @@
       "type": "string"
     },
     "_links": {
-      "description": "Links for this resource\n",
+      "description": "Links for this resource.\n",
       "type": "object",
       "required": [
         "self"
       ],
       "properties": {
         "self": {
-          "description": "This type represents a link to a resource.\n",
+          "description": "This type represents a link to a resource using an absolute URI.\n",
           "type": "object",
           "required": [
             "href"
           ],
           "properties": {
             "href": {
-              "description": "URI of the referenced resource.\n",
-              "type": "string",
-              "format": "url"
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
           }
         }
diff --git a/SOL002/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json b/SOL002/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json
index 6394f38119da95caa764e09e3af7f34c66d734ba..d61b2a28af75051da15e4f9ac5bda6ab5c071675 100644
--- a/SOL002/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json
+++ b/SOL002/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json
@@ -1,7 +1,7 @@
 {
   "type": "array",
-  "items": {
-    "description": "This type represents a subscription related to notifications related to the availability of the virtualised resources quotas.\n",
+  "items":  {
+    "description": "This type represents a subscription related to notifications about VNF faults.\n",
     "type": "object",
     "required": [
       "id",
@@ -14,29 +14,141 @@
         "type": "string"
       },
       "filter": {
-        "description": "This type represents a subscription filter related to notifications about the availability of the virtualised resources quotas. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
+        "description": "This type represents a subscription filter related to notifications about VNF faults.\nAt a particular nesting level in the filter structure, the following applies: All attributes  shall match in order for the filter to match (logical \"and\" between different filter attributes).  If an attribute is an array, the attribute shall match if at least one of the values in the array  matches (logical \"or\" between the values of one filter attribute).\nNOTE:\tThe permitted values of the \"notificationTypes\" attribute are spelled exactly as the names \n      of the notification types to facilitate automated code generation systems.\n",
         "type": "object",
         "properties": {
-          "vimIds": {
-            "description": "Match VIMs that were created the quota for a consumer of the virtualised resources. This attribute shall only be supported when VNF-related Resource Management in direct mode is applicable.\n",
-            "type": "array",
-            "items": {
-              "description": "An identifier with the intention of being globally unique.\n",
-              "type": "string"
+          "vnfInstanceSubscriptionFilter": {
+            "description": "This type represents subscription filter criteria to match VNF instances. * NOTE 1:\tThe attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances\n          that are based on certain VNFDs in a filter. They should not be used both in the same filter instance,\n          but one alternative should be chosen.\n  NOTE 2:\tThe attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF\n          instances in a filter. They should not be used both in the same filter instance, but one alternative\n          should be chosen.\n",
+            "type": "object",
+            "anyOf": [
+              {
+                "oneOf": [
+                  {
+                    "required": [
+                      "vnfdId"
+                    ]
+                  },
+                  {
+                    "required": [
+                      "vnfProductsFromProviders"
+                    ]
+                  }
+                ]
+              },
+              {
+                "oneOf": [
+                  {
+                    "required": [
+                      "vnfInstanceIds"
+                    ]
+                  },
+                  {
+                    "required": [
+                      "vnfInstanceNames"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "properties": {
+              "vnfdIds": {
+                "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. See note 1.\n",
+                "type": "array",
+                "items": {
+                  "description": "An identifier with the intention of being globally unique.\n",
+                  "type": "string"
+                }
+              },
+              "vnfProductsFromProviders": {
+                "description": "If present, match VNF instances that belong to VNF products from certain providers. See note 1.\n",
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "required": [
+                    "vnfProvider"
+                  ],
+                  "properties": {
+                    "vnfProvider": {
+                      "description": "Name of the VNF provider to match.\n",
+                      "type": "string"
+                    },
+                    "vnfProducts": {
+                      "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "required": [
+                          "vnfProductName"
+                        ],
+                        "properties": {
+                          "vnfProductName": {
+                            "description": "Name of the VNF product to match.\n",
+                            "type": "string"
+                          },
+                          "versions": {
+                            "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",
+                            "type": "array",
+                            "items": {
+                              "type": "object",
+                              "required": [
+                                "vnfSoftwareVersion"
+                              ],
+                              "properties": {
+                                "vnfSoftwareVersion": {
+                                  "description": "A version.\n",
+                                  "type": "string"
+                                },
+                                "vnfdVersions": {
+                                  "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
+                                  "type": "array",
+                                  "items": {
+                                    "description": "A version.\n",
+                                    "type": "string"
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "vnfInstanceIds": {
+                "description": "If present, match VNF instances with an instance identifier listed in this attribute. See note 2.\n",
+                "type": "array",
+                "items": {
+                  "description": "An identifier with the intention of being globally unique.\n",
+                  "type": "string"
+                }
+              },
+              "vnfInstanceNames": {
+                "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. See note 2.\n",
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
             }
           },
-          "resourceProviderIds": {
-            "description": "Match the entities responsible for the management of the virtualised resources that were allocated by the NFVO. This attribute shall only be supported when VNF-related Resource Management in indirect mode is applicable. The identification scheme is outside the scope of the present document.\n",
+          "notificationTypes": {
+            "description": "Match particular notification types. \nPermitted values: -\tAlarmNotification -\tAlarmClearedNotification -\tAlarmListRebuiltNotification See note.\n",
             "type": "array",
             "items": {
-              "description": "An identifier with the intention of being globally unique.\n",
-              "type": "string"
+              "type": "string",
+              "enum": [
+                "AlarmNotification",
+                "AlarmClearedNotification",
+                "AlarmListRebuiltNotification"
+              ]
             }
           },
-          "resourceTypes": {
-            "description": "Match particular resource types.\n",
+          "faultyResourceTypes": {
+            "description": "Match VNF alarms with a faulty resource type listed in this attribute.\n",
             "type": "array",
             "items": {
+              "description": "The enumeration FaultyResourceType represents those types of faulty resource.\n",
               "type": "string",
               "enum": [
                 "COMPUTE",
@@ -45,11 +157,41 @@
               ]
             }
           },
-          "resourceGroupIds": {
-            "description": "Match the \"infrastructure resource groups\" that are logical groupings of the virtualised resources assigned to a tenant within an infrastructure Domain.\n",
+          "perceivedSeverities": {
+            "description": "Match VNF alarms with a perceived severity listed in this attribute.\n",
+            "type": "array",
+            "items": {
+              "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service\n  affecting condition has occurred and an immediate corrective action\n  is required. Such a severity can be reported, for example, when a\n  managed object becomes totally out of service and its capability needs\n  to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting\n  condition has developed and an urgent corrective action is required.\n  Such a severity can be reported, for example, when there is a severe\n  degradation in the capability of the managed object and its full\n  capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a\n  non-service affecting fault condition and that corrective action\n  should be taken in order to prevent a more serious (for example,\n  service affecting) fault. Such a severity can be reported, for\n  example, when the detected alarm condition is not currently degrading\n  the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a\n  potential or impending service affecting fault, before any significant\n  effects have been felt. Action should be taken to further diagnose (if\n  necessary) and correct the problem in order to prevent it from\n  becoming a more serious service affecting fault (ITU-T Recommendation\n  X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the\n  severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or\n  more previously reported alarms. This alarm clears all alarms for this\n  managed object that have the same Alarm type, Probable cause and\n  Specific problems (if given) (ITU-T Recommendation X.733).\n",
+              "type": "string",
+              "enum": [
+                "CRITICAL",
+                "MAJOR",
+                "MINOR",
+                "WARNING",
+                "INDETERMINATE",
+                "CLEARED"
+              ]
+            }
+          },
+          "eventTypes": {
+            "description": "Match VNF alarms with an event type listed in this attribute.\n",
+            "type": "array",
+            "items": {
+              "description": "The enumeration EventType represents those types of events that trigger an alarm. * COMMUNICATIONS_ALARM: An alarm of this type is associated with the\n  procedure and/or process required conveying information from one point\n  to another (ITU-T Recommendation X.733).\n* PROCESSING_ERROR_ALARM: An alarm of this type is associated with a\n  software or processing fault (ITU-T Recommendation X.733).\n* ENVIRONMENTAL_ALARM: An alarm of this type is associated with a\n  condition related to an enclosure in which the equipment resides\n  (ITU-T Recommendation X.733).\n* QOS_ALARM: An alarm of this type is associated with degradation in the\n  quality of a service (ITU-T Recommendation X.733).\n* EQUIPMENT_ALARM: An alarm of this type is associated with an equipment\n  fault (ITU-T Recommendation X.733).\n",
+              "type": "string",
+              "enum": [
+                "COMMUNICATIONS_ALARM",
+                "PROCESSING_ERROR_ALARM",
+                "ENVIRONMENTAL_ALARM",
+                "QOS_ALARM",
+                "EQUIPMENT_ALARM"
+              ]
+            }
+          },
+          "probableCauses": {
+            "description": "Match VNF alarms with a probable cause listed in this attribute.\n",
             "type": "array",
             "items": {
-              "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
               "type": "string"
             }
           }
@@ -60,23 +202,22 @@
         "type": "string"
       },
       "_links": {
-        "description": "Links for this resource\n",
+        "description": "Links for this resource.\n",
         "type": "object",
         "required": [
           "self"
         ],
         "properties": {
           "self": {
-            "description": "This type represents a link to a resource.\n",
+            "description": "This type represents a link to a resource using an absolute URI.\n",
             "type": "object",
             "required": [
               "href"
             ],
             "properties": {
               "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
               }
             }
           }
diff --git a/SOL002/VNFFaultManagement-API/schemas/alarm.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarm.schema.json
index 49166a3b78a7485ecff32da358d292bb85549d28..44aea28bc11d24f4469aec51e873290023462883 100644
--- a/SOL002/VNFFaultManagement-API/schemas/alarm.schema.json
+++ b/SOL002/VNFFaultManagement-API/schemas/alarm.schema.json
@@ -1,5 +1,5 @@
 {
-  "description": "The alarm data type encapsulates information about an alarm. It shall comply with the provisions defined in  table 7.5.2.4-1.\nIf the attribute \"faultType\" has the value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\",  the following provisions apply for the values of the attribute \"faultDetails\" related to  changes in the state of virtualised resources:\n  - One of the entries in the array shall provide information about the anticipated time of maintenance in the\n    following format: \"anticipatedTime=$time\", wherein \"$time\" shall be formatted as a \"DateTime\", as specified\n    in ETSI GS NFV-SOL 013 [6].\n  - One of the entries in the array shall provide identification information about the affinity/anti-affinity group\n    defined in the VNFD that is associated to the affected virtualised resource indicated by \"rootCauseFaultyResource\" \n    in the following format: \"affinityOrAntiAffinityGroupId=$group\", wherein \"$group\" shall be equal to the \n    \"affinityOrAntiAffinityGroupId\" value in the corresponding \"VduProfile\" (for a VNFC/COMPUTE affected resource) \n    or \"VirtualLinkProfile\" for a VL/NETWORK affected resource) in the VNFD, which is mapped by the VNFM to the \n    virtualised resource group identifier in the virtualised resource change notification received by the VNFM from \n    the VIM.\n\nNOTE 1: For an alarm about upcoming impact due to NFVI operation and maintenance (i.e. the attribute \"faultType\" \n        has the value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\"), the attribute \"rootCauseFaultyResource\" \n        indicates a resource to be impacted. Further information on the upcoming impact (e.g. group of impacted \n        resources, time of impact) is provided in the attribute \"faultDetails\".\nNOTE 2: When alarms are due to upcoming NFVI operation and maintenance (i.e. the attribute \"faultType\" has the\n        value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\"), the attribute \"faultDetails\" shall include information \n        about the anticipated time of the maintenance. See provisions under the present table.\n",
+  "description": "The alarm data type encapsulates information about an alarm.\nIf the attribute \"faultType\" has the value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\",  the following provisions apply for the values of the attribute \"faultDetails\" related to  changes in the state of virtualised resources:\n  - One of the entries in the array shall provide information about the anticipated time of maintenance in the\n    following format: \"anticipatedTime=$time\", wherein \"$time\" shall be formatted as a \"DateTime\", as specified\n    in ETSI GS NFV-SOL 013 [6].\n  - One of the entries in the array shall provide identification information about the affinity/anti-affinity group\n    defined in the VNFD that is associated to the affected virtualised resource indicated by \"rootCauseFaultyResource\" \n    in the following format: \"affinityOrAntiAffinityGroupId=$group\", wherein \"$group\" shall be equal to the \n    \"affinityOrAntiAffinityGroupId\" value in the corresponding \"VduProfile\" (for a VNFC/COMPUTE affected resource) \n    or \"VirtualLinkProfile\" for a VL/NETWORK affected resource) in the VNFD, which is mapped by the VNFM to the \n    virtualised resource group identifier in the virtualised resource change notification received by the VNFM from \n    the VIM.\n\nNOTE 1: For an alarm about upcoming impact due to NFVI operation and maintenance (i.e. the attribute \"faultType\" \n        has the value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\"), the attribute \"rootCauseFaultyResource\" \n        indicates a resource to be impacted. Further information on the upcoming impact (e.g. group of impacted \n        resources, time of impact) is provided in the attribute \"faultDetails\".\nNOTE 2: When alarms are due to upcoming NFVI operation and maintenance (i.e. the attribute \"faultType\" has the\n        value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\"), the attribute \"faultDetails\" shall include information \n        about the anticipated time of the maintenance. See provisions under the present table.\n",
   "type": "object",
   "required": [
     "id",
@@ -43,7 +43,7 @@
             "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",
+          "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",
@@ -54,11 +54,33 @@
               "type": "string"
             },
             "resourceId": {
-              "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+              "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": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+              "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"
             }
           }
@@ -135,7 +157,7 @@
       "type": "string"
     },
     "probableCause": {
-      "description": "Information about the probable cause of the fault. If the attribute \"faultType\" has the value “NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE”, the  permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. physical maintenance/repair, \n    hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g. to support energy\n    efficiency or resource usage optimization.\n",
+      "description": "Information about the probable cause of the fault. If the attribute \"faultType\" has the value ΓÇ£NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGEΓÇ¥, the  permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. physical maintenance/repair, \n    hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g. to support energy\n    efficiency or resource usage optimization.\n",
       "type": "string"
     },
     "isRootCause": {
diff --git a/SOL002/VNFFaultManagement-API/schemas/alarmClearedNotification.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarmClearedNotification.schema.json
index 08131723d82361c2b27ba85b4ad5e7bc1077da2f..e71ffd497ad78e067bacb8aa733928d1bb772340 100644
--- a/SOL002/VNFFaultManagement-API/schemas/alarmClearedNotification.schema.json
+++ b/SOL002/VNFFaultManagement-API/schemas/alarmClearedNotification.schema.json
@@ -27,7 +27,7 @@
       "type": "string"
     },
     "timeStamp": {
-      "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
+      "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
       "type": "string",
       "format": "date-time"
     },
@@ -36,7 +36,9 @@
       "type": "string"
     },
     "alarmClearedTime": {
-      "description": "The time stamp indicating when the alarm was cleared.\n"
+      "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+      "type": "string",
+      "format": "date-time"
     },
     "_links": {
       "description": "Links to resources related to this notification.\n",
@@ -47,30 +49,28 @@
       ],
       "properties": {
         "subscription": {
-          "description": "This type represents a link to a resource.\n",
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
           "type": "object",
           "required": [
             "href"
           ],
           "properties": {
             "href": {
-              "description": "URI of the referenced resource.\n",
-              "type": "string",
-              "format": "url"
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
           }
         },
         "alarm": {
-          "description": "This type represents a link to a resource.\n",
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
           "type": "object",
           "required": [
             "href"
           ],
           "properties": {
             "href": {
-              "description": "URI of the referenced resource.\n",
-              "type": "string",
-              "format": "url"
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
           }
         }
diff --git a/SOL002/VNFFaultManagement-API/schemas/alarmListRebuiltNotification.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarmListRebuiltNotification.schema.json
index bfe018df8f3dec0fc2526d02254fa13486ea68b9..d13d292b86f9afd2022d0f274f291e8a292912fc 100644
--- a/SOL002/VNFFaultManagement-API/schemas/alarmListRebuiltNotification.schema.json
+++ b/SOL002/VNFFaultManagement-API/schemas/alarmListRebuiltNotification.schema.json
@@ -1,5 +1,5 @@
 {
-  "description": "This type represents a notification that the alarm list has been rebuilt, e.g. if the VNFM detects its storage holding the alarm list is corrupted. The notification shall be triggered by the VNFM when the alarm list has been rebuilt.\n",
+  "description": "This type represents a notification that the alarm list has been rebuilt, e.g. if the VNFM detects its storage holding the alarm list is corrupted. The notification shall be triggered by the VNFM when the alarm list has been rebuilt, e.g. because the VNFM has detected that its storage holding the alarm list was corrupted.\n",
   "type": "object",
   "required": [
     "id",
@@ -25,7 +25,7 @@
       "type": "string"
     },
     "timeStamp": {
-      "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
+      "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
       "type": "string",
       "format": "date-time"
     },
@@ -38,30 +38,28 @@
       ],
       "properties": {
         "subscription": {
-          "description": "This type represents a link to a resource.\n",
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
           "type": "object",
           "required": [
             "href"
           ],
           "properties": {
             "href": {
-              "description": "URI of the referenced resource.\n",
-              "type": "string",
-              "format": "url"
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
           }
         },
         "alarms": {
-          "description": "This type represents a link to a resource.\n",
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
           "type": "object",
           "required": [
             "href"
           ],
           "properties": {
             "href": {
-              "description": "URI of the referenced resource.\n",
-              "type": "string",
-              "format": "url"
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
           }
         }
diff --git a/SOL002/VNFFaultManagement-API/schemas/alarmModifications.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarmModifications.schema.json
index 460ad06565d3e2bd8ee356b8448f14202150b7cf..4e98ff4de27d165e11d2212645f6eccb052d6277 100644
--- a/SOL002/VNFFaultManagement-API/schemas/alarmModifications.schema.json
+++ b/SOL002/VNFFaultManagement-API/schemas/alarmModifications.schema.json
@@ -6,10 +6,11 @@
   ],
   "properties": {
     "ackState": {
-      "description": "New value of the \"ackState\" attribute in \"Alarm\". Permitted values: * ACKNOWLEDGED\n",
+      "description": "New value of the \"ackState\" attribute in \"Alarm\". Permitted values: * ACKNOWLEDGED * UNACKNOWLEDGED\n",
       "type": "string",
       "enum": [
-        "ACKNOWLEDGED"
+        "ACKNOWLEDGED",
+        "UNACKNOWLEDGED"
       ]
     }
   }
diff --git a/SOL002/VNFFaultManagement-API/schemas/alarmNotification.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarmNotification.schema.json
index bca2fc85657c28c9914c131ea0abf5ea8bd997b6..aba8ecf662d0995545d70cddccd165761f8e2ad4 100644
--- a/SOL002/VNFFaultManagement-API/schemas/alarmNotification.schema.json
+++ b/SOL002/VNFFaultManagement-API/schemas/alarmNotification.schema.json
@@ -1,244 +1,274 @@
 {
-    "description": "This type represents an alarm notification about VNF faults. This notification shall be triggered by the VNFM when: * An alarm has been created. * An alarm has been updated, e.g. if the severity of the alarm has  changed.\n",
-    "type": "object",
-    "required": [
-      "id",
-      "notificationType",
-      "subscriptionId",
-      "timeStamp",
-      "alarm",
-      "_links"
-    ],
-    "properties": {
-      "id": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "notificationType": {
-        "description": "Discriminator for the different notification types. Shall be set to \"AlarmNotification\" for this notification type.\n",
-        "type": "string",
-        "enum": [
-          "AlarmNotification"
-        ]
-      },
-      "subscriptionId": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "timeStamp": {
-        "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
-        "type": "string",
-        "format": "date-time"
-      },
-      "alarm": {
-        "description": "The alarm data type encapsulates information about an alarm.\n",
-        "type": "object",
-        "required": [
-          "id",
-          "managedObjectId",
-          "rootCauseFaultyResource",
-          "alarmRaisedTime",
-          "ackState",
-          "perceivedSeverity",
-          "eventTime",
-          "eventType",
-          "probableCause",
-          "isRootCause",
-          "_links"
-        ],
-        "properties": {
-          "id": {
-            "description": "An identifier with the intention of being globally unique.\n",
-            "type": "string"
-          },
-          "managedObjectId": {
-            "description": "An identifier with the intention of being globally unique.\n",
+  "description": "This type represents an alarm notification about VNF faults. This notification shall be triggered by the VNFM when: * An alarm has been created. * An alarm has been updated, e.g. if the severity of the alarm has\n  changed.\n",
+  "type": "object",
+  "required": [
+    "id",
+    "notificationType",
+    "subscriptionId",
+    "timeStamp",
+    "alarm",
+    "_links"
+  ],
+  "properties": {
+    "id": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "notificationType": {
+      "description": "Discriminator for the different notification types. Shall be set to \"AlarmNotification\" for this notification type.\n",
+      "type": "string",
+      "enum": [
+        "AlarmNotification"
+      ]
+    },
+    "subscriptionId": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "timeStamp": {
+      "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+      "type": "string",
+      "format": "date-time"
+    },
+    "alarm": {
+      "description": "The alarm data type encapsulates information about an alarm.\nIf the attribute \"faultType\" has the value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\",  the following provisions apply for the values of the attribute \"faultDetails\" related to  changes in the state of virtualised resources:\n  - One of the entries in the array shall provide information about the anticipated time of maintenance in the\n    following format: \"anticipatedTime=$time\", wherein \"$time\" shall be formatted as a \"DateTime\", as specified\n    in ETSI GS NFV-SOL 013 [6].\n  - One of the entries in the array shall provide identification information about the affinity/anti-affinity group\n    defined in the VNFD that is associated to the affected virtualised resource indicated by \"rootCauseFaultyResource\" \n    in the following format: \"affinityOrAntiAffinityGroupId=$group\", wherein \"$group\" shall be equal to the \n    \"affinityOrAntiAffinityGroupId\" value in the corresponding \"VduProfile\" (for a VNFC/COMPUTE affected resource) \n    or \"VirtualLinkProfile\" for a VL/NETWORK affected resource) in the VNFD, which is mapped by the VNFM to the \n    virtualised resource group identifier in the virtualised resource change notification received by the VNFM from \n    the VIM.\n\nNOTE 1: For an alarm about upcoming impact due to NFVI operation and maintenance (i.e. the attribute \"faultType\" \n        has the value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\"), the attribute \"rootCauseFaultyResource\" \n        indicates a resource to be impacted. Further information on the upcoming impact (e.g. group of impacted \n        resources, time of impact) is provided in the attribute \"faultDetails\".\nNOTE 2: When alarms are due to upcoming NFVI operation and maintenance (i.e. the attribute \"faultType\" has the\n        value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\"), the attribute \"faultDetails\" shall include information \n        about the anticipated time of the maintenance. See provisions under the present table.\n",
+      "type": "object",
+      "required": [
+        "id",
+        "managedObjectId",
+        "alarmRaisedTime",
+        "ackState",
+        "perceivedSeverity",
+        "eventTime",
+        "eventType",
+        "probableCause",
+        "isRootCause",
+        "_links"
+      ],
+      "properties": {
+        "id": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        },
+        "managedObjectId": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        },
+        "vnfcInstanceIds": {
+          "description": "Identifiers of the affected VNFC instances. Each identifier references the  \"id\" attribute in a \"VnfcInfo\" structure. Shall be present if the alarm affects  at least one VNFC instance.\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"
-          },
-          "rootCauseFaultyResource": {
-            "description": "This type represents the faulty virtual resources that have a negative impact on a VNF.\n",
-            "type": "object",
-            "required": [
-              "faultyResource",
-              "faultyResourceType"
-            ],
-            "properties": {
-              "faultyResource": {
-                "required": [
-                  "vimConnectionId",
-                  "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",
-                "properties": {
-                  "vimConnectionId": {
-                    "description": "An identifier with the intention of being globally unique.\n",
-                    "type": "string"
-                  },
-                  "resourceProviderId": {
-                    "description": "An identifier with the intention of being globally unique.\n",
-                    "type": "string"
-                  },
-                  "resourceId": {
-                    "description": "An identifier maintained by the VIM 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 resource provider.\n",
-                    "type": "string"
+          }
+        },
+        "rootCauseFaultyResource": {
+          "description": "This type represents the faulty virtual resources that have a negative impact on a VNF.\n",
+          "type": "object",
+          "required": [
+            "faultyResource",
+            "faultyResourceType"
+          ],
+          "properties": {
+            "faultyResource": {
+              "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": {
+                "vimConnectionId": {
+                  "description": "An identifier with the intention of being globally unique.\n",
+                  "type": "string"
+                },
+                "resourceProviderId": {
+                  "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",
+                  "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"
                 }
-              },
-              "faultyResourceType": {
-                "description": "The enumeration FaultyResourceType represents those types of faulty resource.\n",
-                "type": "string",
-                "enum": [
-                  "COMPUTE",
-                  "STORAGE",
-                  "NETWORK"
-                ]
               }
+            },
+            "faultyResourceType": {
+              "description": "The enumeration FaultyResourceType represents those types of faulty resource.\n",
+              "type": "string",
+              "enum": [
+                "COMPUTE",
+                "STORAGE",
+                "NETWORK"
+              ]
             }
-          },
-          "alarmRaisedTime": {
-            "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
-            "type": "string",
-            "format": "date-time"
-          },
-          "alarmChangedTime": {
-            "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
-            "type": "string",
-            "format": "date-time"
-          },
-          "alarmClearedTime": {
-            "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
-            "type": "string",
-            "format": "date-time"
-          },
-          "ackState": {
-            "description": "Acknowledgement state of the alarm.  Permitted values: * UNACKNOWLEDGED * ACKNOWLEDGED.\n",
-            "type": "string",
-            "enum": [
-              "UNACKNOWLEDGED",
-              "ACKNOWLEDGED"
-            ]
-          },
-          "perceivedSeverity": {
-            "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service  affecting condition has occurred and an immediate corrective action\n  is required. Such a severity can be reported, for example, when a\n  managed object becomes totally out of service and its capability needs\n  to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting  condition has developed and an urgent corrective action is required.\n  Such a severity can be reported, for example, when there is a severe\n  degradation in the capability of the managed object and its full\n  capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a  non-service affecting fault condition and that corrective action\n  should be taken in order to prevent a more serious (for example,\n  service affecting) fault. Such a severity can be reported, for\n  example, when the detected alarm condition is not currently degrading\n  the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a  potential or impending service affecting fault, before any significant\n  effects have been felt. Action should be taken to further diagnose (if\n  necessary) and correct the problem in order to prevent it from\n  becoming a more serious service affecting fault (ITU-T Recommendation\n  X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the  severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or  more previously reported alarms. This alarm clears all alarms for this\n  managed object that have the same Alarm type, Probable cause and\n  Specific problems (if given) (ITU-T Recommendation X.733).\n",
-            "type": "string",
-            "enum": [
-              "CRITICAL",
-              "MAJOR",
-              "MINOR",
-              "WARNING",
-              "INDETERMINATE",
-              "CLEARED"
-            ]
-          },
-          "eventTime": {
-            "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
-            "type": "string",
-            "format": "date-time"
-          },
-          "eventType": {
-            "description": "The enumeration EventType represents those types of events that trigger an alarm. * COMMUNICATIONS_ALARM: An alarm of this type is associated with the  procedure and/or process required conveying information from one point\n  to another (ITU-T Recommendation X.733).\n* PROCESSING_ERROR_ALARM: An alarm of this type is associated with a  software or processing fault (ITU-T Recommendation X.733).\n* ENVIRONMENTAL_ALARM: An alarm of this type is associated with a  condition related to an enclosure in which the equipment resides\n  (ITU-T Recommendation X.733).\n* QOS_ALARM: An alarm of this type is associated with degradation in the  quality of a service (ITU-T Recommendation X.733).\n* EQUIPMENT_ALARM: An alarm of this type is associated with an equipment  fault (ITU-T Recommendation X.733).\n",
-            "type": "string",
-            "enum": [
-              "COMMUNICATIONS_ALARM",
-              "PROCESSING_ERROR_ALARM",
-              "ENVIRONMENTAL_ALARM",
-              "QOS_ALARM",
-              "EQUIPMENT_ALARM"
-            ]
-          },
-          "faultType": {
-            "description": "Additional information to clarify the type of the fault.\n",
+          }
+        },
+        "alarmRaisedTime": {
+          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+          "type": "string",
+          "format": "date-time"
+        },
+        "alarmChangedTime": {
+          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+          "type": "string",
+          "format": "date-time"
+        },
+        "alarmClearedTime": {
+          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+          "type": "string",
+          "format": "date-time"
+        },
+        "alarmAcknowledgedTime": {
+          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+          "type": "string",
+          "format": "date-time"
+        },
+        "ackState": {
+          "description": "Acknowledgement state of the alarm.  Permitted values: * UNACKNOWLEDGED * ACKNOWLEDGED.\n",
+          "type": "string",
+          "enum": [
+            "UNACKNOWLEDGED",
+            "ACKNOWLEDGED"
+          ]
+        },
+        "perceivedSeverity": {
+          "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service\n  affecting condition has occurred and an immediate corrective action\n  is required. Such a severity can be reported, for example, when a\n  managed object becomes totally out of service and its capability needs\n  to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting\n  condition has developed and an urgent corrective action is required.\n  Such a severity can be reported, for example, when there is a severe\n  degradation in the capability of the managed object and its full\n  capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a\n  non-service affecting fault condition and that corrective action\n  should be taken in order to prevent a more serious (for example,\n  service affecting) fault. Such a severity can be reported, for\n  example, when the detected alarm condition is not currently degrading\n  the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a\n  potential or impending service affecting fault, before any significant\n  effects have been felt. Action should be taken to further diagnose (if\n  necessary) and correct the problem in order to prevent it from\n  becoming a more serious service affecting fault (ITU-T Recommendation\n  X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the\n  severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or\n  more previously reported alarms. This alarm clears all alarms for this\n  managed object that have the same Alarm type, Probable cause and\n  Specific problems (if given) (ITU-T Recommendation X.733).\n",
+          "type": "string",
+          "enum": [
+            "CRITICAL",
+            "MAJOR",
+            "MINOR",
+            "WARNING",
+            "INDETERMINATE",
+            "CLEARED"
+          ]
+        },
+        "eventTime": {
+          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+          "type": "string",
+          "format": "date-time"
+        },
+        "eventType": {
+          "description": "The enumeration EventType represents those types of events that trigger an alarm. * COMMUNICATIONS_ALARM: An alarm of this type is associated with the\n  procedure and/or process required conveying information from one point\n  to another (ITU-T Recommendation X.733).\n* PROCESSING_ERROR_ALARM: An alarm of this type is associated with a\n  software or processing fault (ITU-T Recommendation X.733).\n* ENVIRONMENTAL_ALARM: An alarm of this type is associated with a\n  condition related to an enclosure in which the equipment resides\n  (ITU-T Recommendation X.733).\n* QOS_ALARM: An alarm of this type is associated with degradation in the\n  quality of a service (ITU-T Recommendation X.733).\n* EQUIPMENT_ALARM: An alarm of this type is associated with an equipment\n  fault (ITU-T Recommendation X.733).\n",
+          "type": "string",
+          "enum": [
+            "COMMUNICATIONS_ALARM",
+            "PROCESSING_ERROR_ALARM",
+            "ENVIRONMENTAL_ALARM",
+            "QOS_ALARM",
+            "EQUIPMENT_ALARM"
+          ]
+        },
+        "faultType": {
+          "description": "Additional information to clarify the type of the fault. If the alarm is related to changes in the state of virtualised resources due to NFVI  operation and maintenance, this attribute shall be set to \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE _CHANGE\".\n",
+          "type": "string"
+        },
+        "probableCause": {
+          "description": "Information about the probable cause of the fault. If the attribute \"faultType\" has the value ΓÇ£NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGEΓÇ¥, the  permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. physical maintenance/repair, \n    hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g. to support energy\n    efficiency or resource usage optimization.\n",
+          "type": "string"
+        },
+        "isRootCause": {
+          "description": "The Boolean is a data type having two values (true and false).\n",
+          "type": "boolean"
+        },
+        "correlatedAlarmIds": {
+          "description": "List of identifiers of other alarms correlated to this fault.\n",
+          "type": "array",
+          "items": {
+            "description": "An identifier with the intention of being globally unique.\n",
             "type": "string"
-          },
-          "probableCause": {
-            "description": "Information about the probable cause of the fault.\n",
+          }
+        },
+        "faultDetails": {
+          "description": "Provides additional information about the fault. See notes 1 and 2.\n",
+          "type": "array",
+          "items": {
             "type": "string"
-          },
-          "isRootCause": {
-            "description": "Attribute indicating if this fault is the root for other correlated alarms. If TRUE, then the alarms listed in the attribute CorrelatedAlarmId are caused by this fault.\n",
-            "type": "boolean"
-          },
-          "correlatedAlarmIds": {
-            "description": "List of identifiers of other alarms correlated to this fault.\n",
-            "type": "array",
-            "items": {
-              "description": "An identifier with the intention of being globally unique.\n",
-              "type": "string"
-            }
-          },
-          "faultDetails": {
-            "description": "Provides additional information about the fault.\n",
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "_links": {
-            "description": "Links for this resource.\n",
-            "type": "object",
-            "required": [
-              "self"
-            ],
-            "properties": {
-              "self": {
-                "description": "This type represents a link to a resource.\n",
-                "type": "object",
-                "required": [
-                  "href"
-                ],
-                "properties": {
-                  "href": {
-                    "description": "URI of the referenced resource.\n",
-                    "type": "string",
-                    "format": "url"
-                  }
+          }
+        },
+        "_links": {
+          "description": "Links for this resource.\n",
+          "type": "object",
+          "required": [
+            "self"
+          ],
+          "properties": {
+            "self": {
+              "description": "This type represents a link to a resource using an absolute URI.\n",
+              "type": "object",
+              "required": [
+                "href"
+              ],
+              "properties": {
+                "href": {
+                  "description": "String formatted according to IETF RFC 3986.\n",
+                  "type": "string"
                 }
-              },
-              "objectInstance": {
-                "description": "This type represents a link to a resource.\n",
-                "type": "object",
-                "required": [
-                  "href"
-                ],
-                "properties": {
-                  "href": {
-                    "description": "URI of the referenced resource.\n",
-                    "type": "string",
-                    "format": "url"
-                  }
+              }
+            },
+            "objectInstance": {
+              "description": "This type represents a link to a resource using an absolute URI.\n",
+              "type": "object",
+              "required": [
+                "href"
+              ],
+              "properties": {
+                "href": {
+                  "description": "String formatted according to IETF RFC 3986.\n",
+                  "type": "string"
                 }
               }
             }
           }
         }
-      },
-      "_links": {
-        "description": "Links to resources related to this notification.\n",
-        "type": "object",
-        "required": [
-          "subscription"
-        ],
-        "properties": {
-          "subscription": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
+      }
+    },
+    "_links": {
+      "description": "Links to resources related to this notification.\n",
+      "type": "object",
+      "required": [
+        "subscription"
+      ],
+      "properties": {
+        "subscription": {
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
           }
         }
       }
     }
-  }
\ No newline at end of file
+  }
+}
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/schemas/alarms.schema.json b/SOL002/VNFFaultManagement-API/schemas/alarms.schema.json
index 8eb6bf5974421f6ca0e3de398a69d8228d9d9727..632fefd6a84f13f0d8cc7a38c8ad836d8a045100 100644
--- a/SOL002/VNFFaultManagement-API/schemas/alarms.schema.json
+++ b/SOL002/VNFFaultManagement-API/schemas/alarms.schema.json
@@ -1,197 +1,216 @@
 {
   "type": "array",
   "items": {
+    "description": "The alarm data type encapsulates information about an alarm.\nIf the attribute \"faultType\" has the value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\",  the following provisions apply for the values of the attribute \"faultDetails\" related to  changes in the state of virtualised resources:\n  - One of the entries in the array shall provide information about the anticipated time of maintenance in the\n    following format: \"anticipatedTime=$time\", wherein \"$time\" shall be formatted as a \"DateTime\", as specified\n    in ETSI GS NFV-SOL 013 [6].\n  - One of the entries in the array shall provide identification information about the affinity/anti-affinity group\n    defined in the VNFD that is associated to the affected virtualised resource indicated by \"rootCauseFaultyResource\" \n    in the following format: \"affinityOrAntiAffinityGroupId=$group\", wherein \"$group\" shall be equal to the \n    \"affinityOrAntiAffinityGroupId\" value in the corresponding \"VduProfile\" (for a VNFC/COMPUTE affected resource) \n    or \"VirtualLinkProfile\" for a VL/NETWORK affected resource) in the VNFD, which is mapped by the VNFM to the \n    virtualised resource group identifier in the virtualised resource change notification received by the VNFM from \n    the VIM.\n\nNOTE 1: For an alarm about upcoming impact due to NFVI operation and maintenance (i.e. the attribute \"faultType\" \n        has the value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\"), the attribute \"rootCauseFaultyResource\" \n        indicates a resource to be impacted. Further information on the upcoming impact (e.g. group of impacted \n        resources, time of impact) is provided in the attribute \"faultDetails\".\nNOTE 2: When alarms are due to upcoming NFVI operation and maintenance (i.e. the attribute \"faultType\" has the\n        value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\"), the attribute \"faultDetails\" shall include information \n        about the anticipated time of the maintenance. See provisions under the present table.\n",
     "type": "object",
-    "items": {
-      "description": "The alarm data type encapsulates information about an alarm. It shall comply with the provisions defined in  table 7.5.2.4-1.\nIf the attribute \"faultType\" has the value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\",  the following provisions apply for the values of the attribute \"faultDetails\" related to  changes in the state of virtualised resources:\n  - One of the entries in the array shall provide information about the anticipated time of maintenance in the\n    following format: \"anticipatedTime=$time\", wherein \"$time\" shall be formatted as a \"DateTime\", as specified\n    in ETSI GS NFV-SOL 013 [6].\n  - One of the entries in the array shall provide identification information about the affinity/anti-affinity group\n    defined in the VNFD that is associated to the affected virtualised resource indicated by \"rootCauseFaultyResource\" \n    in the following format: \"affinityOrAntiAffinityGroupId=$group\", wherein \"$group\" shall be equal to the \n    \"affinityOrAntiAffinityGroupId\" value in the corresponding \"VduProfile\" (for a VNFC/COMPUTE affected resource) \n    or \"VirtualLinkProfile\" for a VL/NETWORK affected resource) in the VNFD, which is mapped by the VNFM to the \n    virtualised resource group identifier in the virtualised resource change notification received by the VNFM from \n    the VIM.\n\nNOTE 1: For an alarm about upcoming impact due to NFVI operation and maintenance (i.e. the attribute \"faultType\" \n        has the value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\"), the attribute \"rootCauseFaultyResource\" \n        indicates a resource to be impacted. Further information on the upcoming impact (e.g. group of impacted \n        resources, time of impact) is provided in the attribute \"faultDetails\".\nNOTE 2: When alarms are due to upcoming NFVI operation and maintenance (i.e. the attribute \"faultType\" has the\n        value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\"), the attribute \"faultDetails\" shall include information \n        about the anticipated time of the maintenance. See provisions under the present table.\n",
-      "type": "object",
-      "required": [
-        "id",
-        "managedObjectId",
-        "alarmRaisedTime",
-        "ackState",
-        "perceivedSeverity",
-        "eventTime",
-        "eventType",
-        "probableCause",
-        "isRootCause",
-        "_links"
-      ],
-      "properties": {
-        "id": {
-          "description": "An identifier with the intention of being globally unique.\n",
-          "type": "string"
-        },
-        "managedObjectId": {
-          "description": "An identifier with the intention of being globally unique.\n",
+    "required": [
+      "id",
+      "managedObjectId",
+      "alarmRaisedTime",
+      "ackState",
+      "perceivedSeverity",
+      "eventTime",
+      "eventType",
+      "probableCause",
+      "isRootCause",
+      "_links"
+    ],
+    "properties": {
+      "id": {
+        "description": "An identifier with the intention of being globally unique.\n",
+        "type": "string"
+      },
+      "managedObjectId": {
+        "description": "An identifier with the intention of being globally unique.\n",
+        "type": "string"
+      },
+      "vnfcInstanceIds": {
+        "description": "Identifiers of the affected VNFC instances. Each identifier references the  \"id\" attribute in a \"VnfcInfo\" structure. Shall be present if the alarm affects  at least one VNFC instance.\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"
-        },
-        "vnfcInstanceIds": {
-          "description": "Identifiers of the affected VNFC instances. Each identifier references the  \"id\" attribute in a \"VnfcInfo\" structure. Shall be present if the alarm affects  at least one VNFC instance.\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"
-          }
-        },
-        "rootCauseFaultyResource": {
-          "description": "This type represents the faulty virtual resources that have a negative impact on a VNF.\n",
-          "type": "object",
-          "required": [
-            "faultyResource",
-            "faultyResourceType"
-          ],
-          "properties": {
-            "faultyResource": {
-              "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",
-              "properties": {
-                "vimConnectionId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "resourceProviderId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "resourceId": {
-                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                  "type": "string"
-                },
-                "vimLevelResourceType": {
-                  "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
-                  "type": "string"
+        }
+      },
+      "rootCauseFaultyResource": {
+        "description": "This type represents the faulty virtual resources that have a negative impact on a VNF.\n",
+        "type": "object",
+        "required": [
+          "faultyResource",
+          "faultyResourceType"
+        ],
+        "properties": {
+          "faultyResource": {
+            "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": {
+              "vimConnectionId": {
+                "description": "An identifier with the intention of being globally unique.\n",
+                "type": "string"
+              },
+              "resourceProviderId": {
+                "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",
+                "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"
               }
-            },
-            "faultyResourceType": {
-              "description": "The enumeration FaultyResourceType represents those types of faulty resource.\n",
-              "type": "string",
-              "enum": [
-                "COMPUTE",
-                "STORAGE",
-                "NETWORK"
-              ]
             }
+          },
+          "faultyResourceType": {
+            "description": "The enumeration FaultyResourceType represents those types of faulty resource.\n",
+            "type": "string",
+            "enum": [
+              "COMPUTE",
+              "STORAGE",
+              "NETWORK"
+            ]
           }
-        },
-        "alarmRaisedTime": {
-          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
-          "type": "string",
-          "format": "date-time"
-        },
-        "alarmChangedTime": {
-          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
-          "type": "string",
-          "format": "date-time"
-        },
-        "alarmClearedTime": {
-          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
-          "type": "string",
-          "format": "date-time"
-        },
-        "alarmAcknowledgedTime": {
-          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
-          "type": "string",
-          "format": "date-time"
-        },
-        "ackState": {
-          "description": "Acknowledgement state of the alarm.  Permitted values: * UNACKNOWLEDGED * ACKNOWLEDGED.\n",
-          "type": "string",
-          "enum": [
-            "UNACKNOWLEDGED",
-            "ACKNOWLEDGED"
-          ]
-        },
-        "perceivedSeverity": {
-          "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service\n  affecting condition has occurred and an immediate corrective action\n  is required. Such a severity can be reported, for example, when a\n  managed object becomes totally out of service and its capability needs\n  to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting\n  condition has developed and an urgent corrective action is required.\n  Such a severity can be reported, for example, when there is a severe\n  degradation in the capability of the managed object and its full\n  capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a\n  non-service affecting fault condition and that corrective action\n  should be taken in order to prevent a more serious (for example,\n  service affecting) fault. Such a severity can be reported, for\n  example, when the detected alarm condition is not currently degrading\n  the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a\n  potential or impending service affecting fault, before any significant\n  effects have been felt. Action should be taken to further diagnose (if\n  necessary) and correct the problem in order to prevent it from\n  becoming a more serious service affecting fault (ITU-T Recommendation\n  X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the\n  severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or\n  more previously reported alarms. This alarm clears all alarms for this\n  managed object that have the same Alarm type, Probable cause and\n  Specific problems (if given) (ITU-T Recommendation X.733).\n",
-          "type": "string",
-          "enum": [
-            "CRITICAL",
-            "MAJOR",
-            "MINOR",
-            "WARNING",
-            "INDETERMINATE",
-            "CLEARED"
-          ]
-        },
-        "eventTime": {
-          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
-          "type": "string",
-          "format": "date-time"
-        },
-        "eventType": {
-          "description": "The enumeration EventType represents those types of events that trigger an alarm. * COMMUNICATIONS_ALARM: An alarm of this type is associated with the\n  procedure and/or process required conveying information from one point\n  to another (ITU-T Recommendation X.733).\n* PROCESSING_ERROR_ALARM: An alarm of this type is associated with a\n  software or processing fault (ITU-T Recommendation X.733).\n* ENVIRONMENTAL_ALARM: An alarm of this type is associated with a\n  condition related to an enclosure in which the equipment resides\n  (ITU-T Recommendation X.733).\n* QOS_ALARM: An alarm of this type is associated with degradation in the\n  quality of a service (ITU-T Recommendation X.733).\n* EQUIPMENT_ALARM: An alarm of this type is associated with an equipment\n  fault (ITU-T Recommendation X.733).\n",
-          "type": "string",
-          "enum": [
-            "COMMUNICATIONS_ALARM",
-            "PROCESSING_ERROR_ALARM",
-            "ENVIRONMENTAL_ALARM",
-            "QOS_ALARM",
-            "EQUIPMENT_ALARM"
-          ]
-        },
-        "faultType": {
-          "description": "Additional information to clarify the type of the fault. If the alarm is related to changes in the state of virtualised resources due to NFVI  operation and maintenance, this attribute shall be set to \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE _CHANGE\".\n",
+        }
+      },
+      "alarmRaisedTime": {
+        "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+        "type": "string",
+        "format": "date-time"
+      },
+      "alarmChangedTime": {
+        "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+        "type": "string",
+        "format": "date-time"
+      },
+      "alarmClearedTime": {
+        "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+        "type": "string",
+        "format": "date-time"
+      },
+      "alarmAcknowledgedTime": {
+        "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+        "type": "string",
+        "format": "date-time"
+      },
+      "ackState": {
+        "description": "Acknowledgement state of the alarm.  Permitted values: * UNACKNOWLEDGED * ACKNOWLEDGED.\n",
+        "type": "string",
+        "enum": [
+          "UNACKNOWLEDGED",
+          "ACKNOWLEDGED"
+        ]
+      },
+      "perceivedSeverity": {
+        "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service\n  affecting condition has occurred and an immediate corrective action\n  is required. Such a severity can be reported, for example, when a\n  managed object becomes totally out of service and its capability needs\n  to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting\n  condition has developed and an urgent corrective action is required.\n  Such a severity can be reported, for example, when there is a severe\n  degradation in the capability of the managed object and its full\n  capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a\n  non-service affecting fault condition and that corrective action\n  should be taken in order to prevent a more serious (for example,\n  service affecting) fault. Such a severity can be reported, for\n  example, when the detected alarm condition is not currently degrading\n  the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a\n  potential or impending service affecting fault, before any significant\n  effects have been felt. Action should be taken to further diagnose (if\n  necessary) and correct the problem in order to prevent it from\n  becoming a more serious service affecting fault (ITU-T Recommendation\n  X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the\n  severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or\n  more previously reported alarms. This alarm clears all alarms for this\n  managed object that have the same Alarm type, Probable cause and\n  Specific problems (if given) (ITU-T Recommendation X.733).\n",
+        "type": "string",
+        "enum": [
+          "CRITICAL",
+          "MAJOR",
+          "MINOR",
+          "WARNING",
+          "INDETERMINATE",
+          "CLEARED"
+        ]
+      },
+      "eventTime": {
+        "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+        "type": "string",
+        "format": "date-time"
+      },
+      "eventType": {
+        "description": "The enumeration EventType represents those types of events that trigger an alarm. * COMMUNICATIONS_ALARM: An alarm of this type is associated with the\n  procedure and/or process required conveying information from one point\n  to another (ITU-T Recommendation X.733).\n* PROCESSING_ERROR_ALARM: An alarm of this type is associated with a\n  software or processing fault (ITU-T Recommendation X.733).\n* ENVIRONMENTAL_ALARM: An alarm of this type is associated with a\n  condition related to an enclosure in which the equipment resides\n  (ITU-T Recommendation X.733).\n* QOS_ALARM: An alarm of this type is associated with degradation in the\n  quality of a service (ITU-T Recommendation X.733).\n* EQUIPMENT_ALARM: An alarm of this type is associated with an equipment\n  fault (ITU-T Recommendation X.733).\n",
+        "type": "string",
+        "enum": [
+          "COMMUNICATIONS_ALARM",
+          "PROCESSING_ERROR_ALARM",
+          "ENVIRONMENTAL_ALARM",
+          "QOS_ALARM",
+          "EQUIPMENT_ALARM"
+        ]
+      },
+      "faultType": {
+        "description": "Additional information to clarify the type of the fault. If the alarm is related to changes in the state of virtualised resources due to NFVI  operation and maintenance, this attribute shall be set to \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE _CHANGE\".\n",
+        "type": "string"
+      },
+      "probableCause": {
+        "description": "Information about the probable cause of the fault. If the attribute \"faultType\" has the value ΓÇ£NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGEΓÇ¥, the  permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. physical maintenance/repair, \n    hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g. to support energy\n    efficiency or resource usage optimization.\n",
+        "type": "string"
+      },
+      "isRootCause": {
+        "description": "The Boolean is a data type having two values (true and false).\n",
+        "type": "boolean"
+      },
+      "correlatedAlarmIds": {
+        "description": "List of identifiers of other alarms correlated to this fault.\n",
+        "type": "array",
+        "items": {
+          "description": "An identifier with the intention of being globally unique.\n",
           "type": "string"
-        },
-        "probableCause": {
-          "description": "Information about the probable cause of the fault. If the attribute \"faultType\" has the value “NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE”, the  permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. physical maintenance/repair, \n    hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g. to support energy\n    efficiency or resource usage optimization.\n",
+        }
+      },
+      "faultDetails": {
+        "description": "Provides additional information about the fault. See notes 1 and 2.\n",
+        "type": "array",
+        "items": {
           "type": "string"
-        },
-        "isRootCause": {
-          "description": "The Boolean is a data type having two values (true and false).\n",
-          "type": "boolean"
-        },
-        "correlatedAlarmIds": {
-          "description": "List of identifiers of other alarms correlated to this fault.\n",
-          "type": "array",
-          "items": {
-            "description": "An identifier with the intention of being globally unique.\n",
-            "type": "string"
-          }
-        },
-        "faultDetails": {
-          "description": "Provides additional information about the fault. See notes 1 and 2.\n",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "_links": {
-          "description": "Links for this resource.\n",
-          "type": "object",
-          "required": [
-            "self"
-          ],
-          "properties": {
-            "self": {
-              "description": "This type represents a link to a resource using an absolute URI.\n",
-              "type": "object",
-              "required": [
-                "href"
-              ],
-              "properties": {
-                "href": {
-                  "description": "String formatted according to IETF RFC 3986.\n",
-                  "type": "string"
-                }
+        }
+      },
+      "_links": {
+        "description": "Links for this resource.\n",
+        "type": "object",
+        "required": [
+          "self"
+        ],
+        "properties": {
+          "self": {
+            "description": "This type represents a link to a resource using an absolute URI.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
               }
-            },
-            "objectInstance": {
-              "description": "This type represents a link to a resource using an absolute URI.\n",
-              "type": "object",
-              "required": [
-                "href"
-              ],
-              "properties": {
-                "href": {
-                  "description": "String formatted according to IETF RFC 3986.\n",
-                  "type": "string"
-                }
+            }
+          },
+          "objectInstance": {
+            "description": "This type represents a link to a resource using an absolute URI.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
               }
             }
           }
diff --git a/SOL002/VNFFaultManagement-API/schemas/perceivedSeverityRequest.schema.json b/SOL002/VNFFaultManagement-API/schemas/perceivedSeverityRequest.schema.json
index ee370408ae331b493600571b782eaf0317d50e53..5ee777b0802e9764c23d1194e734cfaf2fcc0d4e 100644
--- a/SOL002/VNFFaultManagement-API/schemas/perceivedSeverityRequest.schema.json
+++ b/SOL002/VNFFaultManagement-API/schemas/perceivedSeverityRequest.schema.json
@@ -1,11 +1,21 @@
 {
-  "type": "string",
-  "enum": [
-    "CRITICAL",
-    "MAJOR",
-    "MINOR",
-    "WARNING",
-    "INDETERMINATE",
-    "CLEARED"
-  ]
+  "description": "This type represents the escalated value of the perceived severity for an alarm.\n",
+  "type": "object",
+  "required": [
+    "proposedPerceivedSeverity"
+  ],
+  "properties": {
+    "proposedPerceivedSeverity": {
+      "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service\n  affecting condition has occurred and an immediate corrective action\n  is required. Such a severity can be reported, for example, when a\n  managed object becomes totally out of service and its capability needs\n  to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting\n  condition has developed and an urgent corrective action is required.\n  Such a severity can be reported, for example, when there is a severe\n  degradation in the capability of the managed object and its full\n  capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a\n  non-service affecting fault condition and that corrective action\n  should be taken in order to prevent a more serious (for example,\n  service affecting) fault. Such a severity can be reported, for\n  example, when the detected alarm condition is not currently degrading\n  the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a\n  potential or impending service affecting fault, before any significant\n  effects have been felt. Action should be taken to further diagnose (if\n  necessary) and correct the problem in order to prevent it from\n  becoming a more serious service affecting fault (ITU-T Recommendation\n  X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the\n  severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or\n  more previously reported alarms. This alarm clears all alarms for this\n  managed object that have the same Alarm type, Probable cause and\n  Specific problems (if given) (ITU-T Recommendation X.733).\n",
+      "type": "string",
+      "enum": [
+        "CRITICAL",
+        "MAJOR",
+        "MINOR",
+        "WARNING",
+        "INDETERMINATE",
+        "CLEARED"
+      ]
+    }
+  }
 }
\ No newline at end of file