diff --git a/SOL005/NSFaultManagement-API/Alarms.robot b/SOL005/NSFaultManagement-API/Alarms.robot
index 65966d475507eabb000c34c4046afd97ba195dbb..138740b0ddbeff99b5ba1ca6a13cba422b73d5d4 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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none 
     ...    Post-Conditions:  none
@@ -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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ 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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -63,7 +63,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 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,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 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -152,7 +152,7 @@ GET information about multiple alarms as Paged Response
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -165,7 +165,7 @@ GET information about multiple alarms - Bad Request Response too Big
     ...    Test title: GET information about multiple alarms - Bad Request Response too Big
     ...    Test objective:  The objective is to 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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:  none
@@ -178,7 +178,7 @@ GET information about multiple alarms with filter "id"
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -192,7 +192,7 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -206,7 +206,7 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -220,7 +220,7 @@ GET information about multiple alarms with filter "rootCauseFaultyComponent.faul
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -234,7 +234,7 @@ GET information about multiple alarms with filter "rootCauseFaultyResource.fault
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -248,7 +248,7 @@ GET information about multiple alarms with filter "eventType"
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -262,7 +262,7 @@ GET information about multiple alarms with filter "perceivedSeverity"
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -276,11 +276,36 @@ GET information about multiple alarms with filter "probableCause"
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.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
+    Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "probableCause"
+
+GET information about multiple alarms with permitted authorization scope
+    [Documentation]    Test ID: 5.3.3.1.22
+    ...    Test title: GET information about multiple alarms with permitted authorization scope
+    ...    Test objective: The objective is to retrieve information about the alarm list with permitted authorization scope
+    ...    Pre-conditions:  none
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Alarms with permitted authorization scope
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    alarms
+
+GET information about multiple alarms with not permitted authorization scope
+    [Documentation]    Test ID: 5.3.3.1.22
+    ...    Test title: GET information about multiple alarms with not permitted authorization scope
+    ...    Test objective: The objective is to test that retrieve information about the alarm list fails when using not permitted authorization scope
+    ...    Pre-conditions:  none
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Config ID: Config_prod_NFVO 
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Alarms with not permitted authorization scope
+    Check HTTP Response Status Code Is    401
diff --git a/SOL005/NSFaultManagement-API/IndividualAlarm.robot b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
index 1232ef5c6e887a50be200dfd3be59fd35f3b753a..de94545c734d7d61a59da342c1b6839a2ac19f2d 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] v4.4.1
+    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -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] v4.4.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.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] v4.4.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.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] v4.4.1
+    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.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] v4.4.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.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] v4.4.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -90,7 +90,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] v4.4.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: 
@@ -103,7 +103,7 @@ PATCH Alarm - Precondition failed HTTP Conditional Request Not Supported
     ...    Test title: Modify an individual alarm resource - Precondition failed HTTP Conditional Request Not Supported
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modifed if API Producer does not support "Last-Modified" and "ETag" HTTP Headers
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 8.4.3.3.4, 4.5 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.3.3.4, 4.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: API Producer does not support "Last-Modified" and "ETag" HTTP Headers
     ...    Post-Conditions: 
@@ -116,9 +116,32 @@ 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] v4.4.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
     DELETE Individual Alarm
-    Check HTTP Response Status Code Is    405
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
+
+PATCH Alarm with permitted authorization scope
+    [Documentation]    Test ID: 5.3.3.2.9
+    ...    Test title: Modify an individual alarm resource with permitted authorization scope
+    ...    Test objective: The objective is to Modify an individual alarm resource with permitted authorization scope
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  none
+    ...    Post-Conditions:  none
+    PATCH Individual Alarm with permitted authorization scope
+    Check HTTP Response Status Code Is    200  
+    Check HTTP Response Body Json Schema Is    alarmModifications
+
+PATCH Alarm with not permitted authorization scope
+    [Documentation]    Test ID: 5.3.3.2.10
+    ...    Test title: Modify an individual alarm resource with not permitted authorization scope
+    ...    Test objective: The objective is to test that Modify an individual alarm resource fails when using not permitted authorization scope
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  none
+    ...    Post-Conditions:  none
+    PATCH Individual Alarm with not permitted authorization scope
+    Check HTTP Response Status Code Is    401
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/IndividualSubscription.robot b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
index c917ec0ec496738662ee8fee6da22121bbe1ba69..1c819ad1481c612d20feb4b1b5e3ca054053991a 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] v4.4.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -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] v4.4.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.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] v4.4.1
+    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.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] v4.4.1
+    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,9 +60,32 @@ 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] v4.4.1
+    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: subscription is not deleted
     DELETE Individual Subscription
