diff --git a/SOL005/NSFaultManagement-API/Alarms.robot b/SOL005/NSFaultManagement-API/Alarms.robot
index 07b7c74ef66f0b341ebdbf91fefe3d239227a2ef..746ee4b6fe737d6111b5b5b67c5bd6fa9cdb6fdd 100644
--- a/SOL005/NSFaultManagement-API/Alarms.robot
+++ b/SOL005/NSFaultManagement-API/Alarms.robot
@@ -15,13 +15,13 @@ POST Alarms - Method not implemented
... Reference: section 8.4.2.3.1 - SOL005 v2.4.1
... Config ID: Config_prod_NFVO
... Applicability: none
- ... Post-Conditions: none
+ ... Post-Conditions: alarm not created
POST Alarms
Check HTTP Response Status Code Is 405
-Get information about multiple alarms
+GET information about multiple alarms
[Documentation] Test ID: 5.3.3.1.2
- ... Test title: 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: section 8.4.2.3.2 - SOL005 v2.4.1
@@ -32,22 +32,22 @@ Get information about multiple alarms
Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is alarms
-Get information about multiple alarms with filters
+GET information about multiple alarms with filters
[Documentation] Test ID: 5.3.3.1.3
- ... Test title: Get information about multiple alarms with filters
+ ... Test title: GET information about multiple alarms with filters
... Test objective: The objective is to retrieve information about the alarm list and perform a JSON schema and content validation of the returned alarms data structure, and verify that the retrieved information matches the issued attribute-based filters
... Pre-conditions: none
... Reference: section 8.4.2.3.2 - SOL005 v2.4.1
... Config ID: Config_prod_NFVO
... Applicability: none
- ... Post-Conditions: none
+ ... Post-Conditions: none
GET Alarms With Filters
Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is alarms
-Get information about multiple alarms Bad Request Invalid attribute-based filtering parameters
+GET information about multiple alarms Bad Request Invalid attribute-based filtering parameters
[Documentation] Test ID: 5.3.3.1.4
- ... Test title: Get information about multiple alarms Bad Request Invalid attribute-based filtering parameters
+ ... 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: section 8.4.2.3.2 - SOL005 v2.4.1
@@ -66,7 +66,7 @@ PUT Alarms - Method not implemented
... Reference: section 8.4.2.3.3 - SOL005 v2.4.1
... Config ID: Config_prod_NFVO
... Applicability: none
- ... Post-Conditions: none
+ ... Post-Conditions: none
PUT Alarms
Check HTTP Response Status Code Is 405
@@ -79,7 +79,7 @@ PATCH Alarms - Method not implemented
... Reference: section 8.4.2.3.4 - SOL005 v2.4.1
... Config ID: Config_prod_NFVO
... Applicability: none
- ... Post-Conditions: none
+ ... Post-Conditions: none
PATCH Alarms
Check HTTP Response Status Code Is 405
@@ -91,7 +91,7 @@ DELETE Alarms - Method not implemented
... Reference: section 8.4.2.3.5 - SOL005 v2.4.1
... Config ID: Config_prod_NFVO
... Applicability: none
- ... Post-Conditions: none
+ ... Post-Conditions: alarm not deleted
DELETE Alarms
Check HTTP Response Status Code Is 405
diff --git a/SOL005/NSFaultManagement-API/IndividualAlarm.robot b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
index 86496e348a68249692ca61bd0fb26cf274369d7c..ced50ea15acd3f9dd7cb34d3134eeebc06c21e85 100644
--- a/SOL005/NSFaultManagement-API/IndividualAlarm.robot
+++ b/SOL005/NSFaultManagement-API/IndividualAlarm.robot
@@ -17,7 +17,7 @@ POST Individual Alarm - Method not implemented
... Reference: section 8.4.3.3.1 - SOL005 v2.4.1
... Config ID: Config_prod_NFVO
... Applicability: none
- ... Post-Conditions: none
+ ... Post-Conditions: alarm is not created
POST Individual Alarm
Check HTTP Response Status Code Is 405
@@ -81,7 +81,6 @@ PATCH Alarm - Conflict
... Config ID: Config_prod_NFVO
... Applicability: none
... Post-Conditions: none
- Depends On Test PATCH Alarm # If the previous test scceeded, it means that the alarm is in ackownledged state
PATCH Individual Alarm
Check HTTP Response Status Code Is 409
Check HTTP Response Body Json Schema Is ProblemDetails
@@ -95,8 +94,7 @@ PATCH Alarm - Precondition failed
... Reference: section 8.4.3.3.4 - SOL005 v2.4.1
... Config ID: Config_prod_NFVO
... Applicability: none
- ... Post-Conditions: The alarm resource is not modified
- Depends On Test PATCH Alarm # If the previous test scceeded, it means that Etag has been modified
+ ... Post-Conditions:
PATCH Individual Alarm Conflict
Check HTTP Response Status Code Is 412
Check HTTP Response Body Json Schema Is ProblemDetails
@@ -109,6 +107,6 @@ DELETE Individual Alarm - Method not implemented
... Reference: section 8.4.3.3.5 - SOL005 v2.4.1
... Config ID: Config_prod_NFVO
... Applicability: none
- ... Post-Conditions: none
+ ... Post-Conditions: alarm not deleted
DELETE Individual Alarm
Check HTTP Response Status Code Is 405
diff --git a/SOL005/NSFaultManagement-API/IndividualSubscription.robot b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
index 2cb82c1b47e058a37c12f5c61ea5b2ce9e58724d..a5e6ae56845041b5a9580d5176994e5c3caed19e 100644
--- a/SOL005/NSFaultManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSFaultManagement-API/IndividualSubscription.robot
@@ -5,10 +5,6 @@ Library JSONLibrary
Library JSONSchemaLibrary schemas/
Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}
-Documentation This resource represents an individual subscription for NFVO alarms.
-... The client can use this resource to read and to terminate a subscription to notifications related to NFVO fault management.
-Suite Setup Check Individual Subscription existance
-
*** Test Cases ***
Post Individual Subscription - Method not implemented
[Documentation] Test ID: 5.3.3.4.1
@@ -18,7 +14,7 @@ Post Individual Subscription - Method not implemented
... Reference: section 8.4.5.3.1 - SOL005 v2.4.1
... Config ID: Config_prod_NFVO
... Applicability: none
- ... Post-Conditions: none
+ ... Post-Conditions: subscription is not created
POST Individual Subscription
Check HTTP Response Status Code Is 405
@@ -67,7 +63,7 @@ DELETE an individual subscription
... Reference: section 8.4.5.3.5 - SOL005 v2.4.1
... Config ID: Config_prod_NFVO
... Applicability: none
- ... Post-Conditions: none
+ ... Post-Conditions: subscription is not deleted
DELETE Individual Subscription
Check HTTP Response Status Code Is 204
\ No newline at end of file
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index 20184a914547b9f1c75fd2090cdca819f6bf4a9b..5a6d06ed3482ea9a875b8304e6237abc5470d457 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -50,6 +50,10 @@ Check Alarm notification Endpoint has been delivered
Clean Endpoint
Log Cleaning the endpoint
Clear Requests ${callback_endpoint}
+
+Check Operation Occurrence Id
+ ${occId}= Get Value From Json ${response.headers} $..Location
+ Should Not Be Empty ${occId}
POST Alarms
log Trying to perform a POST. This method should not be implemented
@@ -185,6 +189,28 @@ POST Subscription
${outputResponse}= Output response
Set Global Variable @{response} ${outputResponse}
+Post Create subscription - DUPLICATION
+ Log Trying to create a subscription with an already created content
+ Pass Execution If ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0 NVFO is not permitting duplication. Skipping the test
+ Set Headers {"Accept": "${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
+ ${body}= Get File jsons/fmSubscriptionRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}
+ ${outputResponse}= Output response
+ Set Global Variable @{response} ${outputResponse}
+
+Post Create subscription - NO-DUPLICATION
+ Log Trying to create a subscription with an already created content
+ Pass Execution If ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1 NVFO permits duplication. Skipping the test
+ Set Headers {"Accept": "${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
+ ${body}= Get File jsons/fmSubscriptionRequest.json
+ Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}
+ ${outputResponse}= Output response
+ Set Global Variable @{response} ${outputResponse}
+
GET Subscriptions
Log Get the list of active subscriptions
Set Headers {"Accept": "${ACCEPT}"}
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 365bb1bec48a5262be90d481e55fb4445af6d2dd..8e5d4dd884cf91ad8338aec22ed3f8ee23bb0172 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -19,7 +19,7 @@ Create a new alarm subscription
... Post-Conditions: none
POST Subscription
Check HTTP Response Status Code Is 201
- Check HTTP Response Header Contains Location
+ Check Operation Occurrence Id
Check HTTP Response Body Json Schema Is FmSubscription
@@ -32,11 +32,9 @@ Create a new alarm subscription - DUPLICATION
... Config ID: Config_prod_NFVO
... Applicability: the NFVO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
... Post-Conditions: none
- Depends On Test Create a new subscription
- Pass Execution If ${NFVO_ALLOWS_DUPLICATE_SUBS} == 0 NVFO is not permitting duplication. Skipping the test
- POST Subscription
+ Post Create subscription - DUPLICATION
Check HTTP Response Status Code Is 201
- Check HTTP Response Header Contains Location
+ Check Operation Occurrence Id
Check HTTP Response Body Json Schema Is FmSubscription
Create a new alarm subscription - NO DUPLICATION
@@ -48,11 +46,9 @@ Create a new alarm subscription - NO DUPLICATION
... Config ID: Config_prod_NFVO
... Applicability: the NFVO decides to not create a duplicate subscription resource
... Post-Conditions: none
- Depends On Test Create a new subscription
- Pass Execution If ${NFVO_ALLOWS_DUPLICATE_SUBS} == 1 NFVO permits duplication. Skipping the test
- POST Subscription
+ Post Create subscription - NO DUPLICATION
Check HTTP Response Status Code Is 303
- Check HTTP Response Header Contains Location
+ Check Operation Occurrence Id
Check HTTP Response Body Json Schema Is FmSubscription
Retrieve a list of alarm subscriptions
@@ -120,12 +116,12 @@ PATCH subscriptions - Method not implemented
DELETE subscriptions - Method not implemented
[Documentation] Test ID: 5.3.3.3.9
- ... Test title:DELETE subscriptions - Method not implemented
+ ... Test title: DELETE subscriptions - Method not implemented
... Test objective: The objective is to test that DELETE method is not allowed to for Fault management subscriptions on NFV
... Pre-conditions: none
... Reference: section 8.4.4.3.5 - SOL005 v2.4.1
... Config ID: Config_prod_NFVO
... Applicability: none
- ... Post-Conditions: none
+ ... Post-Conditions: subscription is not deleted
DELETE Subscriptions
Check HTTP Response Status Code Is 405
\ No newline at end of file