diff --git a/SOL005/NSFaultManagement-API/Alarms.robot b/SOL005/NSFaultManagement-API/Alarms.robot
index 83003c2041e14ade347d4810a6dc9f307636761c..003c600127e3969d6162960810930670eaa8ea3f 100644
--- a/SOL005/NSFaultManagement-API/Alarms.robot
+++ b/SOL005/NSFaultManagement-API/Alarms.robot
@@ -12,7 +12,7 @@ POST Alarms - Method not implemented
     ...    Test title:POST Alarms - Method not implemented
     ...    Test objective: The objective is to test that Post method is not allowed to create Fault management alarms on NFV
     ...    Pre-conditions: none
-    ...    Reference: clause 8.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none 
     ...    Post-Conditions:  alarm not created
@@ -24,7 +24,7 @@ GET information about multiple alarms
     ...    Test title: GET information about multiple alarms
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema and content validation of the returned alarms data structure
     ...    Pre-conditions:  none
-    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ GET information about multiple alarms with filters
     ...    Test title: GET information about multiple alarms with filters
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions:  none
-    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -50,20 +50,73 @@ GET information about multiple alarms Bad Request Invalid attribute-based filter
     ...    Test title: GET information about multiple alarms Bad Request Invalid attribute-based filtering parameters
     ...    Test objective:  The objective is to try to retrieve information about the alarm list with invalid filters and perform a JSON schema and content validation of the returned problem details data structure
     ...    Pre-conditions:  none
-    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:  none
     GET Alarms With Invalid Filters
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
-  
+
+GET information about multiple alarms with "all_fields" attribute selector
+    [Documentation]    Test ID: 5.3.3.1.5
+    ...    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: 
+    ...    Reference: clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: 
+    ...    Post-Conditions: 
+    GET Alarms Task with all_fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
+    
+GET information about multiple alarms with exclude_default attribute selector
+    [Documentation]    Test ID: 5.3.3.1.6
+    ...    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: 
+    ...    Reference: clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: 
+    ...    Post-Conditions: 
+    GET Alarms Task with exclude_default attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
+
+    
+GET information about multiple alarms with fields attribute selector
+    [Documentation]    Test ID: 5.3.3.1.7
+    ...    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: 
+    ...    Reference: clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: 
+    ...    Post-Conditions: 
+    GET Alarms Task with fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
+     
+GET information about multiple alarms with "exclude_fields" attribute selector
+    [Documentation]    Test ID: 5.3.3.1.8
+    ...    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: 
+    ...    Reference: clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: 
+    ...    Post-Conditions: none
+    GET Alarms Task with exclude_fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms  
+    
 PUT Alarms - Method not implemented
     [Documentation]    Test ID: 5.3.3.1.5
     ...    Test title: PUT Alarms - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for Fault management alarms on NFV
     ...    Pre-conditions:  none
-    ...    Reference: clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -76,7 +129,7 @@ PATCH Alarms - Method not implemented
     ...    Test title: PATCH Alarms - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed for Fault management alarms on NFV
     ...    Pre-conditions:  none
-    ...    Reference: clause 8.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -88,11 +141,149 @@ DELETE Alarms - Method not implemented
     ...    Test title: DELETE Alarms - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed for Fault management alarms on NFV
     ...    Pre-conditions:  none
-    ...    Reference: clause 8.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: alarm not deleted
     DELETE Alarms
     Check HTTP Response Status Code Is    405