-    Check HTTP Response Status Code Is    204
\ No newline at end of file
+    Check HTTP Response Status Code Is    204
+
+Get Information about an individual subscription with permitted authorization scope
+    [Documentation]    Test ID: 5.3.3.4.6
+    ...    Test title: Get Information about an individual subscription with permitted authorization scope
+    ...    Test objective: The objective is to read an individual subscription for NFVO alarms subscribed by the client with permitted authorization scope
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Individual Subscription with permitted authorization scope
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    FmSubscription
+
+Get Information about an individual subscription with not permitted authorization scope
+    [Documentation]    Test ID: 5.3.3.4.7
+    ...    Test title: Get Information about an individual subscription with not permitted authorization scope
+    ...    Test objective: The objective is to test that read an individual subscription for NFVO alarms subscribed by the client fails when using a not permitted authorization scope
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Individual Subscription with not permitted authorization scope
+    Check HTTP Response Status Code Is    401
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index f03589b37f8fae493147a4f963a7d702ee6a2d36..1d87174931bc4254962168f03de30aae5ba0dc7a 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -99,6 +99,30 @@ GET Alarms
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
+
+GET Alarms with permitted authorization scope
+    Log    Query NFVO The GET method queries information about multiple alarms.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    ${scopeValue}=    Create Dictionary    scope=${ALARMS_PERMITTED_SCOPE} 
+    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=''    algorithm=${OAUTH_ENCRIPTION_ALGORITHM}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
+    Log    Authorization Token: ${authorizationToken}
+    Log    Execute Query
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
+
+GET Alarms with not permitted authorization scope
+    Log    Query NFVO The GET method queries information about multiple alarms.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    ${scopeValue}=    Create Dictionary    scope=${NOT_PERMITTED_SCOPE} 
+    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=''    algorithm=${OAUTH_ENCRIPTION_ALGORITHM}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
+    Log    Authorization Token: ${authorizationToken}
+    Log    Execute Query
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
     
 GET Alarms With Filters
 	Log    Query NFVO The GET method queries information about multiple alarms with filters.
@@ -198,7 +222,33 @@ PATCH Individual Alarm
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
-   
+
+PATCH Individual Alarm with permitted authorization scope
+    log    Trying to perform a PATCH. This method modifies an individual alarm resource
+    Set Headers  {"Accept":"${ACCEPT}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
+    ${scopeValue}=    Create Dictionary    scope=${ALARMS_PERMITTED_SCOPE} 
+    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=''    algorithm=${OAUTH_ENCRIPTION_ALGORITHM}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
+    Log    Authorization Token: ${authorizationToken}
+    ${body}=    Get File    jsons/alarmModifications.json
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
+
+PATCH Individual Alarm with not permitted authorization scope
+    log    Trying to perform a PATCH. This method modifies an individual alarm resource
+    Set Headers  {"Accept":"${ACCEPT}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
+    ${scopeValue}=    Create Dictionary    scope=${ALARMS_NOT_PERMITTED_SCOPE} 
+    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=''    algorithm=${OAUTH_ENCRIPTION_ALGORITHM}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
+    Log    Authorization Token: ${authorizationToken}
+    ${body}=    Get File    jsons/alarmModifications.json
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
+
 PATCH Individual Alarm - ETag mismatch
     log    Trying to perform a PATCH. This method modifies an individual alarm resource
     Set Headers  {"Accept":"${ACCEPT}"} 
@@ -271,6 +321,28 @@ GET Subscriptions
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
+
+GET Subscriptions with permitted authorization scope
+    Log    Get the list of active subscriptions
+    Set Headers    {"Accept": "${ACCEPT}"}
+    ${scopeValue}=    Create Dictionary    scope=${SUBSCRIPTIONS_PERMITTED_SCOPE} 
+    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=''    algorithm=${OAUTH_ENCRIPTION_ALGORITHM}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
+    Log    Authorization Token: ${authorizationToken}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
+
+GET Subscriptions with not permitted authorization scope
+    Log    Get the list of active subscriptions
+    Set Headers    {"Accept": "${ACCEPT}"}
+    ${scopeValue}=    Create Dictionary    scope=${NOT_PERMITTED_SCOPE} 
+    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=''    algorithm=${OAUTH_ENCRIPTION_ALGORITHM}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
+    Log    Authorization Token: ${authorizationToken}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
         
 GET Subscriptions with filter
     Log    Get the list of active subscriptions using a filter
@@ -349,6 +421,28 @@ POST Individual Subscription
     Set Global Variable    ${response}    ${outputResponse}
     
 GET Individual Subscription
+    log    Trying to get information about an individual subscription
+    Set Headers    {"Accept":"${ACCEPT}"}  
+    ${scopeValue}=    Create Dictionary    scope=${SUBSCRIPTIONS_PERMITTED_SCOPE} 
+    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=''    algorithm=${OAUTH_ENCRIPTION_ALGORITHM}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
+    Log    Authorization Token: ${authorizationToken}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}   
+
+GET Individual Subscription with permitted authorization scope
+    log    Trying to get information about an individual subscription
+    Set Headers    {"Accept":"${ACCEPT}"}  
+    ${scopeValue}=    Create Dictionary    scope=${NOT_PERMITTED_SCOPE} 
+    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=''    algorithm=${OAUTH_ENCRIPTION_ALGORITHM}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
+    Log    Authorization Token: ${authorizationToken}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}   
+
+GET Individual Subscription with not permitted authorization scope
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
@@ -643,3 +737,8 @@ Check Response for duplicated subscription
     Run Keyword If    ${NFVO_ALLOWS_DUPLICATE_SUBS} == 1    Check HTTP Response Status Code Is    201
     Run Keyword If    ${NFVO_ALLOWS_DUPLICATE_SUBS} == 1    Check HTTP Response Body Json Schema Is    FmSubscription
     Run Keyword If    ${NFVO_ALLOWS_DUPLICATE_SUBS} == 0    Check HTTP Response Status Code Is    303
