From 09f13a279b0e1a82ec96d45458ed29b62fba62f6 Mon Sep 17 00:00:00 2001
From: Muhammad Umair Khan <umair.anwar@xflowresearch.com>
Date: Fri, 6 Dec 2024 16:03:01 +0500
Subject: [PATCH 1/7] Update SOL003 document version in all testcases of VNF
 Fault Management API

---
 SOL003/VNFFaultManagement-API/Alarms.robot    | 24 +++++-----
 .../IndividualAlarm.robot                     | 20 ++++----
 .../IndividualSubscription.robot              | 16 +++----
 .../NotificationEndpoint.robot                |  6 +--
 .../Notifications.robot                       |  6 +--
 .../Subscriptions.robot                       | 48 +++++++++----------
 6 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/Alarms.robot b/SOL003/VNFFaultManagement-API/Alarms.robot
index eb41dc3f..e6690077 100644
--- a/SOL003/VNFFaultManagement-API/Alarms.robot
+++ b/SOL003/VNFFaultManagement-API/Alarms.robot
@@ -13,7 +13,7 @@ POST Alarms - Method not implemented
     ...    Test title: POST Alarms - Method not implemented 
     ...    Test objective: The objective is to test that Post method is not allowed to create Fault management alarms on VNF 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -25,7 +25,7 @@ Get information about multiple alarms
     ...    Test title: Get information about multiple alarms
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema and content validation of the returned alarms data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ Get information about multiple alarms with filter
     ...    Test title: Get information about multiple alarms with filter
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema 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 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,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 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -109,7 +109,7 @@ PUT Alarms - Method not implemented
     ...    Test title: PUT Alarms - Method not implemented 
     ...    Test objective: The objective is to test that PUT method is not allowed to for Fault management alarms on VNF 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -121,7 +121,7 @@ PATCH Alarms - Method not implemented
     ...    Test title: PATCH Alarms - Method not implemented 
     ...    Test objective: The objective is to test that PATCH method is not allowed to for Fault management alarms on VNF 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -133,7 +133,7 @@ DELETE Alarms - Method not implemented
     ...    Test title: POST Alarms - Method not implemented 
     ...    Test objective: The objective is to test that DELETE method is not allowed for Fault management alarms on VNF 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -145,7 +145,7 @@ Get information about multiple alarms as a Paged Response
     ...    Test title: Get information about multiple alarms as a Paged Response
     ...    Test objective: The objective is to retrieve information about the alarm list as a Paged Response
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports response paging for the VNF alarm resources
     ...    Post-Conditions: none
@@ -158,7 +158,7 @@ GET information about multiple alarms as a Paged Response with nextpage_opauque_
     ...    Test title: GET information about multiple alarms as a Paged Response with nextpage_opauque_marker parameter  
     ...    Test objective: The objective is to query information about multiple alarms as a Paged Response and retrieve the next page using the nextpage_opaque_marker parameter
     ...    Pre-conditions: A request for retrieving multiple alarms as a paged response has been successfully issued (Test ID 7.3.5.1.12)
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports response paging for the VNF alarm resources
     ...    Post-Conditions: none 
@@ -171,7 +171,7 @@ Get information about multiple alarms - Bad Request Response too Big
     ...    Test title:  Get information about multiple alarms - Bad Request Response too Big
     ...    Test objective: The objective is to try to retrieve information about the alarm list because response is too big and perform a JSON schema and content validation of the returned problem details data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -184,7 +184,7 @@ Get information about multiple alarms with permitted authorization scope
     ...    Test title: Get information about multiple alarms with permitted authorization scope 
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema and content validation of the returned alarms data structure with permitted authorization scope 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -197,7 +197,7 @@ Get information about multiple alarms with not permitted authorization scope
     ...    Test title: Get information about multiple alarms with not permitted authorization scope 
     ...    Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema and content validation of the returned alarms data structure with not permitted authorization scope 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFFaultManagement-API/IndividualAlarm.robot b/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
index cd5d7cdc..7ba532fd 100644
--- a/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
@@ -14,7 +14,7 @@ POST Alarm - Method not implemented
     ...    Test title: POST Alarm - Method not implemented
     ...    Test objective: The objective is to test that Post method is not allowed to create Fault management individual alarm on VNF 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -26,7 +26,7 @@ Get information about an fault management individual alarm
     ...    Test title: Get information about an fault management individual alarm
     ...    Test objective: The objective is to retrieve information about an individual alarm and perform a JSON schema and content validation of the returned alarm data structure
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none 
@@ -40,7 +40,7 @@ PUT Alarm - Method not implemented
     ...    Test title: PUT Alarm - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to for Fault management individual alarm on VNF 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none 
@@ -52,7 +52,7 @@ PATCH Fault Management Individual Alarm
     ...    Test title: PATCH Fault Management Individual Alarm
     ...    Test objective: The objective is to Modify an individual alarm resource and perform a JSON schema and content validation of the returned alarm data structure
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ Modify an individual alarm resource - Precondition failed
     ...    Test title: Modify an individual alarm resource - Precondition failed
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modified if the resource was modified by another entity
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ Modify an individual alarm resource - Conflict
     ...    Test title: Modify an individual alarm resource - Conflict
     ...    Test objective: The objective is to test that an individual alarm resource cannot be modified if the alarm is already in the state that is requested to be set 
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -93,7 +93,7 @@ DELETE Alarm - Method not implemented
     ...    Test title: DELETE Alarm - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to for Fault management individual alarm on VNF 
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -105,7 +105,7 @@ Get information about an fault management individual alarm - Not Found
     ...    Test title: Get information about an fault management individual alarm - Not Found
     ...    Test objective: The objective is to test that retrieval of information about an individual alarm fails when individual alarm is not present
     ...    Pre-conditions: The related alarm does not exists
-    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none 
@@ -118,7 +118,7 @@ PATCH Fault Management Individual Alarm with permitted authorization scope
     ...    Test title: PATCH Fault Management Individual Alarm with permitted authorization scope
     ...    Test objective: The objective is to Modify an individual alarm resource and perform a JSON schema and content validation of the returned alarm data structure with permitted authorization scope
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -132,7 +132,7 @@ PATCH Fault Management Individual Alarm with not permitted authorization scope
     ...    Test title: PATCH Fault Management Individual Alarm with not permitted authorization scope
     ...    Test objective: The objective is to Modify an individual alarm resource and perform a JSON schema and content validation of the returned alarm data structure with not permitted authorization scope
     ...    Pre-conditions: The related alarm exists
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL003/VNFFaultManagement-API/IndividualSubscription.robot b/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
index 692a59c2..e15bcc37 100644
--- a/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFFaultManagement-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 VNF  
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    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 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...   Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    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 individual subscription on VNF  
     ...    Pre-conditions:  none
-    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    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 individual subscription on VNF  
     ...    Pre-conditions:  none
-    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    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 test that DELETE method removes individual subscription on VNF   
     ...    Pre-conditions: The Subsbcription already exists
-    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions:  subscription is deleted
@@ -73,7 +73,7 @@ Get Information about an individual subscription - Not Found
     ...    Test title: Get Information about an individual subscription - Not Found
     ...    Test objective: The objective is to test that the retrieval of an individual subscription for NFVO alarms subscribed by the client fails when subscription is not present
     ...    Pre-conditions: The subscription with the given id does not exists
-    ...   Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...   Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:   none
     ...    Post-Conditions:  none
@@ -86,7 +86,7 @@ Get Information about an individual subscription with permitted authorization sc
     ...    Test title: Get Information about an individual subscription with permitted authorization scope 
     ...    Test objective: The objective is to read an individual subscription for NFVO alarms subscribed by the client and perform a JSON schema and content validation of the returned fault management individual subscription data structure with permitted authorization scope 
     ...    Pre-conditions: The subscription with the given id exists
-    ...   Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...   Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:   none
     ...    Post-Conditions:  none
@@ -99,7 +99,7 @@ Get Information about an individual subscription with not permitted authorizatio
     ...    Test title: Get Information about an individual subscription with not permitted authorization scope
     ...    Test objective: The objective is to 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 with not permitted authorization scope 
     ...    Pre-conditions: The subscription with the given id exists
-    ...   Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...   Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:   none
     ...    Post-Conditions:  none
diff --git a/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
index ae2c722d..34179592 100644
--- a/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ VNF Fault Alarm Notification
     ...    Test title: VNF Fault Alarm Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Notification.
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ VNF Fault Alarm Cleared Notification
     ...    Test title: VNF Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Cleared Notification.
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm cleared notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -37,7 +37,7 @@ VNF Fault Alarm List Reulit Notification
     ...    Test title: VNF Fault Alarm List Rebuilt Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm List Rebuilt Notification.
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFFaultManagement-API/Notifications.robot b/SOL003/VNFFaultManagement-API/Notifications.robot
index 55e1ae60..91e1637a 100644
--- a/SOL003/VNFFaultManagement-API/Notifications.robot
+++ b/SOL003/VNFFaultManagement-API/Notifications.robot
@@ -15,7 +15,7 @@ VNF Fault Alarm Notification
     ...    Test title: VNF Fault Alarm Notification
     ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Notification when a virtualised resource within an VNF instance fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -28,7 +28,7 @@ VNF Fault Alarm Cleared Notification
     ...    Test title: VNF Fault Alarm Cleared Notification
     ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm Cleared Notification when a faulty virtualised resource within an VNF instance is cleared, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, a virtualised resource is in faulty state, and a subscription for fault alarm cleared notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -41,7 +41,7 @@ VNF Fault Alarm List Rebuilt Notification
     ...    Test title: VNF Fault Alarm List Rebuilt Notification 
     ...    Test objective: The objective is to test the dispatch of VNF Fault Alarm List Rebuilt Notification when the VNFM decides to rebuild the list of its VNF alarms, e.g. due to a corruption in the alarm storage, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance is instantiated, one or more virtualised resource are in faulty state, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFFaultManagement-API/Subscriptions.robot b/SOL003/VNFFaultManagement-API/Subscriptions.robot