+
+GET information about multiple alarms as Paged Response
+    [Documentation]    Test ID: 5.3.3.1.8
+    ...    Test title: GET information about multiple alarms as Paged Response
+    ...    Test objective: The objective is to retrieve information about the alarm list as paged response.
+    ...    Pre-conditions:  none
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Alarms
+    Check HTTP Response Status Code Is    200
+    Check LINK in Header
+    
+GET information about multiple alarms - Bad Request Response too Big
+    [Documentation]    Test ID: 5.3.3.1.9
+    ...    Test title: GET information about multiple alarms - Bad Request Response too Big
+    ...    Test objective:  The objective is to test that the retrieval of information about the alarm list fails because response is too big, and perform a JSON schema and content validation of the returned problem details data structure
+    ...    Pre-conditions:  none
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  none
+    ...    Post-Conditions:  none
+    GET Alarms
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    
+GET information about multiple alarms with filter "id"
+     [Documentation]    Test ID: 5.3.3.1.10
+    ...    Test title: GET information about multiple alarms with filter "id"
+    ...    Test objective: The objective is to retrieve information about the alarm list with filter "id" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
+    ...    Pre-conditions:  none
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Alarm With Filter "id"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
+    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "id"
+    
+GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyNestedNsInstanceId"
+     [Documentation]    Test ID: 5.3.3.1.11
+    ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyNestedNsInstanceId"
+    ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyComponent.faultyNestedNsInstanceId" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
+    ...    Pre-conditions:  none
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Alarms With Filter "rootCauseFaultyComponent_faultyNestedNsInstanceId"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
+    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "rootCauseFaultyComponent_faultyNestedNsInstanceId"
+    
+GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId"
+     [Documentation]    Test ID: 5.3.3.1.12
+    ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId"
+    ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
+    ...    Pre-conditions:  none
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Alarms With Filter "rootCauseFaultyComponent_faultyNsVirtualLinkInstanceId"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
+    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "faultyNsVirtualLinkInstanceId"
+    
+GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyVnfInstanceId"
+     [Documentation]    Test ID: 5.3.3.1.13
+    ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyComponent.faultyVnfInstanceId"
+    ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyComponent.faultyVnfInstanceId" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
+    ...    Pre-conditions:  none
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Alarms With Filter "rootCauseFaultyComponent_faultyVnfInstanceId"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
+    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "faultyVnfInstanceId"
     
 
+GET information about multiple alarms with filter "rootCauseFaultyResource.faultyResourceType"
+     [Documentation]    Test ID: 5.3.3.1.14
+    ...    Test title: GET information about multiple alarms with filter "rootCauseFaultyResource.faultyResourceType"
+    ...    Test objective: The objective is to retrieve information about the alarm list with filter "rootCauseFaultyResource.faultyResourceType" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
+    ...    Pre-conditions:  none
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Alarms With Filter "rootCauseFaultyResource_faultyResourceType"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
+    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "faultyResourceType"
+    
+GET information about multiple alarms with filter "eventType"
+     [Documentation]    Test ID: 5.3.3.1.15
+    ...    Test title: GET information about multiple alarms with filter "eventType"
+    ...    Test objective: The objective is to retrieve information about the alarm list with filter "eventType" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
+    ...    Pre-conditions:  none
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Alarms with filter "eventType"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
+    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "eventType"
+    
+GET information about multiple alarms with filter "perceivedSeverity"
+     [Documentation]    Test ID: 5.3.3.1.16
+    ...    Test title: GET information about multiple alarms with filter "perceivedSeverity"
+    ...    Test objective: The objective is to retrieve information about the alarm list with filter "perceivedSeverity" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
+    ...    Pre-conditions:  none
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Alarms with filter "perceivedSeverity"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
+    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "perceivedSeverity"
+    
+GET information about multiple alarms with filter "probableCause"
+     [Documentation]    Test ID: 5.3.3.1.17
+    ...    Test title: GET information about multiple alarms with filter "probableCause"
+    ...    Test objective: The objective is to retrieve information about the alarm list with filter "probableCause" and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters 
+    ...    Pre-conditions:  none
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Alarms with filter "probableCause"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
+    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "probableCause"
+    
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/IndividualAlarm.robot b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
index c9b40f6488032692cee273c886d239e6de183aab..d149f934ed3cfdcd34bc9a92ed869b3b2237c691 100644
--- a/SOL005/NSFaultManagement-API/IndividualAlarm.robot
+++ b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
@@ -14,7 +14,7 @@ POST Individual Alarm - Method not implemented
     ...    Test title:POST Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed for Fault management individual alarm on NFV
     ...    Pre-conditions: none