+
+JWT Encode
+    [Arguments]    ${payload}    ${key}    ${algorithm}
+    ${encoded}=    Evaluate    jwt.encode(${payload}, ${key}, ${algorithm})
+    [Return]    ${encoded} 
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
index 09a20920cc46667de6682a68476ec6a7c52595d7..e871c755e837b4accd4e4e20928faf051f233964 100644
--- a/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSFaultManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ NS Fault Alarm Notification
     ...    Test title: NS Fault Alarm Notification
     ...    Test objective: The objective is to test that NS Fault Alarm Notification is delivered with success to the notification consumer
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ NS Fault Alarm Cleared Notification
     ...    Test title: NS Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test that NS Fault Alarm Cleared Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A NS instance is instantiated, 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] v4.4.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -37,7 +37,7 @@ NS Fault Alarm List Rebuilt Notification
     ...    Test title: NS Fault Alarm List Rebuilt Notification
     ...    Test objective: The objective is to test that NS Fault Alarm List Rebuilt Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A NS instance is instantiated, 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] v4.4.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSFaultManagement-API/Notifications.robot b/SOL005/NSFaultManagement-API/Notifications.robot
index 52ef3b75c00673e497897cde8a6e4c08e4597523..cf6b810f5594f095b3ef28b03b961e33386d9796 100644
--- a/SOL005/NSFaultManagement-API/Notifications.robot
+++ b/SOL005/NSFaultManagement-API/Notifications.robot
@@ -18,7 +18,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] v4.4.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -31,7 +31,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] v4.4.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -44,7 +44,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] v4.4.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -57,7 +57,7 @@ NS Fault Alarm Notification with Instrumental Platform Hook
     ...    Test title: NS Fault Alarm Notification with Instrumental Platform Hook
     ...    Test objective: The objective is to test the dispatch of NS Fault Alarm Notification when a virtualised resource failure within an NS instance is automatically triggered through an instrumenation platform, and perform a JSON schema and content validation of the delivered notification.
     ...    Pre-conditions: A NS instance is instantiated
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: An instrumentation platform is available to trigger the NS instance failure condition
     ...    Post-Conditions: none 
@@ -70,7 +70,7 @@ NS Fault Alarm Cleared Notification with Instrumental Platform Hook
     ...    Test title: NS Fault Alarm Cleared Notification with Instrumental Platform Hook
     ...    Test objective: The objective is to test the dispatch of NS Fault Clear Alarm Notification when a virtualised resource failure within an NS instance is automatically cleared through an instrumenation platform, and perform a JSON schema and content validation of the delivered notification.
     ...    Pre-conditions: A NS instance is instantiated and a virtualised resource is in faulty state.
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: An instrumentation platform is available to trigger the NS instance failure clear condition
     ...    Post-Conditions: none 