index f91f20b9..b8d76d76 100644
--- a/SOL003/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL003/VNFFaultManagement-API/Subscriptions.robot
@@ -16,7 +16,7 @@ Create a new Fault Management alarm subscription
     ...    Test title: Create a new Fault Management 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 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: subscription is created
@@ -31,7 +31,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 VNF 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 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability: the NFVO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
     ...    Post-Conditions: duplicated subscription is created
@@ -46,7 +46,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 VNF 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 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability: the NFVO decides to not create a duplicate subscription resource 
     ...    Post-Conditions: duplicated subscription is not created
@@ -60,7 +60,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 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: noe
@@ -73,7 +73,7 @@ Retrieve a list of alarm subscriptions with filter
     ...    Test title: Retrieve a list of alarm subscriptions with filter
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter and perform a JSON schema and content validation of the returned fault management alarms subscription data structure.
     ...    Pre-conditions: none 
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -86,7 +86,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is 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 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions:    none 
@@ -99,7 +99,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 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -112,7 +112,7 @@ GET subscriptions with "exclude_default" attribute selector
     ...    Test title: GET subscriptions with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -125,7 +125,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: 
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -138,7 +138,7 @@ GET subscriptions with "exclude_fields" attribute selector
     ...    Test title: GET subscriptions with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -151,7 +151,7 @@ PUT subscriptions - Method not implemented
     ...    Test title:PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to for Fault management subscriptions on VNF 
     ...    Pre-conditions: none
-    ...    RReference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    RReference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:  Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -163,7 +163,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title: PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to for Fault management subscriptions on VNF  
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:  Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  none
@@ -175,7 +175,7 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to for Fault management subscriptions on VNF  
     ...    Pre-conditions: none 
-    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:  Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: subscription is not deleted
@@ -187,7 +187,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 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions: noe
@@ -200,7 +200,7 @@ GET subscriptions - Bad Request Response too Big
     ...    Test title: GET subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to retrieve the list of active subscriptions 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 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability:  none
     ...    Post-Conditions:    none 
@@ -213,7 +213,7 @@ GET Subscription with attribute-based filter "id"
     ...    Test title: GET Subscription with attribute-based filter "id"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "id"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -227,7 +227,7 @@ Get subscriptions with filter "filter.notificationTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.notificationTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.notificationTypes"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -241,7 +241,7 @@ Get subscriptions with filter "filter.faultyResourceTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.faultyResourceTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.faultyResourceTypes"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -255,7 +255,7 @@ Get subscriptions with filter "filter.perceivedSeverities"
     ...    Test title: GET Subscription with attribute-based filter "filter.perceivedSeverities"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.perceivedSeverities"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -269,7 +269,7 @@ Get subscriptions with filter "filter.eventTypes"
     ...    Test title: GET Subscription with attribute-based filter "filter.eventTypes"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.eventTypes"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -283,7 +283,7 @@ Get subscriptions with filter "filter.probableCauses"
     ...    Test title: GET Subscription with attribute-based filter "filter.probableCauses"
     ...    Test objective: The objective is to retrieve the list of active subscriptions with filter "filter.probableCauses"
     ...    Pre-conditions: 
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -297,7 +297,7 @@ POST Create a new Subscription - Unprocessable Content
     ...    Test title: POST Create a new Subscription - Unprocessable Content
     ...    Test objective: The objective is to test that content type of the message content is supported and the message content of a request contains syntactically correct data but the data cannot be processed.
     ...    re-conditions: none
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -310,7 +310,7 @@ Create a new Fault Management alarm subscription with permitted authorization sc
     ...    Test title: Create a new Fault Management alarm subscription with permitted authorization scope 
     ...    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 with permitted authorization scope 
     ...    Pre-conditions: No subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: subscription is created
@@ -325,7 +325,7 @@ Create a new Fault Management alarm subscription with not permitted authorizatio
     ...    Test title: Create a new Fault Management alarm subscription with not permitted authorization scope 
     ...    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 with not permitted authorization scope 
     ...    Pre-conditions: No subscription with the same filter and callbackUri exists
-    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v4.5.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: subscription is created
-- 
GitLab


From 6e513ab5b3a4fad8db76a603a480e58ba525eaa0 Mon Sep 17 00:00:00 2001
From: "mudassar.sabeel" <mudassar.sabeel@xflowresearch.com>
Date: Wed, 18 Dec 2024 11:51:10 +0500
Subject: [PATCH 2/7] Editorial Change: Reformat the json schemas

---
 .../schemas/AlarmModification.schema.json     |  7 ++-
 .../schemas/Alarms.schema.json                | 32 ++++++++++---
 .../schemas/FmSubscription.schema.json        | 48 ++++++++++++++-----
 .../schemas/FmSubscriptions.schema.json       | 48 ++++++++++++++-----
 .../schemas/alarm.schema.json                 | 32 ++++++++++---
 .../alarmClearedNotification.schema.json      | 17 +++++--
 .../alarmListRebuiltNotification.schema.json  | 17 +++++--
 .../schemas/alarmModifications.schema.json    |  9 +++-
 .../schemas/alarmNotification.schema.json     | 44 +++++++++++++----
 9 files changed, 196 insertions(+), 58 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/schemas/AlarmModification.schema.json b/SOL003/VNFFaultManagement-API/schemas/AlarmModification.schema.json