-    ...    Reference: clause 8.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions:  alarm is not created
@@ -26,7 +26,7 @@ GET information about Individual Alarm
     ...    Test title: GET information about Individual Alarm 
     ...    Test objective: The objective is to retrieve information about individual alarm and perform a JSON schema and content validation of the returned alarm data structure
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none   
@@ -39,7 +39,7 @@ GET information about Invalid Individual Alarm
     ...    Test title: GET information about Invalid Individual Alarm 
     ...    Test objective: The objective is to try to read an Invalid individual alarm and get 404 not found response code
     ...    Pre-conditions: The related alarm does not exists
-    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none 
@@ -52,7 +52,7 @@ PUT Individual Alarm - Method not implemented
     ...    Test title:PUT Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for Fault management individual alarm on NFV
     ...    Pre-conditions:  none
-    ...    Reference: clause 8.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none
@@ -64,7 +64,7 @@ PATCH Alarm
     ...    Test title: Modify an individual alarm resource
     ...    Test objective: The objective is to Modify an individual alarm resource and perform a JSON schema and content validation of the returned alarm modifications data structure
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -77,7 +77,7 @@ PATCH Alarm - Conflict
     ...    Test title: Modify an individual alarm resource - Conflict
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modified if the alarm is already in the state that is requested to be set
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ PATCH Alarm - Precondition failed
     ...    Test title: Modify an individual alarm resource - Precondition failed
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modifed if the resource was modified by another entity
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: 
@@ -104,7 +104,7 @@ DELETE Individual Alarm - Method not implemented
     ...    Test title:DELETE Individual Alarm - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed for Fault management individual alarm on NFV
     ...    Pre-conditions:  none
-    ...    Reference: clause 8.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: alarm not deleted
diff --git a/SOL005/NSFaultManagement-API/IndividualSubscription.robot b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
index b29206227cbc25fa9b7605d8c800a7a95de872cc..4dbf3bb34a492f527ac9ca204fae647281305444 100644
--- a/SOL005/NSFaultManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
@@ -11,7 +11,7 @@ Post Individual Subscription - Method not implemented
     ...    Test title:Post Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed for Fault management subscription on NFV  
     ...    Pre-conditions:none 
-    ...    Reference: clause 8.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: subscription is not created
@@ -23,7 +23,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 NFVO alarms subscribed by the client and perform a JSON schema and content validation of the returned fault management individual subscription data structure
     ...    Pre-conditions: The subscription with the given id exists
-    ...    Reference: clause 8.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -36,7 +36,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title:PUT an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed for Fault management subscription on NFV   
     ...    Pre-conditions: none
-    ...    Reference: clause 8.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -48,7 +48,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title:PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed for Fault management subscription on NFV  
     ...    Pre-conditions: none
-    ...    Reference: clause 8.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ DELETE an individual subscription
     ...    Test title:DELETE an individual subscription
     ...    Test objective: The objective is to DELETE an individual subscription 
     ...    Pre-conditions: The Subsbcription already exists
-    ...    Reference: clause 8.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: subscription is not deleted
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index 431f7c622d98e274b83b8047969e43d487aeb9df..7a68739d5889115d211f4f5d9efdc153cb69601a 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -7,6 +7,7 @@ Library    OperatingSystem
 #Suite Teardown    Terminate All Processes    kill=true
 Library    MockServerLibrary
 Library    Process
+Library     Collections
 
 *** Keywords ***
 Create Sessions
