diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 72da429a13168d5b31aa4b435780890c37150a04..5fcf4a6838b338d974759081bff0af276c2bed3f 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -101,7 +101,7 @@ PATCH VNF Indicator Subscriptions - Method not implemented
DELETE VNF Indicator Subscriptions - Method not implemented
[Documentation] Test ID 6.3.2.4.8
... Test title: DELETE VNF Indicator Subscriptions - Method not implemented
- ... Test objective: The objective is to test that PUT method is not allowed to delete VNF indicator subscriptions
+ ... Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicator subscriptions
... Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
... Reference: section 8.4.5.3.5 - SOL002 v2.4.1
... Config ID: Config_prod_VE
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot
index da90422b5a5fa678b2544ff4a83577aae8dcc2b6..887454e8d3c8161a4e3fdd9e0740e54b560b30f0 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot
@@ -7,74 +7,96 @@ Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
Library OperatingSystem
Library JSONLibrary
Resource environment/individualSubscription.txt
+Resource VNFPerformanceManagementKeywords.robot
*** Test Cases ***
-GET Individual Subscription
- [Documentation] The client can use this method for reading an individual subscription about Performance management notifications
- ... subscribed by the client.
- ... This method shall follow the provisions specified in the tables 6.4.8.3.2-1 and 6.4.8.3.2-2 for URI query parameters,
- ... request and response data structures, and response codes.
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
- Integer response status 200
- Log Received a 200 OK as expected
- ${contentType}= Output response headers Content-Type
- Should Contain ${contentType} application/json
- ${result}= Output response body
- Validate Json PmSubscription.schema.json ${result}
- Log Validated PmSubscription schema
+GET Individual VNF Performance Subscription
+ [Documentation] Test ID: 7.3.4.7.1
+ ... Test title: GET Individual VNF Performance Subscription
+ ... Test objective: The objective is to test the retrieval of individual VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.8.3.2 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ Get Individual VNF Performance Subscription
+ Check HTTP Response Status Code Is 200
+ Check HTTP Response Body Json Schema Is PmSubscription
+ Check HTTP Response Body Subscription Identifier matches the requested Subscription
-GET Individual Subscription - Negative (Not Found)
- [Documentation] The client can use this method for reading an individual subscription about Performance management notifications
- ... subscribed by the client.
- ... This method shall follow the provisions specified in the tables 6.4.8.3.2-1 and 6.4.8.3.2-2 for URI query parameters,
- ... request and response data structures, and response codes.
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
- Integer response status 404
- Log Received a 404 Not found as expected
- ${contentType}= Output response headers Content-Type
- Should Contain ${contentType} application/json
- ${result}= Output response body
- Validate Json ProblemDetails.schema.json ${result}
- Log Validated ProblemDetails schema
+GET Individual VNF Performance Subscription with invalid resource identifier
+ [Documentation] Test ID: 7.3.4.7.2
+ ... Test title: GET Individual VNF Performance Subscription with invalid resource identifier
+ ... Test objective: The objective is to test that the retrieval of an individual VNF performance subscription fails when using an invalid resource identifier
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.8.3.2 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ GET individual VNF Performance Subscription with invalid resource identifier
+ Check HTTP Response Status Code Is 404
-POST Individual Subscription - (Method not implemented)
- [Documentation] This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
- ... Not Allowed" response as defined in clause 4.3.5.4.
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
- Integer response status 405
- Log Received 405 Method not implemented as expected
+DELETE Individual VNF Performance Subscription
+ [Documentation] Test ID: 7.3.4.7.3
+ ... Test title: DELETE Individual VNF Performance Subscription
+ ... Test objective: The objective is to test the deletion of an individual VNF performance subscription
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.8.3.5 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: The VNF Performance Subscription is not available anymore in the VNFM
+ Send Delete request for individual VNF Performance Subscription
+ Check HTTP Response Status Code Is 204
+ Check Postcondition VNF Performance Subscription is Deleted
-PUT Individual Subscription - (Method not implemented)
- [Documentation] This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
- ... Not Allowed" response as defined in clause 4.3.5.4.
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- PUT ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
- Integer response status 405
- Log Received 405 Method not implemented as expected
+DELETE Individual VNF Performance Subscription with invalid resource identifier
+ [Documentation] Test ID: 7.3.4.7.4
+ ... Test title: DELETE Individual VNF Performance Subscription with invalid resource identifier
+ ... Test objective: The objective is to test that the deletion of an individual VNF performance subscription fails when using an invalid resource identifier
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.8.3.5 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ Send Delete request for individual VNF Performance Subscription with invalid resource identifier
+ Check HTTP Response Status Code Is 404
-PATCH Individual Subscription - (Method not implemented)
- [Documentation] This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
- ... Not Allowed" response as defined in clause 4.3.5.4.
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- PATCH ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
- Integer response status 405
- Log Received 405 Method not implemented as expected
+POST Individual VNF Performance Subscription - Method not implemented
+ [Documentation] Test ID: 7.3.4.7.5
+ ... Test title: POST Individual VNF Performance Subscription - Method not implemented
+ ... Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Subscription
+ ... Pre-conditions: A VNF instance is instantiated
+ ... Reference: section 6.4.8.3.1 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: The VNF Performance Subscription is not created on the VNFM
+ Send Post request for individual VNF Performance Subscription
+ Check HTTP Response Status Code Is 405
+ Check Postcondition VNF Performance Subscription is not Created
-DELETE Individual Subscription - (Method not implemented)
- [Documentation] This method terminates an individual subscription.
- ... This method shall follow the provisions specified in the tables 6.4.8.3.5-1 and 6.4.8.3.5-2 for URI query parameters,
- ... request and response data structures, and response codes.
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
- Integer response status 204
- Log Received a 204 No Content as expected
- ${body}= Output response body
- Should Be Empty ${body}
- Log Body of the response is empty
+PUT Individual VNF Performance Subscription - Method not implemented
+ [Documentation] Test ID: 7.3.4.7.6
+ ... Test title: PUT Individual VNF Performance Subscription - Method not implemented
+ ... Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance subscription
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.8.3.3 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: The VNF Performance subscription is not modified by the operation
+ Send Put request for individual VNF Performance Threshold
+ Check HTTP Response Status Code Is 405
+ Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
+
+PATCH Individual VNF Performance Subscription - Method not implemented
+ [Documentation] Test ID: 7.3.4.7.6
+ ... Test title: PATCH Individual VNF Performance Subscription - Method not implemented
+ ... Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Performance subscription
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.8.3.4 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: The VNF Performance subscription is not modified by the operation
+ Send Patch request for individual VNF Performance Threshold
+ Check HTTP Response Status Code Is 405
+ Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
diff --git a/SOL003/VNFPerformanceManagement-API/Subscriptions.robot b/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
index bffe0edcc67b7bc33787509cd6e09d668bd542a7..8c0678433a322286b0ce18cfc3f01fc0397de610 100644
--- a/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
+++ b/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
@@ -14,31 +14,67 @@ Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
*** Test Cases ***
-GET all VNF Performance Subscriptions
+GET all VNF Performance Subscriptions
+ [Documentation] Test ID: 7.3.4.6.1
+ ... Test title: GET all VNF Performance Subscriptions
+ ... Test objective: The objective is to test the retrieval of all VNF performance subscriptions and perform a JSON schema validation of the returned subscriptions data structure
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.7.3.2 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
Get all VNF Performance Subscriptions
Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is PmSubscriptions
-
-GET VNF Performance Subscription with attribute-based filter
+GET VNF Performance Subscriptions with attribute-based filter
+ [Documentation] Test ID: 7.3.4.6.2
+ ... Test title: GET VNF Performance Subscriptions with attribute-based filter
+ ... Test objective: The objective is to test the retrieval of VNF performance subscriptions using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.7.3.2 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
Get VNF Performance Subscriptions with attribute-based filters
Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is PmSubscriptions
Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
-
-GET VNF Performance Management Subscription with invalid attribute-based filter
+GET VNF Performance Management Subscriptions with invalid attribute-based filter
+ [Documentation] Test ID: 7.3.4.6.3
+ ... Test title: GET VNF Performance Management Subscriptions with invalid attribute-based filter
+ ... Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response.
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.7.3.2 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
Get VNF Performance Subscriptions with invalid attribute-based filters
Check HTTP Response Status Code Is 400
Check HTTP Response Body Json Schema Is ProblemDetails
-
-GET VNF Performance Subscription with invalid resource endpoint
+GET VNF Performance Subscriptions with invalid resource endpoint
+ [Documentation] Test ID: 7.3.4.6.4
+ ... Test title: GET VNF Performance Subscriptions with invalid resource endpoint
+ ... Test objective: The objective is to test that the retrieval of all VNF performance subscriptions fails when using invalid resource endpoint.
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.7.3.2 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
Get VNF Performance Subscriptions with invalid resource endpoint
Check HTTP Response Status Code Is 404
-
Create new VNF Performance subscription
+ [Documentation] Test ID 7.3.4.6.5
+ ... Test title: Create new VNF Performance subscription
+ ... Test objective: The objective is to test the creation of a new VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
+ ... Pre-conditions: A VNF instance is instantiated.
+ ... Reference: section 6.4.7.3.1 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: The VNF performance subscription is successfully set and it matches the issued subscription
Send Post Request for VNF Performance Subscription
Check HTTP Response Status Code Is 201
Check HTTP Response Body Json Schema Is PmSubscription
@@ -46,32 +82,69 @@ Create new VNF Performance subscription
Check Postcondition VNF Performance Subscription Is Set
-Create duplicated VNF Performance subscription with duplication handler
+Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
+ [Documentation] Test ID 7.3.4.6.6
+ ... Test title: Create new VNF Performance subscription
+ ... Test objective: The objective is to test the creation of a duplicated VNF performance subscription, check that no new subscription is created, and check that a link to the original subscription is returned
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.7.3.1 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: The VNFM does not support the creation of duplicated subscriptions
+ ... Post-Conditions: none
Send Post Request for Duplicated VNF Performance Subscription
Check HTTP Response Status Code Is 303
Check HTTP Response Body Is Empty
Check HTTP Response Header Contains Location
+ Check HTTP Response Location Header Resource URI
-
-Create duplicated VNF Performance subscription without duplication handler
+Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
+ [Documentation] Test ID 7.3.4.6.7
+ ... Test title: Create new VNF Performance subscription
+ ... Test objective: The objective is to test the creation of a duplicated VNF performance subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.7.3.1 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: The VNFM supports the creation of duplicated subscriptions
+ ... Post-Conditions: The duplicated VNF performance subscription is successfully set and it matches the issued subscription
Send Post Request for Duplicated VNF Performance Subscription
Check HTTP Response Status Code Is 201
Check HTTP Response Body Json Schema Is PmSubscription
Check HTTP Response Body Matches the Subscription
Check Postcondition VNF Performance Subscription Is Set
-
PUT VNF Performance Subscriptions - Method not implemented
+ [Documentation] Test ID 7.3.4.6.8
+ ... Test title: PUT VNF Performance Subscriptions - Method not implemented
+ ... Test objective: The objective is to test that PUT method is not allowed to modify VNF performance subscriptions
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.7.3.3 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
Send Put Request for VNF Performance Subscriptions
- Check HTTP Response Status Code Is 405
-
+ Check HTTP Response Status Code Is 405
PATCH VNF Performance Subscriptions - Method not implemented
+ [Documentation] Test ID 7.3.4.6.9
+ ... Test title: PATCH VNF Performance Subscriptions - Method not implemented
+ ... Test objective: The objective is to test that PATCH method is not allowed to update VNF performance subscriptions
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.7.3.4 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
Send Patch Request for VNF Performance Subscriptions
Check HTTP Response Status Code Is 405
-
DELETE VNF Performance Subscriptions - Method not implemented
+ [Documentation] Test ID 7.3.4.6.10
+ ... Test title: DELETE VNF Performance Subscriptions - Method not implemented
+ ... Test objective: The objective is to test that DELETE method is not allowed to delete VNF performance subscriptions
+ ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+ ... Reference: section 6.4.7.3.5 - SOL003 v2.4.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: The VNF performance thresholds are not deleted by the failed operation
Send Delete Request for VNF Performance Subscriptions
Check HTTP Response Status Code Is 405
-
+ Check Postcondition VNF Performance Subscriptions Exists
diff --git a/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index da972bba0e1e923a8d6222b226d8ba4d4189b8a9..0a648bf0549163c3471749b1497040344fe0ac64 100644
--- a/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -1,6 +1,7 @@
*** Settings ***
Resource environment/variables.txt
Resource environment/subscriptions.txt
+Resource environment/individualSubscription.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} ssl_verify=false
Library MockServerLibrary
Library OperatingSystem
@@ -181,8 +182,85 @@ Send Delete Request for VNF Performance Subscriptions
# Integer response status 405
# Log Received 405 Method not implemented as expected
+Get Individual VNF Performance Subscription
+ Set headers {"Accept": "${ACCEPT_JSON}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+ ${output}= Output response
+ Set Suite Variable ${response} ${output}
+
+GET individual VNF Performance Subscription with invalid resource identifier
+ Set headers {"Accept": "${ACCEPT_JSON}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+ ${output}= Output response
+ Set Suite Variable ${response} ${output}
+Send Delete request for individual VNF Performance Subscription
+ Set headers {"Accept": "${ACCEPT_JSON}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
+ DELETE ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+ ${output}= Output response
+ Set Suite Variable ${response} ${output}
+Send Delete request for individual VNF Performance Subscription with invalid resource identifier
+ Log Trying to delete a subscription in the VNFM with invalid id
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
+ DELETE ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+ ${output}= Output response
+ Set Suite Variable @{response} ${output}
+
+Send Post request for individual VNF Performance Subscription
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
+ POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
+ ${output}= Output response
+ Set Suite Variable @{response} ${output}
+
+Send Put request for individual VNF Performance Threshold
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+ ${origOutput}= Output response
+ Set Suite Variable ${origResponse} ${origOutput}
+ PUT ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+ ${output}= Output response
+ Set Suite Variable @{response} ${output}
+
+Send Patch request for individual VNF Performance Threshold
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+ ${origOutput}= Output response
+ Set Suite Variable ${origResponse} ${origOutput}
+ PATCH ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+ ${output}= Output response
+ Set Suite Variable @{response} ${output}
+
+Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
+ Log Check postconidtion subscription not modified
+ GET individual VNF Performance Subscription
+ Log Check Response matches original VNF Threshold
+ ${subscription}= evaluate json.loads('''${response['body']}''') json
+ Should Be Equal ${origResponse['body']['id']} ${subscription.id}
+ Should Be Equal ${origResponse['body']['callbackUri']} ${subscription.callbackUri}
+
+Check Postcondition VNF Performance Subscription is not Created
+ Log Trying to get a new subscription
+ Set Headers {"Accept": "${ACCEPT_JSON}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
+ ${output}= Output response
+ Set Suite Variable @{response} ${output}
+ Check HTTP Response Status Code Is 404
+
+Check Postcondition VNF Performance Subscription is Deleted
+ Log Check Postcondition Subscription is deleted
+ GET individual VNF Performance Subscription
+ Check HTTP Response Status Code Is 404
+
+Check HTTP Response Body Subscription Identifier matches the requested Subscription
+ Log Trying to check response ID
+ Should Be Equal ${response['body']['id']} ${subscriptionId}
+ Log Subscription identifier as expected
+
Check HTTP Response Status Code Is
[Arguments] ${expected_status}
Should Be Equal ${response['status']} ${expected_status}
@@ -214,8 +292,6 @@ Check HTTP Response Body Matches the Subscription
${subscription}= evaluate json.loads('''${body}''') json
Should Be Equal ${response['body']['callbackUri']} ${subscription['callbackUri']}
-
-
Check Postcondition VNF Performance Subscription Is Set
Log Check Postcondition subscription exist
Log Trying to get the subscription
@@ -226,19 +302,31 @@ Check Postcondition VNF Performance Subscription Is Set
Set Suite Variable ${response} ${output}
Check HTTP Response Status Code Is 200
+Check Postcondition VNF Performance Subscriptions Exists
+ Log Checking that subscriptions exists
+ Get all VNF Performance Subscriptions
Check HTTP Response Header Contains
[Arguments] ${CONTENT_TYPE}
Should Contain ${response.headers} ${CONTENT_TYPE}
Log Header is present
+Check HTTP Response Location Header Resource URI
+ Log Going to check
+ GET ${response.headers['Location']}
+ Integer response status 200
+ Log Received a 200 OK as expected
+ ${contentType}= Output response headers Content-Type
+ Should Contain ${contentType} application/json
+ ${result}= Output response body
+ Validate Json PmSubscription.schema.json ${result}
+ Log Validated PmSubscription schema
Create Sessions
Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port}
-
Check Notification Endpoint
&{notification_request}= Create Mock Request Matcher GET ${callback_endpoint}
&{notification_response}= Create Mock Response headers="Content-Type: application/json" status_code=204
diff --git a/SOL003/VNFPerformanceManagement-API/environment/individualSubscription.txt b/SOL003/VNFPerformanceManagement-API/environment/individualSubscription.txt
index ef9de0386219d835fbf6d8d8c961f589f9855f9c..f840e96fe1867666be9aec6ad9f73d777516dd16 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/individualSubscription.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/individualSubscription.txt
@@ -1,3 +1,6 @@
*** Variables ***
${subscriptionId} 17563e75-0e14-4bd7-94b4-6bbb869c79aa
${erroneousSubscriptionId} erroneousSubscriptionId
+${newSubscriptionId} newSubsciptionId
+${response} httpresponse
+${origResponse} httpresponse
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/environment/subscriptions.txt b/SOL003/VNFPerformanceManagement-API/environment/subscriptions.txt
index 78528ad3188d9ea4f12a0908699e0daa481c663b..cba92a539be0f1d2a6c07315d18ea3acf15acd8e 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/subscriptions.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/subscriptions.txt
@@ -4,3 +4,4 @@ ${filter_ok} callbackUri=${callbackUri}
${filter_ko} erroneousFilter=erroneous
${total_polling_time} 2 min
${polling_interval} 10 sec
+${response} httpresponse
diff --git a/SOL003/VNFPerformanceManagement-API/environment/variables.txt b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
index 297e6a4a9bf5d9e1bc2cda86ccd1663974d1fb70..b7929b06a1965a1953419476e85129f21eb6e6de 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
@@ -19,10 +19,6 @@ ${apiRoot} /
${apiVersion} v1
${apiName} vnfpm
-
-${response}
-
-
${callback_port} 9091
${callback_uri} http://localhost:${callback_port}
${callback_endpoint} /vnfpm/subscriptions