index b5e4fa9c..6a34804a 100644
--- a/SOL003/VNFFaultManagement-API/schemas/AlarmModification.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/AlarmModification.schema.json
@@ -9,8 +9,11 @@
       "ackState": {
         "description": "New value of the \"ackState\" attribute in \"Alarm\". Permitted values: * ACKNOWLEDGED * UNACKNOWLEDGED\n",
         "type": "string",
-        "enum": ["ACKNOWLEDGED", "UNACKNOWLEDGED"]
+        "enum": [
+          "ACKNOWLEDGED",
+          "UNACKNOWLEDGED"
+        ]
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json b/SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json
index cddec9e6..dab2c42c 100644
--- a/SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json
@@ -29,10 +29,15 @@
         "rootCauseFaultyResource": {
           "description": "This type represents the faulty virtual resources that have a negative impact on a VNF.\n",
           "type": "object",
-          "required": ["faultyResource", "faultyResourceType"],
+          "required": [
+            "faultyResource",
+            "faultyResourceType"
+          ],
           "properties": {
             "faultyResource": {
-              "required": ["resourceId"],
+              "required": [
+                "resourceId"
+              ],
               "type": "object",
               "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n* NOTE 1: The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or CISM or the resource \n          provider and can be used as information that complements the ResourceHandle. This value set is different from \n          the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2). When the container \n          infrastructure service management is a Kubernetes® instance the vimLevelResourceType is the type of \n          resource, as would correspond to the 'kind' field if the resource is declared in its own Kubernetes® manifest, \n          e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition.\n\n* NOTE 2: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be \n          populated in the following way:\n          - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide \n          per resource type.\n          - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, \n          i.e. the value of the 'claimName' field in the Kubernetes® manifest, or a compound name built by \n          Kubernetes® if the persistent volume claim is defined inline in another template instead of in its own \n          manifest.\n          - For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of \n          the 'metadata.name' field in Kubernetes® manifest.\n",
               "properties": {
@@ -79,7 +84,11 @@
             "faultyResourceType": {
               "description": "The enumeration FaultyResourceType represents those types of faulty resource.\n",
               "type": "string",
-              "enum": ["COMPUTE", "STORAGE", "NETWORK"]
+              "enum": [
+                "COMPUTE",
+                "STORAGE",
+                "NETWORK"
+              ]
             }
           }
         },
@@ -106,7 +115,10 @@
         "ackState": {
           "description": "Acknowledgement state of the alarm. Permitted values: * UNACKNOWLEDGED * ACKNOWLEDGED.\n",
           "type": "string",
-          "enum": ["UNACKNOWLEDGED", "ACKNOWLEDGED"]
+          "enum": [
+            "UNACKNOWLEDGED",
+            "ACKNOWLEDGED"
+          ]
         },
         "perceivedSeverity": {
           "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service\n  affecting condition has occurred and an immediate corrective action\n  is required. Such a severity can be reported, for example, when a\n  managed object becomes totally out of service and its capability needs\n  to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting\n  condition has developed and an urgent corrective action is required.\n  Such a severity can be reported, for example, when there is a severe\n  degradation in the capability of the managed object and its full\n  capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a\n  non-service affecting fault condition and that corrective action\n  should be taken in order to prevent a more serious (for example,\n  service affecting) fault. Such a severity can be reported, for\n  example, when the detected alarm condition is not currently degrading\n  the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a\n  potential or impending service affecting fault, before any significant\n  effects have been felt. Action should be taken to further diagnose (if\n  necessary) and correct the problem in order to prevent it from\n  becoming a more serious service affecting fault (ITU-T Recommendation\n  X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the\n  severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or\n  more previously reported alarms. This alarm clears all alarms for this\n  managed object that have the same Alarm type, Probable cause and\n  Specific problems (if given) (ITU-T Recommendation X.733).\n",
@@ -166,12 +178,16 @@
         "_links": {
           "description": "Links for this resource.\n",
           "type": "object",
-          "required": ["self"],
+          "required": [
+            "self"
+          ],
           "properties": {
             "self": {
               "description": "This type represents a link to a resource using an absolute URI.\n",
               "type": "object",
-              "required": ["href"],
+              "required": [
+                "href"
+              ],
               "properties": {
                 "href": {
                   "description": "String formatted according to IETF RFC 3986.\n",
@@ -182,7 +198,9 @@
             "objectInstance": {
               "description": "This type represents a link to a resource using an absolute URI.\n",
               "type": "object",
-              "required": ["href"],
+              "required": [
+                "href"
+              ],
               "properties": {
                 "href": {
                   "description": "String formatted according to IETF RFC 3986.\n",
diff --git a/SOL003/VNFFaultManagement-API/schemas/FmSubscription.schema.json b/SOL003/VNFFaultManagement-API/schemas/FmSubscription.schema.json
index 67f360ad..e6fc6b8a 100644
--- a/SOL003/VNFFaultManagement-API/schemas/FmSubscription.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/FmSubscription.schema.json
@@ -1,7 +1,11 @@
 {
   "description": "This type represents a subscription related to notifications about VNF faults.\n",
   "type": "object",
-  "required": ["id", "callbackUri", "_links"],
+  "required": [
+    "id",
+    "callbackUri",
+    "_links"
+  ],
   "properties": {
     "id": {
       "description": "An identifier with the intention of being globally unique.\n",
@@ -18,20 +22,28 @@
             {
               "oneOf": [
                 {
-                  "required": ["vnfdId"]
+                  "required": [
+                    "vnfdId"
+                  ]
                 },
                 {
-                  "required": ["vnfProductsFromProviders"]
+                  "required": [
+                    "vnfProductsFromProviders"
+                  ]
                 }
               ]
             },
             {
               "oneOf": [
                 {
-                  "required": ["vnfInstanceIds"]
+                  "required": [
+                    "vnfInstanceIds"
+                  ]
                 },
                 {
-                  "required": ["vnfInstanceNames"]
+                  "required": [
+                    "vnfInstanceNames"
+                  ]
                 }
               ]
             }
@@ -50,7 +62,9 @@
               "type": "array",
               "items": {
                 "type": "object",
-                "required": ["vnfProvider"],
+                "required": [
+                  "vnfProvider"
+                ],
                 "properties": {
                   "vnfProvider": {
                     "description": "Name of the VNF provider to match.\n",
@@ -61,7 +75,9 @@
                     "type": "array",
                     "items": {
                       "type": "object",
-                      "required": ["vnfProductName"],
+                      "required": [
+                        "vnfProductName"
+                      ],
                       "properties": {
                         "vnfProductName": {
                           "description": "Name of the VNF product to match.\n",
@@ -72,7 +88,9 @@
                           "type": "array",
                           "items": {
                             "type": "object",
-                            "required": ["vnfSoftwareVersion"],
+                            "required": [
+                              "vnfSoftwareVersion"
+                            ],
                             "properties": {
                               "vnfSoftwareVersion": {
                                 "description": "A version.\n",
@@ -130,7 +148,11 @@
           "items": {
             "description": "The enumeration FaultyResourceType represents those types of faulty resource.\n",
             "type": "string",
-            "enum": ["COMPUTE", "STORAGE", "NETWORK"]
+            "enum": [
+              "COMPUTE",
+              "STORAGE",
+              "NETWORK"
+            ]
           }
         },
         "perceivedSeverities": {
@@ -180,12 +202,16 @@
     "_links": {
       "description": "Links for this resource.\n",
       "type": "object",
-      "required": ["self"],
+      "required": [
+        "self"
+      ],
       "properties": {
         "self": {
           "description": "This type represents a link to a resource using an absolute URI.\n",
           "type": "object",
-          "required": ["href"],
+          "required": [
+            "href"
+          ],
           "properties": {
             "href": {
               "description": "String formatted according to IETF RFC 3986.\n",
diff --git a/SOL003/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json b/SOL003/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json
index d70aa2ee..268e5066 100644
--- a/SOL003/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json
@@ -3,7 +3,11 @@
   "items": {
     "description": "This type represents a subscription related to notifications about VNF faults.\n",
     "type": "object",
-    "required": ["id", "callbackUri", "_links"],
+    "required": [
+      "id",
+      "callbackUri",
+      "_links"
+    ],
     "properties": {
       "id": {
         "description": "An identifier with the intention of being globally unique.\n",
@@ -20,20 +24,28 @@
               {
                 "oneOf": [
                   {
-                    "required": ["vnfdId"]
+                    "required": [
+                      "vnfdId"
+                    ]
                   },
                   {
-                    "required": ["vnfProductsFromProviders"]
+                    "required": [
+                      "vnfProductsFromProviders"
+                    ]
                   }
                 ]
               },
               {
                 "oneOf": [
                   {
-                    "required": ["vnfInstanceIds"]
+                    "required": [
+                      "vnfInstanceIds"
+                    ]
                   },
                   {
-                    "required": ["vnfInstanceNames"]
+                    "required": [
+                      "vnfInstanceNames"
+                    ]
                   }
                 ]
               }
@@ -52,7 +64,9 @@
                 "type": "array",
                 "items": {
                   "type": "object",
-                  "required": ["vnfProvider"],
+                  "required": [
+                    "vnfProvider"
+                  ],
                   "properties": {
                     "vnfProvider": {
                       "description": "Name of the VNF provider to match.\n",
@@ -63,7 +77,9 @@
                       "type": "array",
                       "items": {
                         "type": "object",
-                        "required": ["vnfProductName"],
+                        "required": [
+                          "vnfProductName"
+                        ],
                         "properties": {
                           "vnfProductName": {
                             "description": "Name of the VNF product to match.\n",
@@ -74,7 +90,9 @@
                             "type": "array",
                             "items": {
                               "type": "object",
-                              "required": ["vnfSoftwareVersion"],
+                              "required": [
+                                "vnfSoftwareVersion"
+                              ],
                               "properties": {
                                 "vnfSoftwareVersion": {
                                   "description": "A version.\n",
@@ -132,7 +150,11 @@
             "items": {
               "description": "The enumeration FaultyResourceType represents those types of faulty resource.\n",
               "type": "string",
-              "enum": ["COMPUTE", "STORAGE", "NETWORK"]
+              "enum": [
+                "COMPUTE",
+                "STORAGE",
+                "NETWORK"
+              ]
             }
           },
           "perceivedSeverities": {
@@ -182,12 +204,16 @@
       "_links": {
         "description": "Links for this resource.\n",
         "type": "object",
-        "required": ["self"],
+        "required": [
+          "self"
+        ],
         "properties": {
           "self": {
             "description": "This type represents a link to a resource using an absolute URI.\n",
             "type": "object",
-            "required": ["href"],
+            "required": [
+              "href"
+            ],
             "properties": {
               "href": {
                 "description": "String formatted according to IETF RFC 3986.\n",
diff --git a/SOL003/VNFFaultManagement-API/schemas/alarm.schema.json b/SOL003/VNFFaultManagement-API/schemas/alarm.schema.json
index 628e398e..965f3343 100644
--- a/SOL003/VNFFaultManagement-API/schemas/alarm.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/alarm.schema.json
@@ -25,10 +25,15 @@
     "rootCauseFaultyResource": {
       "description": "This type represents the faulty virtual resources that have a negative impact on a VNF.\n",
       "type": "object",
-      "required": ["faultyResource", "faultyResourceType"],
+      "required": [
+        "faultyResource",
+        "faultyResourceType"
+      ],
       "properties": {
         "faultyResource": {
-          "required": ["resourceId"],
+          "required": [
+            "resourceId"
+          ],
           "type": "object",
           "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n* NOTE 1: The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or CISM or the resource \n          provider and can be used as information that complements the ResourceHandle. This value set is different from \n          the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2). When the container \n          infrastructure service management is a Kubernetes® instance the vimLevelResourceType is the type of \n          resource, as would correspond to the 'kind' field if the resource is declared in its own Kubernetes® manifest, \n          e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition.\n\n* NOTE 2: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be \n          populated in the following way:\n          - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide \n          per resource type.\n          - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, \n          i.e. the value of the 'claimName' field in the Kubernetes® manifest, or a compound name built by \n          Kubernetes® if the persistent volume claim is defined inline in another template instead of in its own \n          manifest.\n          - For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of \n          the 'metadata.name' field in Kubernetes® manifest.\n",
           "properties": {
@@ -75,7 +80,11 @@
         "faultyResourceType": {
           "description": "The enumeration FaultyResourceType represents those types of faulty resource.\n",
           "type": "string",
-          "enum": ["COMPUTE", "STORAGE", "NETWORK"]
+          "enum": [
+            "COMPUTE",
+            "STORAGE",
+            "NETWORK"
+          ]
         }
       }
     },
@@ -102,7 +111,10 @@
     "ackState": {
       "description": "Acknowledgement state of the alarm. Permitted values: * UNACKNOWLEDGED * ACKNOWLEDGED.\n",
       "type": "string",
-      "enum": ["UNACKNOWLEDGED", "ACKNOWLEDGED"]
+      "enum": [
+        "UNACKNOWLEDGED",
+        "ACKNOWLEDGED"
+      ]
     },
     "perceivedSeverity": {
       "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service\n  affecting condition has occurred and an immediate corrective action\n  is required. Such a severity can be reported, for example, when a\n  managed object becomes totally out of service and its capability needs\n  to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting\n  condition has developed and an urgent corrective action is required.\n  Such a severity can be reported, for example, when there is a severe\n  degradation in the capability of the managed object and its full\n  capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a\n  non-service affecting fault condition and that corrective action\n  should be taken in order to prevent a more serious (for example,\n  service affecting) fault. Such a severity can be reported, for\n  example, when the detected alarm condition is not currently degrading\n  the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a\n  potential or impending service affecting fault, before any significant\n  effects have been felt. Action should be taken to further diagnose (if\n  necessary) and correct the problem in order to prevent it from\n  becoming a more serious service affecting fault (ITU-T Recommendation\n  X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the\n  severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or\n  more previously reported alarms. This alarm clears all alarms for this\n  managed object that have the same Alarm type, Probable cause and\n  Specific problems (if given) (ITU-T Recommendation X.733).\n",
@@ -162,12 +174,16 @@
     "_links": {
       "description": "Links for this resource.\n",
       "type": "object",
-      "required": ["self"],
+      "required": [
+        "self"
+      ],
       "properties": {
         "self": {
           "description": "This type represents a link to a resource using an absolute URI.\n",
           "type": "object",
-          "required": ["href"],
+          "required": [
+            "href"
+          ],
           "properties": {
             "href": {
               "description": "String formatted according to IETF RFC 3986.\n",
@@ -178,7 +194,9 @@
         "objectInstance": {
           "description": "This type represents a link to a resource using an absolute URI.\n",
           "type": "object",
-          "required": ["href"],
+          "required": [
+            "href"
+          ],
           "properties": {
             "href": {
               "description": "String formatted according to IETF RFC 3986.\n",
diff --git a/SOL003/VNFFaultManagement-API/schemas/alarmClearedNotification.schema.json b/SOL003/VNFFaultManagement-API/schemas/alarmClearedNotification.schema.json
index b3a8795b..e71ffd49 100644
--- a/SOL003/VNFFaultManagement-API/schemas/alarmClearedNotification.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/alarmClearedNotification.schema.json
@@ -18,7 +18,9 @@
     "notificationType": {
       "description": "Discriminator for the different notification types. Shall be set to \"AlarmClearedNotification\" for this notification type.\n",
       "type": "string",
-      "enum": ["AlarmClearedNotification"]
+      "enum": [
+        "AlarmClearedNotification"
+      ]
     },
     "subscriptionId": {
       "description": "An identifier with the intention of being globally unique.\n",
@@ -41,12 +43,17 @@
     "_links": {
       "description": "Links to resources related to this notification.\n",
       "type": "object",
-      "required": ["subscription", "alarm"],
+      "required": [
+        "subscription",
+        "alarm"
+      ],
       "properties": {
         "subscription": {
           "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
           "type": "object",
-          "required": ["href"],
+          "required": [
+            "href"
+          ],
           "properties": {
             "href": {
               "description": "String formatted according to IETF RFC 3986.\n",
@@ -57,7 +64,9 @@
         "alarm": {
           "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
           "type": "object",
-          "required": ["href"],
+          "required": [
+            "href"
+          ],
           "properties": {
             "href": {
               "description": "String formatted according to IETF RFC 3986.\n",
diff --git a/SOL003/VNFFaultManagement-API/schemas/alarmListRebuiltNotification.schema.json b/SOL003/VNFFaultManagement-API/schemas/alarmListRebuiltNotification.schema.json
index 14ca3dc9..d13d292b 100644
--- a/SOL003/VNFFaultManagement-API/schemas/alarmListRebuiltNotification.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/alarmListRebuiltNotification.schema.json
@@ -16,7 +16,9 @@
     "notificationType": {
       "description": "Discriminator for the different notification types. Shall be set to \"AlarmListRebuiltNotification\" for this notification type.\n",
       "type": "string",
-      "enum": ["AlarmListRebuiltNotification"]
+      "enum": [
+        "AlarmListRebuiltNotification"
+      ]
     },
     "subscriptionId": {
       "description": "An identifier with the intention of being globally unique.\n",
@@ -30,12 +32,17 @@
     "_links": {
       "description": "Links to resources related to this notification.\n",
       "type": "object",
-      "required": ["subscription", "alarms"],
+      "required": [
+        "subscription",
+        "alarms"
+      ],
       "properties": {
         "subscription": {
           "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
           "type": "object",
-          "required": ["href"],
+          "required": [
+            "href"
+          ],
           "properties": {
             "href": {
               "description": "String formatted according to IETF RFC 3986.\n",
@@ -46,7 +53,9 @@
         "alarms": {
           "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
           "type": "object",
-          "required": ["href"],
+          "required": [
+            "href"
+          ],
           "properties": {
             "href": {
               "description": "String formatted according to IETF RFC 3986.\n",
diff --git a/SOL003/VNFFaultManagement-API/schemas/alarmModifications.schema.json b/SOL003/VNFFaultManagement-API/schemas/alarmModifications.schema.json
index 9e0c34e7..4e98ff4d 100644
--- a/SOL003/VNFFaultManagement-API/schemas/alarmModifications.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/alarmModifications.schema.json
@@ -1,12 +1,17 @@
 {
   "description": "This type represents attribute modifications for an \"Individual alarm\" resource, i.e. modifications to a resource representation based on the \"Alarm\" data type. The attributes of \"Alarm\" that can be modified are included in the \"AlarmModifications\" data type.\n",
   "type": "object",
-  "required": ["ackState"],
+  "required": [
+    "ackState"
+  ],
   "properties": {
     "ackState": {
       "description": "New value of the \"ackState\" attribute in \"Alarm\". Permitted values: * ACKNOWLEDGED * UNACKNOWLEDGED\n",
       "type": "string",
-      "enum": ["ACKNOWLEDGED", "UNACKNOWLEDGED"]
+      "enum": [
+        "ACKNOWLEDGED",
+        "UNACKNOWLEDGED"
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/SOL003/VNFFaultManagement-API/schemas/alarmNotification.schema.json b/SOL003/VNFFaultManagement-API/schemas/alarmNotification.schema.json
index 1d80e903..d9448c34 100644
--- a/SOL003/VNFFaultManagement-API/schemas/alarmNotification.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/alarmNotification.schema.json
@@ -17,7 +17,9 @@
     "notificationType": {
       "description": "Discriminator for the different notification types. Shall be set to \"AlarmNotification\" for this notification type.\n",
       "type": "string",
-      "enum": ["AlarmNotification"]
+      "enum": [
+        "AlarmNotification"
+      ]
     },
     "subscriptionId": {
       "description": "An identifier with the intention of being globally unique.\n",
@@ -55,10 +57,15 @@
         "rootCauseFaultyResource": {
           "description": "This type represents the faulty virtual resources that have a negative impact on a VNF.\n",
           "type": "object",
-          "required": ["faultyResource", "faultyResourceType"],
+          "required": [
+            "faultyResource",
+            "faultyResourceType"
+          ],
           "properties": {
             "faultyResource": {
-              "required": ["resourceId"],
+              "required": [
+                "resourceId"
+              ],
               "type": "object",
               "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n* NOTE 1: The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or CISM or the resource \n          provider and can be used as information that complements the ResourceHandle. This value set is different from \n          the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2). When the container \n          infrastructure service management is a Kubernetes® instance the vimLevelResourceType is the type of \n          resource, as would correspond to the 'kind' field if the resource is declared in its own Kubernetes® manifest, \n          e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition.\n\n* NOTE 2: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be \n          populated in the following way:\n          - For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide \n          per resource type.\n          - For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, \n          i.e. the value of the 'claimName' field in the Kubernetes® manifest, or a compound name built by \n          Kubernetes® if the persistent volume claim is defined inline in another template instead of in its own \n          manifest.\n          - For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of \n          the 'metadata.name' field in Kubernetes® manifest.\n",
               "properties": {
@@ -105,7 +112,11 @@
             "faultyResourceType": {
               "description": "The enumeration FaultyResourceType represents those types of faulty resource.\n",
               "type": "string",
-              "enum": ["COMPUTE", "STORAGE", "NETWORK"]
+              "enum": [
+                "COMPUTE",
+                "STORAGE",
+                "NETWORK"
+              ]
             }
           }
         },
@@ -132,7 +143,10 @@
         "ackState": {
           "description": "Acknowledgement state of the alarm. Permitted values: * UNACKNOWLEDGED * ACKNOWLEDGED.\n",
           "type": "string",
-          "enum": ["UNACKNOWLEDGED", "ACKNOWLEDGED"]
+          "enum": [
+            "UNACKNOWLEDGED",
+            "ACKNOWLEDGED"
+          ]
         },
         "perceivedSeverity": {
           "description": "Indicates the relative level of urgency for operator attention. * CRITICAL: The Critical severity level indicates that a service\n  affecting condition has occurred and an immediate corrective action\n  is required. Such a severity can be reported, for example, when a\n  managed object becomes totally out of service and its capability needs\n  to be restored (ITU-T Recommendation X.733).\n* MAJOR: The Major severity level indicates that a service affecting\n  condition has developed and an urgent corrective action is required.\n  Such a severity can be reported, for example, when there is a severe\n  degradation in the capability of the managed object and its full\n  capability needs to be restored (ITU-T Recommendation X.733).\n* MINOR: The Minor severity level indicates the existence of a\n  non-service affecting fault condition and that corrective action\n  should be taken in order to prevent a more serious (for example,\n  service affecting) fault. Such a severity can be reported, for\n  example, when the detected alarm condition is not currently degrading\n  the capacity of the managed object (ITU-T Recommendation X.733).\n* WARNING: The Warning severity level indicates the detection of a\n  potential or impending service affecting fault, before any significant\n  effects have been felt. Action should be taken to further diagnose (if\n  necessary) and correct the problem in order to prevent it from\n  becoming a more serious service affecting fault (ITU-T Recommendation\n  X.733).\n* INDETERMINATE: The Indeterminate severity level indicates that the\n  severity level cannot be determined (ITU-T Recommendation X.733).\n* CLEARED: The Cleared severity level indicates the clearing of one or\n  more previously reported alarms. This alarm clears all alarms for this\n  managed object that have the same Alarm type, Probable cause and\n  Specific problems (if given) (ITU-T Recommendation X.733).\n",
@@ -192,12 +206,16 @@
         "_links": {
           "description": "Links for this resource.\n",
           "type": "object",
-          "required": ["self"],
+          "required": [
+            "self"
+          ],
           "properties": {
             "self": {
               "description": "This type represents a link to a resource using an absolute URI.\n",
               "type": "object",
-              "required": ["href"],
+              "required": [
+                "href"
+              ],
               "properties": {
                 "href": {
                   "description": "String formatted according to IETF RFC 3986.\n",
@@ -208,7 +226,9 @@
             "objectInstance": {
               "description": "This type represents a link to a resource using an absolute URI.\n",
               "type": "object",
-              "required": ["href"],
+              "required": [
+                "href"
+              ],
               "properties": {
                 "href": {
                   "description": "String formatted according to IETF RFC 3986.\n",
@@ -223,12 +243,16 @@
     "_links": {
       "description": "Links to resources related to this notification.\n",
       "type": "object",
-      "required": ["subscription"],
+      "required": [
+        "subscription"
+      ],
       "properties": {
         "subscription": {
           "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
           "type": "object",
-          "required": ["href"],
+          "required": [
+            "href"
+          ],
           "properties": {
             "href": {
               "description": "String formatted according to IETF RFC 3986.\n",
-- 
GitLab


From 90227dd4b7916beba30836e2a76728cef54ab23a Mon Sep 17 00:00:00 2001
From: "mudassar.sabeel" <mudassar.sabeel@xflowresearch.com>
Date: Wed, 18 Dec 2024 12:10:06 +0500
Subject: [PATCH 3/7] update response body schemas as per SOL 003 version 5.1.1

---
 .../schemas/Alarms.schema.json                |  6 +--
 .../schemas/FmSubscription.schema.json        | 47 +++++++++++++++++++
 .../schemas/FmSubscriptions.schema.json       | 47 +++++++++++++++++++
 .../schemas/alarm.schema.json                 |  6 +--
 .../schemas/alarmNotification.schema.json     |  6 +--
 5 files changed, 103 insertions(+), 9 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json b/SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json
index dab2c42c..25aa437a 100644
--- a/SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json
@@ -149,11 +149,11 @@
           ]
         },
         "faultType": {
-          "description": "Additional information to clarify the type of the fault. If the alarm is related to changes in the state of virtualised resources  due to NFVI operation and maintenance, this attribute shall be set to  \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\".\n",
+          "description": "Additional information to clarify the type of the fault. Valid values applicable to specific Alarms are specified as \"Alarm definition  identifier\" values of the Alarm applicable to Or-Vnfm reference point, as  defined in clause 7.3 of ETSI GS NFV-IFA 045 [13]. If the alarm is related to changes in the state of virtualised resources  due to NFVI operation and maintenance, this attribute shall be set to  \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\".\n",
           "type": "string"
         },
         "probableCause": {
-          "description": "Information about the probable cause of the fault. If the attribute \"faultType\" has the value “NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE”, the permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. \n    physical maintenance/repair, hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g.\n    to support energy efficiency or resource usage.\n",
+          "description": "Information about the probable cause of the fault. Valid values applicable to specific Alarms are specified as \"Probable cause\"  values of the Alarm applicable to Or-Vnfm reference point, as defined in  clause 7.3 of ETSI GS NFV-IFA 045 [13]. If the attribute \"faultType\" has the value ΓÇ£NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGEΓÇ¥, the permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. \n    physical maintenance/repair, hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g.\n    to support energy efficiency or resource usage.\n",
           "type": "string"
         },
         "isRootCause": {
@@ -169,7 +169,7 @@
           }
         },
         "faultDetails": {
-          "description": "Provides additional information about the fault. See notes 1 and 2.\n",
+          "description": "Provides additional information about the fault. See notes 1 and 2. Valid values  applicable to specific Alarms are specified as \"Fault details\" values of the Alarm  applicable to Or-Vnfm reference point, as defined in clause 7.3 of  ETSI GS NFV-IFA 045 [13].\n",
           "type": "array",
           "items": {
             "type": "string"
diff --git a/SOL003/VNFFaultManagement-API/schemas/FmSubscription.schema.json b/SOL003/VNFFaultManagement-API/schemas/FmSubscription.schema.json
index e6fc6b8a..da71a4d8 100644
--- a/SOL003/VNFFaultManagement-API/schemas/FmSubscription.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/FmSubscription.schema.json
@@ -199,6 +199,53 @@
       "description": "String formatted according to IETF RFC 3986.\n",
       "type": "string"
     },
+    "fmConnection": {
+      "description": "An access information and interface information to monitor the FM of VNF instance by  the VNFM. This can include for instance certain interface endpoint URI together with  necessary credentials to access it.\n",
+      "type": "array",
+      "items": {
+        "description": "The MonitoringConnection shall follow the indications provided.\n* NOTE: The VNFM can be made aware of monitoring connection information, \n  including their identifiers to be used by configuration means outside the scope of the \n  present document (e.g. using relevant NFV-MANO management APIs as defined in \n  ETSI GS NFV-SOL 009 [i.18]).\n",
+        "type": "object",
+        "required": [
+          "id",
+          "monitoringType"
+        ],
+        "properties": {
+          "id": {
+            "description": "An identifier with the intention of being globally unique.\n",
+            "type": "string"
+          },
+          "monitoringType": {
+            "description": "Type of monitoring way.\n",
+            "type": "string",
+            "enum": [
+              "VIM_CISM",
+              "EXTERNAL",
+              "PAAS"
+            ]
+          },
+          "vimId": {
+            "description": "An identifier with the intention of being globally unique.\n",
+            "type": "string"
+          },
+          "paasServiceId": {
+            "description": "An identifier with the intention of being globally unique.\n",
+            "type": "string"
+          },
+          "interfaceInfo": {
+            "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+            "type": "object"
+          },
+          "accessInfo": {
+            "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+            "type": "object"
+          },
+          "extra": {
+            "description": "A string defined in IETF RFC 8259.\n",
+            "type": "string"
+          }
+        }
+      }
+    },
     "_links": {
       "description": "Links for this resource.\n",
       "type": "object",
diff --git a/SOL003/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json b/SOL003/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json
index 268e5066..6887b2cd 100644
--- a/SOL003/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/FmSubscriptions.schema.json
@@ -201,6 +201,53 @@
         "description": "String formatted according to IETF RFC 3986.\n",
         "type": "string"
       },
+      "fmConnection": {
+        "description": "An access information and interface information to monitor the FM of VNF instance by  the VNFM. This can include for instance certain interface endpoint URI together with  necessary credentials to access it.\n",
+        "type": "array",
+        "items": {
+          "description": "The MonitoringConnection shall follow the indications provided.\n* NOTE: The VNFM can be made aware of monitoring connection information, \n  including their identifiers to be used by configuration means outside the scope of the \n  present document (e.g. using relevant NFV-MANO management APIs as defined in \n  ETSI GS NFV-SOL 009 [i.18]).\n",
+          "type": "object",
+          "required": [
+            "id",
+            "monitoringType"
+          ],
+          "properties": {
+            "id": {
+              "description": "An identifier with the intention of being globally unique.\n",
+              "type": "string"
+            },
+            "monitoringType": {
+              "description": "Type of monitoring way.\n",
+              "type": "string",
+              "enum": [
+                "VIM_CISM",
+                "EXTERNAL",
+                "PAAS"
+              ]
+            },
+            "vimId": {
+              "description": "An identifier with the intention of being globally unique.\n",
+              "type": "string"
+            },
+            "paasServiceId": {
+              "description": "An identifier with the intention of being globally unique.\n",
+              "type": "string"
+            },
+            "interfaceInfo": {
+              "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+              "type": "object"
+            },
+            "accessInfo": {
+              "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+              "type": "object"
+            },
+            "extra": {
+              "description": "A string defined in IETF RFC 8259.\n",
+              "type": "string"
+            }
+          }
+        }
+      },
       "_links": {
         "description": "Links for this resource.\n",
         "type": "object",
diff --git a/SOL003/VNFFaultManagement-API/schemas/alarm.schema.json b/SOL003/VNFFaultManagement-API/schemas/alarm.schema.json
index 965f3343..fc644e5b 100644
--- a/SOL003/VNFFaultManagement-API/schemas/alarm.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/alarm.schema.json
@@ -145,11 +145,11 @@
       ]
     },
     "faultType": {
-      "description": "Additional information to clarify the type of the fault. If the alarm is related to changes in the state of virtualised resources  due to NFVI operation and maintenance, this attribute shall be set to  \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\".\n",
+      "description": "Additional information to clarify the type of the fault. Valid values applicable to specific Alarms are specified as \"Alarm definition  identifier\" values of the Alarm applicable to Or-Vnfm reference point, as  defined in clause 7.3 of ETSI GS NFV-IFA 045 [13]. If the alarm is related to changes in the state of virtualised resources  due to NFVI operation and maintenance, this attribute shall be set to  \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\".\n",
       "type": "string"
     },
     "probableCause": {
-      "description": "Information about the probable cause of the fault. If the attribute \"faultType\" has the value “NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE”, the permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. \n    physical maintenance/repair, hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g.\n    to support energy efficiency or resource usage.\n",
+      "description": "Information about the probable cause of the fault. Valid values applicable to specific Alarms are specified as \"Probable cause\"  values of the Alarm applicable to Or-Vnfm reference point, as defined in  clause 7.3 of ETSI GS NFV-IFA 045 [13]. If the attribute \"faultType\" has the value ΓÇ£NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGEΓÇ¥, the permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. \n    physical maintenance/repair, hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g.\n    to support energy efficiency or resource usage.\n",
       "type": "string"
     },
     "isRootCause": {
@@ -165,7 +165,7 @@
       }
     },
     "faultDetails": {
-      "description": "Provides additional information about the fault. See notes 1 and 2.\n",
+      "description": "Provides additional information about the fault. See notes 1 and 2. Valid values  applicable to specific Alarms are specified as \"Fault details\" values of the Alarm  applicable to Or-Vnfm reference point, as defined in clause 7.3 of  ETSI GS NFV-IFA 045 [13].\n",
       "type": "array",
       "items": {
         "type": "string"
diff --git a/SOL003/VNFFaultManagement-API/schemas/alarmNotification.schema.json b/SOL003/VNFFaultManagement-API/schemas/alarmNotification.schema.json
index d9448c34..13d22b09 100644
--- a/SOL003/VNFFaultManagement-API/schemas/alarmNotification.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/alarmNotification.schema.json
@@ -177,11 +177,11 @@
           ]
         },
         "faultType": {
-          "description": "Additional information to clarify the type of the fault. If the alarm is related to changes in the state of virtualised resources  due to NFVI operation and maintenance, this attribute shall be set to  \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\".\n",
+          "description": "Additional information to clarify the type of the fault. Valid values applicable to specific Alarms are specified as \"Alarm definition  identifier\" values of the Alarm applicable to Or-Vnfm reference point, as  defined in clause 7.3 of ETSI GS NFV-IFA 045 [13]. If the alarm is related to changes in the state of virtualised resources  due to NFVI operation and maintenance, this attribute shall be set to  \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\".\n",
           "type": "string"
         },
         "probableCause": {
-          "description": "Information about the probable cause of the fault. If the attribute \"faultType\" has the value “NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE”, the permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. \n    physical maintenance/repair, hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g.\n    to support energy efficiency or resource usage.\n",
+          "description": "Information about the probable cause of the fault. Valid values applicable to specific Alarms are specified as \"Probable cause\"  values of the Alarm applicable to Or-Vnfm reference point, as defined in  clause 7.3 of ETSI GS NFV-IFA 045 [13]. If the attribute \"faultType\" has the value “NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE”, the permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. \n    physical maintenance/repair, hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g.\n    to support energy efficiency or resource usage.\n",
           "type": "string"
         },
         "isRootCause": {
@@ -197,7 +197,7 @@
           }
         },
         "faultDetails": {
-          "description": "Provides additional information about the fault. See notes 1 and 2.\n",
+          "description": "Provides additional information about the fault. See notes 1 and 2. Valid values  applicable to specific Alarms are specified as \"Fault details\" values of the Alarm  applicable to Or-Vnfm reference point, as defined in clause 7.3 of  ETSI GS NFV-IFA 045 [13].\n",
           "type": "array",
           "items": {
             "type": "string"
-- 
GitLab


From e2ae8ad613b9daba60ca4a047280e1fea59cc72a Mon Sep 17 00:00:00 2001
From: "mudassar.sabeel" <mudassar.sabeel@xflowresearch.com>
Date: Fri, 20 Dec 2024 11:36:32 +0500
Subject: [PATCH 4/7] Fix issue #188: Set version headers

---
 .../VNFFaultManagement-API/ApiVersion.robot   | 10 +++
 .../FaultManagement-APIKeyword.robot          | 61 ++++++++++++++++++-
 .../NotificationEndpoint.robot                |  4 ++
 .../environment/variables.txt                 |  1 +
 4 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/ApiVersion.robot b/SOL003/VNFFaultManagement-API/ApiVersion.robot
index b1a8f8ef..b9aca43f 100644
--- a/SOL003/VNFFaultManagement-API/ApiVersion.robot
+++ b/SOL003/VNFFaultManagement-API/ApiVersion.robot
@@ -133,6 +133,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
 *** Keywords ***
 POST API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
@@ -140,6 +141,7 @@ POST API Version
 	
 GET API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
@@ -147,6 +149,7 @@ GET API Version
 	
 PUT API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
@@ -154,6 +157,7 @@ PUT API Version
 	
 PATCH API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
@@ -161,6 +165,7 @@ PATCH API Version
 	
 DELETE API Version
     Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/api_versions
     ${outputResponse}=    Output    response
@@ -168,6 +173,7 @@ DELETE API Version
 	
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
@@ -175,6 +181,7 @@ POST API Version with apiMajorVersion
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
@@ -182,6 +189,7 @@ GET API Version with apiMajorVersion
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
@@ -189,6 +197,7 @@ PUT API Version with apiMajorVersion
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
@@ -196,6 +205,7 @@ PATCH API Version with apiMajorVersion
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
     ${outputResponse}=    Output    response
diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index ad5fcde0..dde7a6ec 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -18,12 +18,14 @@ Create Sessions
     
 Check created Subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     Integer    response status    200  
 Check Postcondition FaultManagement Subscription Is Set
     Log    Check Postcondition subscription exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -40,12 +42,14 @@ Check Precondition VNF fault management individual alarm Exists
 
 Check Individual Subscription existence
     Set Headers    {"Accept":"${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    200
     
 Check Individual Subscription deleted
     Set Headers    {"Accept":"${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId} 
     Integer    response status    404
@@ -84,6 +88,7 @@ Check HTTP Response Header ContentType is
     
 Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${response['headers']['Location']}
     Integer    response status    200
@@ -97,6 +102,7 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
 Send POST request for fault management Alarms
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response 
@@ -105,6 +111,7 @@ Send POST request for fault management Alarms
 PATCH Fault management Alarms
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse} =    Output    response 
@@ -113,6 +120,7 @@ PATCH Fault management Alarms
 PUT Fault management Alarms
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response 
@@ -121,6 +129,7 @@ PUT Fault management Alarms
 DELETE Fault management Alarms
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
     ${outputResponse}=    Output    response
@@ -129,6 +138,7 @@ DELETE Fault management Alarms
 GET Fault Management Alarms
     Log    Query NFVO The GET method queries information about multiple alarms.
     Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
@@ -138,6 +148,7 @@ GET Fault Management Alarms
 GET Fault Management Alarms with nextpage_opaque_marker parameter
     Log    Get next page of subscriptions
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query using the URI provided in the previous GET request and validate response
     Get    ${nextPageUri}
@@ -148,7 +159,8 @@ GET Fault Management Alarms with nextpage_opaque_marker parameter
 GET Fault Management Alarms With Filters
 	Log    Query NFVO The GET method queries information about multiple alarms with filters.
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+	Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${alarm_filter}=${nsInstanceId}
 	${outputResponse}=    Output    response
@@ -157,7 +169,8 @@ GET Fault Management Alarms With Filters
 GET Fault Management Alarms With Invalid Filters
 	Log    Query NFVO The GET method queries information about multiple alarms with filters.
 	Set Headers  {"Accept":"${ACCEPT}"}  
-	Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+	Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
 	Log    Execute Query
 	Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?${invalid_alarm_filter}=${nsInstanceId}
 	${outputResponse}=    Output    response
@@ -166,6 +179,7 @@ GET Alarms Task with all_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
@@ -174,6 +188,7 @@ GET Alarms Task with exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_default
     ${output}=    Output    response
@@ -182,6 +197,7 @@ GET Alarms Task with fields attribute selector
     Log    Trying to get all alarms present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?fields=${fields}
     ${output}=    Output    response
@@ -190,6 +206,7 @@ GET Alarms Task with exclude_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using fields
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms?exclude_fields=${fields}
     ${output}=    Output    response
@@ -197,6 +214,7 @@ GET Alarms Task with exclude_fields attribute selector
 Send POST request for fault management Individual Alarm
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response 
@@ -207,6 +225,7 @@ GET Fault Management Alarms with permitted authorization scope
     Set Headers  {"Accept":"${ACCEPT}"}  
     ${scopeValue}=    Create Dictionary    scopeValue=${ALARMS_READONLY_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
     Log    Execute Query
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
@@ -218,6 +237,7 @@ GET Fault Management Alarms with not permitted authorization scope
     Set Headers  {"Accept":"${ACCEPT}"}  
     ${scopeValue}=    Create Dictionary    scopeValue=${ALARMS_READONLY_NOT_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
     Log    Execute Query
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms
@@ -227,6 +247,7 @@ GET Fault Management Alarms with not permitted authorization scope
 DELETE Fault Management Individual Alarm
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
@@ -235,6 +256,7 @@ DELETE Fault Management Individual Alarm
 PUT Fault Management Individual Alarm
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
     ${outputResponse}=    Output    response
@@ -244,6 +266,7 @@ GET Fault Management Individual Alarm
     Log    Query VNF The GET method queries information about an alarm.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
@@ -254,6 +277,7 @@ GET Fault Management Individual Alarm with invalid id
     Log    Query NFVO The GET method queries information about an invalid alarm. Should return does not exist
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query 
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${invalidAlarmId}
@@ -264,6 +288,7 @@ PATCH Fault Management Individual Alarm
     log    Trying to perform a PATCH. This method modifies an individual alarm resource
     Set Headers  {"Accept":"${ACCEPT}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
@@ -276,6 +301,7 @@ PATCH Fault Management Individual Alarm with permitted authorization scope
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     ${scopeValue}=    Create Dictionary    scopeValue=${ALARMS_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
@@ -288,6 +314,7 @@ PATCH Fault Management Individual Alarm with not permitted authorization scope
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     ${scopeValue}=    Create Dictionary    scopeValue=${ALARMS_NOT_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
@@ -299,6 +326,7 @@ PATCH Fault Management Individual Alarm - Etag mismatch
     Set Headers  {"Accept":"${ACCEPT}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     Set Headers    {"If-Match": "${invalid_etag}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
@@ -310,6 +338,7 @@ PATCH Fault Management Individual Alarm Conflict
     Set Headers  {"Accept":"${ACCEPT}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     Set Headers    {"If-Match": "${Etag}"} 
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/alarmModifications.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}    ${body}
@@ -320,6 +349,7 @@ POST Subscription
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}      callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
@@ -339,6 +369,7 @@ Send POST Request for duplicated subscription
     Pass Execution If    ${VNFM_DUPLICATION} == 0    NVFO is not permitting duplication. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
@@ -358,6 +389,7 @@ Send POST Request for duplicated subscription not permitted
     Pass Execution If    ${VNFM_DUPLICATION} == 1    NVFO is not permitting duplication. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
@@ -378,6 +410,7 @@ POST Subscription with permitted authorization scope
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     ${scopeValue}=    Create Dictionary    scopeValue=${ALARMS_SUBSCRIPTIONS_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}      callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
@@ -398,6 +431,7 @@ POST Subscription with not permitted authorization scope
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     ${scopeValue}=    Create Dictionary    scopeValue=${ALARMS_SUBSCRIPTIONS_NOT_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
     ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}      callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
@@ -415,6 +449,7 @@ POST Subscription with not permitted authorization scope
 GET Subscriptions
     Log    Get the list of active subscriptions
     Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${outputResponse}=    Output    response
@@ -423,6 +458,7 @@ GET Subscriptions
 GET Subscriptions with filter
     Log    Get the list of active subscriptions using a filter
     Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
     ${outputResponse}=    Output    response
@@ -431,6 +467,7 @@ GET Subscriptions with filter
 GET Subscriptions with Invalid filter   
     Log    Get the list of active subscriptions using an invalid filter
     Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter_invalid}
     ${outputResponse}=    Output    response
@@ -438,6 +475,7 @@ GET Subscriptions with Invalid filter
 Get subscriptions with all_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
@@ -445,6 +483,7 @@ Get subscriptions with all_fields attribute selector
 Get subscriptions with exclude_default attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_default
     ${output}=    Output    response
@@ -452,6 +491,7 @@ Get subscriptions with exclude_default attribute selector
 Get subscriptions with fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?fields=${fields}
     ${output}=    Output    response
@@ -459,6 +499,7 @@ Get subscriptions with fields attribute selector
 Get subscriptions with exclude_fields attribute selector
     Log    Get the list of active subscriptions, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?exclude_fields=${fields}
     ${output}=    Output    response
@@ -466,6 +507,7 @@ Get subscriptions with exclude_fields attribute selector
 PUT Subscriptions
     log    Trying to perform a PUT Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
@@ -474,6 +516,7 @@ PUT Subscriptions
 PATCH Subscriptions
     log    Trying to perform a PATCH Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
@@ -482,6 +525,7 @@ PATCH Subscriptions
 DELETE Subscriptions
     log    Trying to perform a DELETE Subscriptions. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    
     ${outputResponse}=    Output    response
@@ -490,6 +534,7 @@ DELETE Subscriptions
 POST Individual Subscription
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
@@ -498,6 +543,7 @@ POST Individual Subscription
 GET Individual Subscription
     log    Trying to get information about an individual subscription
     Set Headers    {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
@@ -508,6 +554,7 @@ GET Individual Subscription with permitted authorization scope
     Set Headers    {"Accept":"${ACCEPT}"}  
     ${scopeValue}=    Create Dictionary    scopeValue=${ALARMS_SUBSCRIPTIONS_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
@@ -518,6 +565,7 @@ GET Individual Subscription with not permitted authorization scope
     Set Headers    {"Accept":"${ACCEPT}"}  
     ${scopeValue}=    Create Dictionary    scopeValue=${ALARMS_SUBSCRIPTIONS_PERMITTED_SCOPE}
     ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${authorizationToken}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${outputResponse}=    Output    response
@@ -526,6 +574,7 @@ GET Individual Subscription with not permitted authorization scope
 PUT Individual Subscription
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
@@ -534,6 +583,7 @@ PUT Individual Subscription
 PATCH Individual Subscription
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
@@ -542,6 +592,7 @@ PATCH Individual Subscription
 DELETE Individual Subscription
     log    Trying to perform a DELETE.
     Set Headers  {"Accept":"${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
@@ -561,6 +612,7 @@ Check HTTP Response Header Contain Link
 Get subscriptions with filter "id"
     Log    Get the list of active subscriptions using a filter "id"
     Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?id=${subscription_id}
     ${outputResponse}=    Output    response
@@ -572,6 +624,7 @@ Check PostCondition HTTP Response Body Subscription Matches the requested attrib
 Get subscriptions with filter "filter_notificationTypes"
     Log    Get the list of active subscriptions using a filter "filter.notificationTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.notificationTypes=${notification_type}
     ${outputResponse}=    Output    response
@@ -585,6 +638,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_faultyResourceTypes"
     Log    Get the list of active subscriptions using a filter "filter.faultyResourceTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.faultyResourceTypes=${faultyResourceType}
     ${outputResponse}=    Output    response
@@ -598,6 +652,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_perceivedSeverities"
     Log    Get the list of active subscriptions using a filter "filter.perceivedSeverities"
     Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.perceivedSeverities=${perceivedSeverity}
     ${outputResponse}=    Output    response
@@ -611,6 +666,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_eventTypes"
     Log    Get the list of active subscriptions using a filter "filter.eventTypes"
     Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.eventTypes=${eventType}
     ${outputResponse}=    Output    response
@@ -624,6 +680,7 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 Get subscriptions with filter "filter_probableCauses"
     Log    Get the list of active subscriptions using a filter "filter.probableCauses"
     Set Headers    {"Accept": "${ACCEPT}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?filter.probableCauses=${probableCause}
     ${outputResponse}=    Output    response
diff --git a/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
index 34179592..fba4da18 100644
--- a/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
@@ -48,6 +48,7 @@ VNF Fault Alarm List Reulit Notification
 Check resource existence and get CallbackUri
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     Integer    response status    200
@@ -64,6 +65,7 @@ Post Alarm Notification
     log    Trying to perform a POST to get notification
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template} =    Get File    jsons/AlarmNotification.json
     ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}      
@@ -75,6 +77,7 @@ Post Alarm Cleared Notification
     log    Trying to perform a POST to get notification
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template} =    Get File    jsons/AlarmClearedNotification.json
     ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   alarmId=${alarmId}   
@@ -86,6 +89,7 @@ Post Alarm List Rebuilt Notification
     log    Trying to perform a POST to get notification
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template} =    Get File    jsons/AlarmListRebuiltNotification.json
     ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
diff --git a/SOL003/VNFFaultManagement-API/environment/variables.txt b/SOL003/VNFFaultManagement-API/environment/variables.txt
index 874a0475..fbd29140 100644
--- a/SOL003/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL003/VNFFaultManagement-API/environment/variables.txt
@@ -39,6 +39,7 @@ ${NFVO_FIELDS}    1
 ${apiRoot}        /
 ${apiName}        vnffm
 ${apiMajorVersion}     v1
+${API_VERSION}    1.14.0
 
 ${nextPageUri}    /some_uri
 
-- 
GitLab


From aaaf82b593f237b38521b61304b933786dd18b4c Mon Sep 17 00:00:00 2001
From: "mudassar.sabeel" <mudassar.sabeel@xflowresearch.com>
Date: Fri, 20 Dec 2024 11:55:42 +0500
Subject: [PATCH 5/7] Editorial Change: Move Notification Endpoint keywords to
 FaultManagement-APIKeyword file

---
 .../FaultManagement-APIKeyword.robot          | 47 +++++++++++++++-
 .../NotificationEndpoint.robot                | 56 +------------------
 2 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index dde7a6ec..094c2a7d 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -694,4 +694,49 @@ Check PostCondition HTTP Response Body Subscriptions Matches the requested attri
 JWT Encode
     [Arguments]    ${payload}    ${key}    ${algorithm}
     ${encoded}=    Evaluate    jwt.encode(${payload}, ${key}, ${algorithm})
-    [Return]    ${encoded}
\ No newline at end of file
+    [Return]    ${encoded}
+Check resource existence and get CallbackUri
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    Integer    response status    200
+    Validate Json    response body    FmSubscriptions.schema.json
+    Set Global Variable    ${callbackResp}    response body callbackUri
+    
+Post Alarm Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/AlarmNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}      
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}	
+
+Post Alarm Cleared Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/AlarmClearedNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   alarmId=${alarmId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+Post Alarm List Rebuilt Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/AlarmListRebuiltNotification.json
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
+    Post    ${callbackResp}    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
index fba4da18..42dac9ed 100644
--- a/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
@@ -2,6 +2,7 @@
 Library    String
 Library    OperatingSystem
 Resource    environment/variables.txt
+Resource    FaultManagement-APIKeyword.robot
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}        ssl_verify=false
@@ -42,57 +43,4 @@ VNF Fault Alarm List Reulit Notification
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Alarm List Rebuilt Notification
-    Check HTTP Response Status Code Is    204
-    
-*** Keywords ***
-Check resource existence and get CallbackUri
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Set Headers    {"Version": "${API_VERSION}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
-    Integer    response status    200
-    Validate Json    response body    FmSubscriptions.schema.json
-    Set Global Variable    ${callbackResp}    response body callbackUri
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}
-    Log    Validate Status code    
-    Should Be Equal As Strings    ${response['status']}    ${expected_status}
-    Log    Status code validated
-    
-Post Alarm Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Set Headers    {"Version": "${API_VERSION}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    ${template} =    Get File    jsons/AlarmNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}      
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}	
-
-Post Alarm Cleared Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Set Headers    {"Version": "${API_VERSION}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    ${template} =    Get File    jsons/AlarmClearedNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   alarmId=${alarmId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
-	
-Post Alarm List Rebuilt Notification
-    log    Trying to perform a POST to get notification
-    Set Headers  {"Accept":"${ACCEPT}"}  
-    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    Set Headers    {"Version": "${API_VERSION}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    ${template} =    Get File    jsons/AlarmListRebuiltNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
-    Post    ${callbackResp}    ${body}
-    ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
+    Check HTTP Response Status Code Is    204
\ No newline at end of file
-- 
GitLab


From 7c9ca84818266e2943269fee78714b318d0a0728 Mon Sep 17 00:00:00 2001
From: "mudassar.sabeel" <mudassar.sabeel@xflowresearch.com>
Date: Fri, 20 Dec 2024 11:58:57 +0500
Subject: [PATCH 6/7] test different methods of notification endpoint of VNF
 LCM as per SOL 003 specification version 5.1.1

---
 .../FaultManagement-APIKeyword.robot          | 35 +++++++++++++-
 .../NotificationEndpoint.robot                | 46 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index 094c2a7d..63607559 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -739,4 +739,37 @@ Post Alarm List Rebuilt Notification
     ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
+	Set Global Variable    ${response}    ${outputResponse}
+GET reach the notification endpoint  
+    Log    Trying to reach the notification endpoint using GET method.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${callbackResp}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
+PUT notification endpoint  
+    Log    Trying to perform a PUT. This method should not be implemented.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Put    ${callbackResp}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
+PATCH notification endpoint  
+    Log    Trying to perform a PATCH. This method should not be implemented.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${callbackResp}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
+
+DELETE notification endpoint  
+    Log    Trying to perform a DELETE. This method should not be implemented.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Version": "${API_VERSION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Delete    ${callbackResp}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
index 42dac9ed..a01d0a32 100644
--- a/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFFaultManagement-API/NotificationEndpoint.robot
@@ -43,4 +43,48 @@ VNF Fault Alarm List Reulit Notification
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Alarm List Rebuilt Notification
-    Check HTTP Response Status Code Is    204
\ No newline at end of file
+    Check HTTP Response Status Code Is    204
+Test the Notification Endpoint - Successful
+    [Documentation]    Test ID: 7.3.5.7.4
+    ...    Test title: Test the Notification Endpoint - Successful
+    ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
+    ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get reach the notification endpoint
+    Check HTTP Response Status Code Is    204
+PUT Notification endpoint - Method Not Implemented
+    [Documentation]    Test ID: 7.3.5.7.5
+    ...    Test title: PUT Notification endpoint - Method Not Implemented
+    ...    Test objective: The objective is to test the PUT method for Notification Endpoint provided by the consumer is not implemented.
+    ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
+    ...    Reference: Clause 7.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PUT notification endpoint
+    Check HTTP Response Status Code Is    405
+PATCH Notification endpoint - Method Not Implemented
+    [Documentation]    Test ID: 7.3.5.7.6
+    ...    Test title: PATCH Notification endpoint - Method Not Implemented
+    ...    Test objective: The objective is to test the PATCH method for Notification Endpoint provided by the consumer is not implemented.
+    ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
+    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    PATCH notification endpoint
+    Check HTTP Response Status Code Is    405
+DELETE Notification endpoint - Method Not Implemented
+    [Documentation]    Test ID: 7.3.5.7.7
+    ...    Test title: DELETE Notification endpoint - Method Not Implemented
+    ...    Test objective: The objective is to test the DELETE method for Notification Endpoint provided by the consumer is not implemented.
+    ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
+    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    DELETE notification endpoint
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
-- 
GitLab


From 08ed9865dbd0833be8295b49fee4df4b48903d47 Mon Sep 17 00:00:00 2001
From: "mudassar.sabeel" <mudassar.sabeel@xflowresearch.com>
Date: Thu, 23 Jan 2025 11:13:23 +0500
Subject: [PATCH 7/7] Editorial Change: Resolve Mojibake in Response Bodies

---
 SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json | 2 +-
 SOL003/VNFFaultManagement-API/schemas/alarm.schema.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json b/SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json
index 25aa437a..18086fd0 100644
--- a/SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/Alarms.schema.json
@@ -153,7 +153,7 @@
           "type": "string"
         },
         "probableCause": {
-          "description": "Information about the probable cause of the fault. Valid values applicable to specific Alarms are specified as \"Probable cause\"  values of the Alarm applicable to Or-Vnfm reference point, as defined in  clause 7.3 of ETSI GS NFV-IFA 045 [13]. If the attribute \"faultType\" has the value ΓÇ£NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGEΓÇ¥, the permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. \n    physical maintenance/repair, hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g.\n    to support energy efficiency or resource usage.\n",
+          "description": "Information about the probable cause of the fault. Valid values applicable to specific Alarms are specified as \"Probable cause\"  values of the Alarm applicable to Or-Vnfm reference point, as defined in  clause 7.3 of ETSI GS NFV-IFA 045 [13]. If the attribute \"faultType\" has the value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\", the permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. \n    physical maintenance/repair, hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g.\n    to support energy efficiency or resource usage.\n",
           "type": "string"
         },
         "isRootCause": {
diff --git a/SOL003/VNFFaultManagement-API/schemas/alarm.schema.json b/SOL003/VNFFaultManagement-API/schemas/alarm.schema.json
index fc644e5b..837ff5fe 100644
--- a/SOL003/VNFFaultManagement-API/schemas/alarm.schema.json
+++ b/SOL003/VNFFaultManagement-API/schemas/alarm.schema.json
@@ -149,7 +149,7 @@
       "type": "string"
     },
     "probableCause": {
-      "description": "Information about the probable cause of the fault. Valid values applicable to specific Alarms are specified as \"Probable cause\"  values of the Alarm applicable to Or-Vnfm reference point, as defined in  clause 7.3 of ETSI GS NFV-IFA 045 [13]. If the attribute \"faultType\" has the value ΓÇ£NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGEΓÇ¥, the permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. \n    physical maintenance/repair, hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g.\n    to support energy efficiency or resource usage.\n",
+      "description": "Information about the probable cause of the fault. Valid values applicable to specific Alarms are specified as \"Probable cause\"  values of the Alarm applicable to Or-Vnfm reference point, as defined in  clause 7.3 of ETSI GS NFV-IFA 045 [13]. If the attribute \"faultType\" has the value \"NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE\", the permitted values are: \n  - \"NFVI_COMPONENT_MAINTENANCE\": Maintenance of NFVI components, e.g. \n    physical maintenance/repair, hypervisor software updates, etc.\n  - \"NFVI_COMPONENT_EVACUATION\": Evacuation of physical hosts.\n  - \"NFVI_COMPONENT_OPTIMIZATION\": Operation and management of NFVI resources, e.g.\n    to support energy efficiency or resource usage.\n",
       "type": "string"
     },
     "isRootCause": {
-- 
GitLab