@@ -421,4 +422,194 @@ Do DELETE Notification
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
-    Verify Mock Expectation  ${req}
\ No newline at end of file
+    Verify Mock Expectation  ${req}
+    
+Check LINK in Header
+    ${linkURL}=    Get Value From Json    ${response.headers}    $..Link
+    Should Not Be Empty    ${linkURL}
+
+GET Alarm With Filter "id"
+	Log    Query NFVO The GET method queries information about multiple alarms with filter "id".
+	Set Headers  {"Accept":"${ACCEPT}"}  
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Log    Execute Query
+	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?id=${alarmId}
+	${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "id"
+    Should Be Equal As Strings    ${response['body']['id']}    ${alarmId}
+	
+GET Alarms With Filter "rootCauseFaultyComponent_faultyNestedNsInstanceId"
+	Log    Query NFVO The GET method queries information about multiple alarms with filter "rootCauseFaultyComponent.faultyNestedNsInstanceId".
+	Set Headers  {"Accept":"${ACCEPT}"}  
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Log    Execute Query
+	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyComponent.faultyNestedNsInstanceId=${faultyNestedNsInstanceId}
+	${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "rootCauseFaultyComponent_faultyNestedNsInstanceId"
+    :FOR   ${item}   IN  @{response['body']}
+    Should Be Equal As Strings     ${item['rootCauseFaultyComponent']['faultyNestedNsInstanceId']}    ${faultyNestedNsInstanceId}
+    END
+
+GET Alarms With Filter "rootCauseFaultyComponent_faultyNsVirtualLinkInstanceId"
+	Log    Query NFVO The GET method queries information about multiple alarms with filter "rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId".
+	Set Headers  {"Accept":"${ACCEPT}"}  
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Log    Execute Query
+	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyComponent.faultyNsVirtualLinkInstanceId=${faultyNsVirtualLinkInstanceId}
+	${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "faultyNsVirtualLinkInstanceId"
+    :FOR   ${item}   IN  @{response['body']}
+    Should Be Equal As Strings     ${item['rootCauseFaultyComponent']['faultyNsVirtualLinkInstanceId']}    ${faultyNsVirtualLinkInstanceId}
+    END
+	
+GET Alarms With Filter "rootCauseFaultyComponent_faultyVnfInstanceId"
+	Log    Query NFVO The GET method queries information about multiple alarms with filter "rootCauseFaultyComponent.faultyVnfInstanceId".
+	Set Headers  {"Accept":"${ACCEPT}"}  
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Log    Execute Query
+	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyComponent.faultyVnfInstanceId=${faultyVnfInstanceId}
+	${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "faultyVnfInstanceId"
+    :FOR   ${item}   IN  @{response['body']}
+    Should Be Equal As Strings     ${item['rootCauseFaultyComponent']['faultyVnfInstanceId']}    ${faultyVnfInstanceId}
+    END
+	
+GET Alarms With Filter "rootCauseFaultyResource_faultyResourceType"
+	Log    Query NFVO The GET method queries information about multiple alarms with filter "rootCauseFaultyResource.faultyResourceType".
+	Set Headers  {"Accept":"${ACCEPT}"}  
+	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+	Log    Execute Query
+	Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyResource.faultyResourceType=${faultyResourceType}
+	${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "faultyResourceType"
+    :FOR   ${item}   IN  @{response['body']}
+    Should Be Equal As Strings     ${item['rootCauseFaultyResource']['faultyResourceType']}    ${faultyResourceType}
+    END
+	
+GET Alarms with filter "eventType"
+	Log    Query VNF The GET method queries information about multiple alarms with filters "eventType".
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?eventType=${eventType}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "eventType"
+    :FOR   ${item}   IN  @{response['body']}
+    Should Be Equal As Strings     ${item['eventType']}    ${eventType}
+    END
+	
+GET Alarms with filter "perceivedSeverity"
+	Log    Query VNF The GET method queries information about multiple alarms with filters "perceivedSeverity".
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?perceivedSeverity=${perceivedSeverity}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "perceivedSeverity"
+	:FOR   ${item}   IN  @{response['body']}
+    Should Be Equal As Strings     ${item['perceivedSeverity']}    ${perceivedSeverity}
+    END
+	
+GET Alarms with filter "probableCause"
+	Log    Query VNF The GET method queries information about multiple alarms with filters "probableCause".
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Log    Execute Query and validate response
+    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?probableCause=${probableCause}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "probableCause"
+    :FOR   ${item}   IN  @{response['body']}
+    Should Be Equal As Strings     ${item['probableCause']}    ${probableCause}
+    END
+    
+Get subscriptions with filter "id"
+    Log    Get the list of active subscriptions using a filter "id"
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?id=${subscription_id}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body Subscription Matches the requested attribute-based filter "id"
+    Should Be Equal As Strings    ${response['body']['id']}    ${subscription_id}
+	
+Get subscriptions with filter "filter_notificationTypes"
+    Log    Get the list of active subscriptions using a filter "filter.notificationTypes"
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.notificationTypes=${notification_type}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_notificationTypes"
+    :FOR   ${item}   IN  @{response['body']}
+    Should Contain Match    ${item['filter']['notificationTypes']}   ${notification_type}    case_insensitive=True
+    END
+	
+Get subscriptions with filter "filter_faultyResourceTypes"
+    Log    Get the list of active subscriptions using a filter "filter.faultyResourceTypes"
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_faultyResourceTypes"
+	:FOR   ${item}   IN  @{response['body']}
+    Should Contain Match    ${item['filter']['faultyResourceTypes']}   ${faultyResourceType}    case_insensitive=True
+    END
+    
+Get subscriptions with filter "filter_perceivedSeverities"
+    Log    Get the list of active subscriptions using a filter "filter.perceivedSeverities"
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_perceivedSeverities"
+    :FOR   ${item}   IN  @{response['body']}
+    Should Contain Match    ${item['filter']['perceivedSeverities']}   ${perceivedSeverity}    case_insensitive=True
+    END
+	
+Get subscriptions with filter "filter_eventTypes"
+    Log    Get the list of active subscriptions using a filter "filter.eventTypes"
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.eventTypes=${eventType}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+	
+Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_eventTypes"
+	:FOR   ${item}   IN  @{response['body']}
+    Should Contain Match    ${item['filter']['eventTypes']}   ${eventType}    case_insensitive=True
+    END
+    
+Get subscriptions with filter "filter_probableCauses"
+    Log    Get the list of active subscriptions using a filter "filter.probableCauses"
+    Set Headers    {"Accept": "${ACCEPT}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?filter.probableCauses=${probableCause}
+    ${outputResponse}=    Output    response
+	Set Global Variable    @{response}    ${outputResponse}
+
+Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_probableCauses"
+    :FOR   ${item}   IN  @{response['body']}
+    Should Contain Match    ${item['filter']['probableCauses']}   ${probableCause}    case_insensitive=True
+    END
diff --git a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
index a62377335bd0cc1ccc357f097cc1e03b3c5b9d22..9867e8def466481bdef34bee9eed5afe84168714 100644
--- a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
@@ -16,7 +16,7 @@ NS Fault Alarm Notification
     ...    Test title: NS Fault Alarm Notification
     ...    Test objective: The objective is to test the dispatch of NS Fault Alarm Notification when a virtualised resource within an NS 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 NS instance is instantiated, and a subscription for fault alarm notifications is available in the NFVO.
-    ...    Reference: clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ NS Fault Alarm Cleared Notification
     ...    Test title: NS Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test the dispatch of NS Fault Alarm Cleared Notification when a faulty virtualised resource within an NS 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 NS instance is instantiated, a virtualised resource is in faulty state, and a subscription for fault alarm cleared notifications is available in the NFVO.
-    ...    Reference: clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -42,7 +42,7 @@ NS Fault Alarm List Rebuilt Notification
     ...    Test title: NS Fault Alarm List Rebuilt Notification 
     ...    Test objective: The objective is to test the dispatch of NS Fault Alarm List Rebuilt Notification when the NFVO decides to rebuild the list of its NS 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 NS 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 NFVO.
-    ...    Reference: clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 7dbfa21532d77bb9a0fd950ca3a8e2a871e3094c..54666f723b31931e5b5cff219bafab08f7421091 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -13,7 +13,7 @@ Create a new alarm subscription
     ...    Test title: Create a new alarm subscription
     ...    Test objective: The objective is to create a new Fault management alarm subscriptions and perform a JSON schema and content validation of the returned fault management alarms subscription data structure
     ...    Pre-conditions: no subscription with the same filter and callbackUri exists
-    ...    Reference: clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ Create a new alarm subscription - DUPLICATION
     ...    Test title: Create a new alarm subscription - DUPLICATION
     ...    Test objective: The objective is to create a new subscription with the NFV allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure..
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: the NFVO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ Create a new alarm subscription - NO DUPLICATION
     ...    Test title: Create a new alarm subscription - NO DUPLICATION
     ...    Test objective: The objective is to create a new subscription with the NFV not allowing duplication and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: subscription with the same filter and callbackUri exists
-    ...    Reference: clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: the NFVO decides to not create a duplicate subscription resource 
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ Retrieve a list of alarm subscriptions
     ...    Test title: Retrieve a list of alarm subscriptions
     ...    Test objective: The objective is to retrieve the list of active subscriptions and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -68,7 +68,7 @@ Retrieve a list of alarm subscriptions - Filter
     ...    Test title: Retrieve a list of alarm subscriptions - Filter
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none
-    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -81,20 +81,72 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective:The objective is to retrieve the list of active subscriptions with Invalid attribute-based filtering parameters and perform a JSON schema and content validation of the returned problem details data structure.
     ...    Pre-conditions:  none
-    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:   none
     ...    Post-Conditions: none     
     GET Subscriptions with Invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
-   
+
+GET subscriptions with "all_fields" attribute selector
+    [Documentation]    Test ID: 5.3.3.3.7
+    ...    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: 
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  
+    ...    Post-Conditions: 
+    Get subscriptions with all_fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   FmSubscriptions 
+
+GET subscriptions with "exclude_default" attribute selector
+    [Documentation]    Test ID: 5.3.3.3.8
+    ...    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: 
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  
+    ...    Post-Conditions: 
+    Get subscriptions with exclude_default attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   FmSubscriptions
+
+GET subscriptions with "fields" attribute selector
+    [Documentation]    Test ID: 5.3.3.3.9
+    ...    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: 
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  
+    ...    Post-Conditions: 
+    Get subscriptions with fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   FmSubscriptions
+
+GET subscriptions with "exclude_fields" attribute selector
+    [Documentation]    Test ID: 5.3.3.3.10
+    ...    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: 
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  
+    ...    Post-Conditions: 
+    Get subscriptions with exclude_fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is   FmSubscriptions  
+    
 PUT subscriptions - Method not implemented
     [Documentation]    Test ID: 5.3.3.3.11
     ...    Test title:PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to for Fault management subscriptions on NFV 
     ...    Pre-conditions:  none
-    ...    Reference: clause 8.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none
@@ -106,7 +158,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title:PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to for Fault management subscriptions on NFV  
     ...    Pre-conditions:  none
-    ...    Reference: clause 8.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none
@@ -118,9 +170,119 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to for Fault management subscriptions on NFV 
     ...    Pre-conditions:  none
-    ...    Reference: clause 8.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 8.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v2.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: subscription is not deleted
     DELETE Subscriptions
     Check HTTP Response Status Code Is    405
+    
+Retrieve a list of alarm subscriptions as Paged Response
+    [Documentation]    Test ID: 5.3.3.3.14
+    ...    Test title: Retrieve a list of alarm subscriptions as Paged Response
+    ...    Test objective: The objective is to retrieve the list of active subscriptions as paged response.
+    ...    Pre-conditions: none
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Subscriptions
+    Check HTTP Response Status Code Is    200
+    Check LINK in Header
+    
+GET subscriptions - Bad Request Response too Big
+    [Documentation]    Test ID: 5.3.3.3.15
+    ...    Test title: GET subscriptions - Bad Request Response too Big
+    ...    Test objective:The objective is test that the retrieval of active subscriptions list fails because response is too big, and perform a JSON schema and content validation of the returned problem details data structure.
+    ...    Pre-conditions:  none
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:   none
+    ...    Post-Conditions: none     
+    GET Subscriptions
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    
+Retrieve a list of alarm subscriptions with filter "id"
+    [Documentation]    Test ID: 5.3.3.3.16
+    ...    Test title: Retrieve a list of alarm subscriptions with filter "id"
+    ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
+    ...    Pre-conditions: none
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    Get subscriptions with filter "id"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    FmSubscriptions
+    Check PostCondition HTTP Response Body Subscription Matches the requested attribute-based filter "id"
+    
+Retrieve a list of alarm subscriptions with filter "filter.notificationTypes"
+    [Documentation]    Test ID: 5.3.3.3.17
+    ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.notificationTypes"
+    ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
+    ...    Pre-conditions: none
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    Get subscriptions with filter "filter_notificationTypes"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    FmSubscriptions
+    Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_notificationTypes"
+    
+Retrieve a list of alarm subscriptions with filter "filter.faultyResourceTypes"
+    [Documentation]    Test ID: 5.3.3.3.18
+    ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.faultyResourceTypes"
+    ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.faultyResourceTypes" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
+    ...    Pre-conditions: none
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    Get subscriptions with filter "filter_faultyResourceTypes"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    FmSubscriptions
+    Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_faultyResourceTypes"
+    
+Retrieve a list of alarm subscriptions with filter "filter.perceivedSeverities"
+    [Documentation]    Test ID: 5.3.3.3.19
+    ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.perceivedSeverities"
+    ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.perceivedSeverities" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
+    ...    Pre-conditions: none
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    Get subscriptions with filter "filter_perceivedSeverities"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    FmSubscriptions
+    Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_perceivedSeverities"
+    
+Retrieve a list of alarm subscriptions with filter "filter.eventTypes"
+    [Documentation]    Test ID: 5.3.3.3.20
+    ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.eventTypes"
+    ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.eventTypes" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
+    ...    Pre-conditions: none
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    Get subscriptions with filter "filter_eventTypes"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    FmSubscriptions
+    Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_eventTypes"
+    
+Retrieve a list of alarm subscriptions with filter "filter.probableCauses"
+    [Documentation]    Test ID: 5.3.3.3.21
+    ...    Test title: Retrieve a list of alarm subscriptions with filter "filter.probableCauses"
+    ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.probableCauses" and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
+    ...    Pre-conditions: none
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.6.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    Get subscriptions with filter "filter_probableCauses"
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    FmSubscriptions
+    Check PostCondition HTTP Response Body Subscriptions Matches the requested attribute-based filter "filter_probableCauses"
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/environment/variables.txt b/SOL005/NSFaultManagement-API/environment/variables.txt
index 281669313364190cdf8f6c5c5e6f714cdceeaf93..7f86938c5d15e5aeb5f9385cd0968651d1e99286 100644
--- a/SOL005/NSFaultManagement-API/environment/variables.txt
+++ b/SOL005/NSFaultManagement-API/environment/variables.txt
@@ -21,6 +21,14 @@ ${fields}         criteria,objectInstanceIds
 ${VNFM_ALLOWS_DUPLICATE_SUBS}    0
 
 ${alarmId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
+${faultyNestedNsInstanceId}    faultyNestedNsInstanceId
+${faultyNsVirtualLinkInstanceId}     faultyNsVirtualLinkInstanceId
+${faultyVnfInstanceId}    faultyVnfInstanceId
+${faultyResourceType}    COMPUTE
+${eventType}            COMMUNICATIONS_ALARM
+${perceivedSeverity}    CRITICAL
+${probableCause}
+
 ${invalidAlarmId}    invalidAlramID
 ${Etag}=    an etag
 ${Etag_modified}=    a modified etag
@@ -32,6 +40,7 @@ ${sub_filter}    filter
 ${sub_filter_invalid}    filter_invalid
 
 ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
+${notification_type}    AlarmNotification
 
 ${AlarmNotification}    {}
 ${AlarmClearedNotification}    {}