@@ -83,7 +83,7 @@ NS Fault Alarm List Rebuilt Notification with Instrumental Platform Hook
     ...    Test title: NS Fault Alarm List Rebuilt Notification with Instrumental Platform Hook
     ...    Test objective: The objective is to test the dispatch of NS Fault Alarm List Rebuilt Notification when the NFVO decision to rebuild the list of its NS alarms is automatically triggered through an instrumentation platform, and perform a JSON schema and content validation of the delivered notification.
     ...    Pre-conditions: A NS instance is instantiated and one or more virtualised resource are in faulty state
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: An instrumentation platform is available to trigger the NS instance alarm list rebuilt condition
     ...    Post-Conditions: none 
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 1b8f094728bd26dfa313b79f5ab1e0deed8d1526..d53185cf56e1c3e8d033ca3ab81495064472f568 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -16,7 +16,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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -30,7 +30,7 @@ Create a duplicated Subscription
     ...    Test title: Create a duplicated alarm subscription
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: 
     ...    Post-Conditions: none
@@ -54,7 +54,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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -67,7 +67,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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    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 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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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: 
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -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 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions:   none
@@ -157,7 +157,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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -181,7 +181,7 @@ Retrieve a list of alarm subscriptions as Paged Response
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:   none
     ...    Post-Conditions: none     
@@ -207,7 +207,7 @@ Retrieve a list of alarm subscriptions with filter "id"
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -221,7 +221,7 @@ Retrieve a list of alarm subscriptions with filter "filter.notificationTypes"
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -235,7 +235,7 @@ Retrieve a list of alarm subscriptions with filter "filter.faultyResourceTypes"
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -249,7 +249,7 @@ Retrieve a list of alarm subscriptions with filter "filter.perceivedSeverities"
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -263,7 +263,7 @@ Retrieve a list of alarm subscriptions with filter "filter.eventTypes"
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -277,7 +277,7 @@ Retrieve a list of alarm subscriptions with filter "filter.probableCauses"
     ...    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] v4.4.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -291,14 +291,39 @@ Create a new alarm subscription - Unprocessable Content
     ...    Test title: Create a new alarm subscription- Unprocessable Content
     ...    Test objective: The objective is to test that creation of a new Fault management alarm subscriptions fials when 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.
     ...    Pre-conditions: 
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
     ...    Config ID: Config_prod_NFVO 
     ...    Applicability: none
     ...    Post-Conditions: none
     POST Subscription
     Check HTTP Response Status Code Is    422
     Check HTTP Response Body Json Schema Is  ProblemDetails
-    
+
+ Retrieve a list of alarm subscriptions with permitted authorization scope
+    [Documentation]    Test ID: 5.3.3.3.23
+    ...    Test title: Retrieve a list of alarm subscriptions with permitted authorization scope
+    ...    Test objective: The objective is to retrieve the list of active subscriptions with permitted authorization scope
+    ...    Pre-conditions: none
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Subscriptions with permitted authorization scope
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    FmSubscriptions
+
+ Retrieve a list of alarm subscriptions with not permitted authorization scope
+    [Documentation]    Test ID: 5.3.3.3.4
+    ...    Test title: Retrieve a list of alarm subscriptions with not permitted authorization scope
+    ...    Test objective: The objective is to test that retrieve the list of active subscriptions fails when using not permitted authorization scope
+    ...    Pre-conditions: none
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability:  none
+    ...    Post-Conditions: none
+    GET Subscriptions with not permitted authorization scope
+    Check HTTP Response Status Code Is    401
+
 *** Keywords ***
 Void
     log    do nothing
diff --git a/SOL005/NSFaultManagement-API/environment/variables.txt b/SOL005/NSFaultManagement-API/environment/variables.txt
index 55f08b37190623536a85464c45bd3f2dba7ca9af..a487294a1964e67993463ae4fb470a13ecf2de20 100644
--- a/SOL005/NSFaultManagement-API/environment/variables.txt
+++ b/SOL005/NSFaultManagement-API/environment/variables.txt
@@ -4,6 +4,13 @@ ${NFVO_PORT}      8080    # Listening port of the VNFM
 ${NFVO_SCHEMA}    http
 ${AUTHORIZATION_HEADER}    Authorization
 ${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
+
+${OAUTH_ENCRIPTION_ALGORITHM}    HS256
+${ALARMS_PERMITTED_SCOPE}    nsfm:v2:alarms 
+${ALARMS_NOT_PERMITTED_SCOPE}    nsfm:v2:alarms:readonly
+${SUBSCRIPTIONS_PERMITTED_SCOPE}    nsfm:v2:subscriptions
+${NOT_PERMITTED_SCOPE}    nsfm:v2:invalid 
+
 ${ACCEPT}         application/json
 ${ACCEPT_JSON}         application/json
 ${AUTH_USAGE}     1