From ec34c3d24719d27150aebcddde319a8ab0d5c26e Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Tue, 13 Oct 2020 15:44:13 +0500
Subject: [PATCH] removed subscription and fixed minor bugs
---
.../IndividualPmJob.robot | 19 +-
.../IndividualReport.robot | 41 +--
.../IndividualSubscription.robot | 99 ------
.../IndividualThreshold.robot | 19 +-
.../VNFPerformanceManagement-API/PMJobs.robot | 24 +-
.../Subscriptions.robot | 176 -----------
.../Thresholds.robot | 18 +-
.../VNFPerformanceManagementKeywords.robot | 295 +-----------------
.../environment/individualSubscription.txt | 6 -
.../environment/subscriptions.txt | 8 -
.../environment/variables.txt | 2 +-
.../jsons/subscriptions.json | 6 -
.../schemas/PmSubscription.schema.json | 142 ---------
.../schemas/PmSubscriptions.schema.json | 1 -
14 files changed, 34 insertions(+), 822 deletions(-)
delete mode 100644 SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
delete mode 100644 SOL002/VNFPerformanceManagement-API/Subscriptions.robot
delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt
delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt
delete mode 100644 SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json
delete mode 100644 SOL002/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json
delete mode 100644 SOL002/VNFPerformanceManagement-API/schemas/PmSubscriptions.schema.json
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index 61cd4bd0..eeced512 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -65,27 +65,25 @@ POST Individual VNF Performance Job - Method not implemented
[Documentation] Test ID: 6.3.3.2.5
... Test title: POST Individual VNF Performance Job - method not implemented
... Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Monitoring Job
- ... Pre-conditions: A VNF instance is instantiated
+ ... Pre-conditions: none
... Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: The VNF Performance Job is not created on the VNFM
+ ... Post-Conditions: none
Send Post request for individual VNF Performance Job
Check HTTP Response Status Code Is 405
- Check Postcondition VNF Performance Job is not Created
PUT Individual VNF Performance Job - Method not implemented
[Documentation] Test ID: 6.3.3.2.6
... Test title: PUT Individual VNF Performance Job - method not implemented
... Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance Monitoring Job
- ... Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
+ ... Pre-conditions: none
... Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: The VNF Performance Job is not modified by the operation
+ ... Post-Conditions: none
Send Put request for individual VNF Performance Job
Check HTTP Response Status Code Is 405
- Check Postcondition VNF Performance Job is Unmodified (Implicit)
PATCH Individual VNF Performance Job
[Documentation] Test ID: 6.3.3.2.7
@@ -175,15 +173,6 @@ Send Patch request for individual VNF Performance Job
${output}= Output response
Set Suite Variable ${response} ${output}
-Check Postcondition VNF Performance Job is not Created
- Log Trying to get a new Pm Job
- Set Headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- Check HTTP Response Status Code Is 404
-
Check Postcondition VNF Performance Job is Unmodified (Implicit)
Log Check Postcondition VNF PM job is not modified
GET individual VNF Performance Job
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index f4240287..7570068d 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -30,58 +30,55 @@ Get Individual Performance Report with invalid resource endpoint
... Post-Conditions: none
Get Individual Performance Report with invalid resource endpoint
Check HTTP Response Status Code Is 404
+ Check HTTP Response Body Json Schema Is ProblemDetails
POST Individual Performance Report - Method not implemented
[Documentation] Test ID: 6.3.3.3.3
... Test title: POST Individual Performance Report - Method not implemented
... Test objective: The objective is to test that POST method is not allowed to create a new VNF performance report within a monitoring job
- ... Pre-conditions: A VNF instance is instantiated.
+ ... Pre-conditions: none
... Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: The VNF performance report is not created on the VNFM
+ ... Post-Conditions: none
Send Post request for Individual Performance Report
Check HTTP Response Status Code Is 405
- Check Postcondition VNF Individual Performance Report is not Created
PUT Individual Performance Report - Method not implemented
[Documentation] Test ID: 6.3.3.3.4
... Test title: PUT Individual Performance Report - Method not implemented
... Test objective: The objective is to test that PUT method is not allowed to update an existing VNF performance report within a monitoring job
- ... Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
+ ... Pre-conditions: none
... Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: The VNF performance report is not modified by the operation
+ ... Post-Conditions: none
Send Put request for Individual Performance Report
Check HTTP Response Status Code Is 405
- Check Postcondition VNF Individual Performance Report is Unmodified (Implicit)
PATCH Individual Performance Report - Method not implemented
[Documentation] Test ID: 6.3.3.3.5
... Test title: PATCH Individual Performance Report - Method not implemented
... Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF performance report within a monitoring job
- ... Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
+ ... Pre-conditions: none
... Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: The VNF performance report is not modified by the operation
+ ... Post-Conditions: none
Send Patch request for Individual Performance Report
Check HTTP Response Status Code Is 405
- Check Postcondition VNF Individual Performance Report is Unmodified (Implicit)
DELETE Individual Performance Report - Method not implemented
[Documentation] Test ID: 6.3.3.3.6
... Test title: DELETE Individual Performance Report - Method not implemented
... Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF performance report within a monitoring job
- ... Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
+ ... Pre-conditions: none
... Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: The VNF performance report is not deleted by the operation
+ ... Post-Conditions: none
Send Delete request for Individual Performance Report
Check HTTP Response Status Code Is 405
- Check Postcondition VNF Individual Performance Report Exists
*** Keywords ***
Get Individual Performance Report
@@ -134,26 +131,6 @@ Send Delete request for Individual Performance Report
${output}= Output response
Set Suite Variable ${response} ${output}
-Check Postcondition VNF Individual Performance Report Exists
- Log Checking that report still exists
- Get Individual Performance Report
-
-Check Postcondition VNF Individual Performance Report is not Created
- Log Trying to get a new report
- Set Headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- Check HTTP Response Status Code Is 404
-
-Check Postcondition VNF Individual Performance Report is Unmodified (Implicit)
- Log Check Postcondition VNF PM job is not modified
- Get Individual Performance Report
- Log Check Response matches original VNF report
- ${report}= evaluate json.loads('''${response['body']}''') json
- Should Be Equal ${origResponse['body']['entries'][0]['objectInstanceId']} ${report['entries'][0]['objectInstanceId']}
-
Check HTTP Response Status Code Is
[Arguments] ${expected_status}
${status}= Convert To Integer ${expected_status}
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
deleted file mode 100644
index 4f34fd5c..00000000
--- a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
+++ /dev/null
@@ -1,99 +0,0 @@
-*** Settings ***
-Library JSONSchemaLibrary schemas/
-Resource environment/variables.txt # Generic Parameters
-Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} ssl_verify=false
-Library OperatingSystem
-Library JSONLibrary
-Resource environment/individualSubscription.txt
-Resource VNFPerformanceManagementKeywords.robot
-
-*** Test Cases ***
-GET Individual VNF Performance Subscription
- [Documentation] Test ID: 6.3.3.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: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.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 VNF Performance Subscription with invalid resource identifier
- [Documentation] Test ID: 6.3.3.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: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.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
-
-DELETE Individual VNF Performance Subscription
- [Documentation] Test ID: 6.3.3.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: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.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
-
-DELETE Individual VNF Performance Subscription with invalid resource identifier
- [Documentation] Test ID: 6.3.3.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: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.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
-
-POST Individual VNF Performance Subscription - Method not implemented
- [Documentation] Test ID: 6.3.3.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: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.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
-
-PUT Individual VNF Performance Subscription - Method not implemented
- [Documentation] Test ID: 6.3.3.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: Clause 6.4.8.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.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: 6.3.3.7.7
- ... 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: Clause 6.4.8.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.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)
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 429727d0..003817da 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -32,6 +32,7 @@ GET Individual Threshold with invalid resource identifier
... Post-Conditions: none
GET individual VNF Performance Threshold with invalid resource identifier
Check HTTP Response Status Code Is 404
+ Check HTTP Response Body Json Schema Is ProblemDetails
DELETE Individual Threshold
[Documentation] Test ID: 6.3.3.5.3
@@ -57,32 +58,31 @@ DELETE Individual Threshold with invalid resource identifier
... Post-Conditions: none
Send Delete request for individual VNF Performance Threshold with invalid resource identifier
Check HTTP Response Status Code Is 404
+ Check HTTP Response Body Json Schema Is ProblemDetails
POST Individual Threshold - Method not implemented
[Documentation] Test ID: 6.3.3.5.5
... Test title: POST Individual Threshold - Method not implemented
... Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Threshold
- ... Pre-conditions: A VNF instance is instantiated
+ ... Pre-conditions: none
... Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: The VNF Performance Threshold is not created on the VNFM
Send Post request for individual VNF Performance Threshold
Check HTTP Response Status Code Is 405
- Check Postcondition VNF Performance Threshold is not Created
PUT Individual Threshold - Method not implemented
[Documentation] Test ID: 6.3.3.5.6
... Test title: PUT Individual Threshold - Method not implemented
... Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance threshold
- ... Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+ ... Pre-conditions: none
... Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: The VNF Performance Threshold is not modified by the operation
+ ... Post-Conditions: none
Send Put request for individual VNF Performance Threshold
Check HTTP Response Status Code Is 405
- Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
PATCH Individual Threshold
[Documentation] Test ID: 6.3.3.5.7
@@ -177,15 +177,6 @@ Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
${threshold}= evaluate json.loads('''${response['body']}''') json
Should Be Equal ${origresponse['body']['id']} ${threshold.id}
Should Be Equal ${origresponse['body']['criteria']} ${threshold.criteria}
-
-Check Postcondition VNF Performance Threshold is not Created
- Log Trying to get a new Threshold
- Set Headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- Check HTTP Response Status Code Is 404
Check Postcondition VNF Performance Threshold is Deleted
Log Check Postcondition Threshold is deleted
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 84283d72..62747fa3 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -20,7 +20,6 @@ GET all VNF Performance Monitoring Jobs
GET all VNF Performance Monitoring Jobs
Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is PmJobs
- Check HTTP Response Body Does Not Contain reports
GET VNF Performance Monitoring Jobs with attribute-based filter
[Documentation] Test ID: 6.3.3.1.2
@@ -136,7 +135,7 @@ PUT all VNF Performance Monitoring Jobs - Method not implemented
[Documentation] Test ID: 6.3.3.1.10
... Test title: PUT all VNF Performance Monitoring Jobs - Method not implemented
... Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Monitoring Jobs
- ... Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
+ ... Pre-conditions: none
... Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VE
... Applicability: none
@@ -144,11 +143,11 @@ PUT all VNF Performance Monitoring Jobs - Method not implemented
Send PUT Request for all VNF Performance Monitoring Jobs
Check HTTP Response Status Code Is 405
-PATCH all VNF Performance Monitoring Jobs - (Method not implemented)
+PATCH all VNF Performance Monitoring Jobs - Method not implemented
[Documentation] Test ID: 6.3.3.1.11
... Test title: PATCH all VNF Performance Monitoring Jobs - Method not implemented
... Test objective: The objective is to test that PATCH method is not allowed to update VNF Performance Monitoring Jobs
- ... Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
+ ... Pre-conditions: none
... Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VE
... Applicability: none
@@ -160,14 +159,13 @@ DELETE all VNF Performance Monitoring Jobs - Method not implemented
[Documentation] Test ID: 6.3.3.1.12
... Test title: DELETE all VNF Performance Monitoring Jobs - Method not implemented
... Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Monitoring Jobs
- ... Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
+ ... Pre-conditions: none
... Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VE
... Applicability: none
... Post-Conditions: none
Send PATCH Request for all VNF Performance Monitoring Jobs
Check HTTP Response Status Code Is 405
- Check Postcondition VNF Performance Monitoring Jobs Exist
GET VNF Performance Monitoring Jobs to get Paged Response
[Documentation] Test ID: 6.3.3.1.13
@@ -180,7 +178,7 @@ GET VNF Performance Monitoring Jobs to get Paged Response
... Post-Conditions: none
GET all VNF Performance Monitoring Jobs
Check HTTP Response Status Code Is 200
- Check LINK in Header
+ Check HTTP Response Header Contain Link
GET VNF Performance Monitoring Jobs for Bad Request Response too big
[Documentation] Test ID: 6.3.3.1.14
@@ -316,10 +314,6 @@ Send DELETE Request for all VNF Performance Monitoring Jobs
PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
${output}= Output response
Set Suite Variable ${response} ${output}
-
-Check Postcondition VNF Performance Monitoring Jobs Exist
- Log Checking that Pm Job still exists
- GET all VNF Performance Monitoring Jobs
Check Postcondition PmJob Exists
Log Checking that Pm Job exists
@@ -374,12 +368,6 @@ Check HTTP Response Body Matches filter
Log Checking that attribute-based filter is matched
@{words} = Split String ${POS_FILTER} ,${SEPERATOR}
Should Be Equal As Strings ${response['body'][0]['objectInstanceIds']} @{words}[1]
-
-Check HTTP Response Body Does Not Contain reports
- Log Checking that field element is missing
- ${reports}= Get Value From Json ${response['body']} $..reports
- Should Be Empty ${reports}
- Log Reports element is empty as expected
Check HTTP Response Status Code Is
[Arguments] ${expected_status}
@@ -402,6 +390,6 @@ Check HTTP Response Body Json Schema Is
Validate Json ${schema} ${response['body']}
Log Json Schema Validation OK
-Check LINK in Header
+Check HTTP Response Header Contain Link
${linkURL}= Get Value From Json ${response['headers']} $..Link
Should Not Be Empty ${linkURL}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
deleted file mode 100644
index 2ba4751c..00000000
--- a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
+++ /dev/null
@@ -1,176 +0,0 @@
-*** Settings ***
-Library JSONSchemaLibrary schemas/
-Resource environment/variables.txt # Generic Parameters
-Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} ssl_verify=false
-Library OperatingSystem
-Library JSONLibrary
-Resource VNFPerformanceManagementKeywords.robot
-Resource environment/subscriptions.txt
-Library MockServerLibrary
-Library Process
-Suite Setup Create Sessions
-Suite Teardown Terminate All Processes kill=true
-
-*** Test Cases ***
-GET all VNF Performance Subscriptions
- [Documentation] Test ID: 6.3.3.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: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.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 Subscriptions with attribute-based filter
- [Documentation] Test ID: 6.3.3.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: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.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 Subscriptions with invalid attribute-based filter
- [Documentation] Test ID: 6.3.3.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: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.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 Subscriptions with invalid resource endpoint
- [Documentation] Test ID: 6.3.3.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: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.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: 6.3.3.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: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.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
- Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
- Check Postcondition VNF Performance Subscription Is Set
-
-
-Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
- [Tags] no-duplicated-subs
- [Documentation] Test ID: 6.3.3.6.6
- ... Test title: Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
- ... Test objective: The objective is to test the attempt of a creation of a duplicated VNF performance subscription and check that no new subscription is created by the VNFM and 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: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: The VNFM does not support the creation of duplicated subscriptions
- ... Post-Conditions: The existing VNF performance subscription returned is available in the VNFM
- 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 Postcondition Subscription Resource Returned in Location Header Is Available
-
-Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
- [Tags] duplicated-subs
- [Documentation] Test ID: 6.3.3.6.7
- ... Test title: Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
- ... 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: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.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 PmSubscription Attributes Values Match the Issued Subscription
- Check Postcondition VNF Performance Subscription Is Set
-
-PUT VNF Performance Subscriptions - Method not implemented
- [Documentation] Test ID: 6.3.3.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: Clause 6.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.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
-
-PATCH VNF Performance Subscriptions - Method not implemented
- [Documentation] Test ID: 6.3.3.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: Clause 6.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.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: 6.3.3.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: Clause 6.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: none
- ... Post-Conditions: The VNF performance subscriptions 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
-
-GET VNF Performance Subscriptions to get Paged Response
- [Documentation] Test ID: 6.3.3.6.11
- ... Test title: GET VNF Performance Subscriptions to get Paged Response
- ... Test objective: The objective is to test the retrieval of all VNF performance subscriptions to get Paged Response
- ... Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
- ... Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: none
- ... Post-Conditions: none
- Get all VNF Performance Subscriptions
- Check HTTP Response Status Code Is 200
- Check LINK in Header
-
-GET VNF Performance Management Subscriptions for Bad Request Response too big
- [Documentation] Test ID: 6.3.3.6.12
- ... Test title: GET VNF Performance Management Subscriptions for Bad Request Response too big
- ... Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails when response is too big, 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: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.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
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index c3804b28..6dead1e5 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -46,6 +46,7 @@ GET Performance Thresholds with invalid attribute-based filter
... Post-Conditions: none
GET Performance Thresholds with invalid attribute-based filter
Check HTTP Response Status Code Is 404
+ Check HTTP Response Body Json Schema Is ProblemDetails
GET Performance Thresholds with invalid resource endpoint
[Documentation] Test ID: 6.3.3.4.4
@@ -79,7 +80,7 @@ PUT Performance Thresholds - Method not implemented
[Documentation] Test ID: 6.3.3.4.6
... Test title: PUT Performance Thresholds - Method not implemented
... Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Thresholds
- ... Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNF.
+ ... Pre-conditions: none
... Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VNFM
... Applicability: none
@@ -91,7 +92,7 @@ PATCH Performance Thresholds - Method not implemented
[Documentation] Test ID: 6.3.3.4.7
... Test title: PATCH Performance Thresholds - Method not implemented
... Test objective: The objective is to test that PATCH method is not allowed to modify VNF Performance Thresholds
- ... Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+ ... Pre-conditions: none
... Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VNFM
... Applicability: none
@@ -103,14 +104,13 @@ DELETE Performance Thresholds - Method not implemented
[Documentation] Test ID: 6.3.3.4.8
... Test title: DELETE Performance Thresholds - Method not implemented
... Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Thresholds
- ... Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+ ... Pre-conditions: none
... Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
... Config ID: Config_prod_VNFM
... Applicability: none
- ... Post-Conditions: The VNF performance thresholds are not deleted by the failed operation
+ ... Post-Conditions: none
Send DELETE Request for all Performance Thresholds
Check HTTP Response Status Code Is 405
- Check Postcondition Thresholds Exist
GET Performance Thresholds with Paged Response
[Documentation] Test ID: 6.3.3.4.9
@@ -123,7 +123,7 @@ GET Performance Thresholds with Paged Response
... Post-Conditions: none
GET all Performance Thresholds
Check HTTP Response Status Code Is 200
- Check LINK in Header
+ Check HTTP Response Header Contain Link
GET Performance Thresholds for Bad Request Response too big
[Documentation] Test ID: 6.3.3.4.10
@@ -206,10 +206,6 @@ Send DELETE Request for all Performance Thresholds
DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
${output}= Output response
Set Suite Variable ${response} ${output}
-
-Check Postcondition Thresholds Exist
- Log Checking that Thresholds still exists
- GET all Performance Thresholds
Check Postcondition Threshold Exists
Log Checking that Threshold exists
@@ -243,7 +239,7 @@ Check HTTP Response Body Json Schema Is
Validate Json ${schema} ${response['body']}
Log Json Schema Validation OK
-Check LINK in Header
+Check HTTP Response Header Contain Link
${linkURL}= Get Value From Json ${response['headers']} $..Link
Should Not Be Empty ${linkURL}
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index 9a6c90f9..394c9728 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -13,264 +13,12 @@ Library JSONSchemaLibrary schemas/
Library Process
*** Keywords ***
-Get all VNF Performance Subscriptions
- [Documentation] The client can use this method to query the list of active subscriptions to Performance management notifications
- ... subscribed by the client.
- ... This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
- ... request and response data structures, and response codes.
- Set headers {"Accept": "application/json"}
- Set headers {"Content-Type": "application/json"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- # 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 PmSubscriptions.schema.json ${result}
- # Log Validated PmSubscription schema
-
-
- Get VNF Performance Subscriptions with attribute-based filters
- [Documentation] The client can use this method to query the list of active subscriptions to Performance management notifications
- ... subscribed by the client.
- ... This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.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}/${apiMajorVersion}/subscriptions?${filter_ok}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- # 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 PmSubscriptions.schema.json ${result}
- # Log Validated PmSubscription schema
-
-
-
-Get VNF Performance Subscriptions with invalid attribute-based filters
- [Documentation] The client can use this method to query the list of active subscriptions to Performance management notifications
- ... subscribed by the client.
- ... This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.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}/${apiMajorVersion}/subscriptions?${filter_ko}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- # Integer response status 400
- # Log Received a 400 Bad Request 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 VNF Performance Subscriptions with invalid resource endpoint
- [Documentation] The client can use this method to query the list of active subscriptions to Performance management notifications
- ... subscribed by the client.
- ... This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.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}/${apiMajorVersion}/subscription
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- # 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
-
-
-
-Send Post Request for VNF Performance Subscription
- [Documentation] The POST method creates a new subscription.
- ... This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
- ... request and response data structures, and response codes.
- ... Creation of two subscription resources with the same callbackURI and the same filter can result in performance
- ... degradation and will provide duplicates of notifications to the NFVO, and might make sense only in very rare use cases.
- ... Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with the
- ... same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may decide
- ... to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code referencing
- ... the existing subscription resource with the same filter and callbackUri).
- Set headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- ${template}= Get File jsons/subscriptions.json
- ${body_request}= Format String ${template} callback_uri=${callback_uri} subscribe=${subscribe}
- POST ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions ${body_request}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- Run Keyword If ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
- ... Check Notification Endpoint
- # Integer response status 201
- # Log Received a 201 Created 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
- # Log Trying to validate the Location header
- # ${headers}= Output response headers
- # Should Contain ${headers} Location
-
-
-Send Post Request for Duplicated VNF Performance Subscription
- [Documentation] The POST method creates a new subscription.
- ... This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
- ... request and response data structures, and response codes.
- ... Creation of two subscription resources with the same callbackURI and the same filter can result in performance
- ... degradation and will provide duplicates of notifications to the NFVO, and might make sense only in very rare use cases.
- ... Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with the
- ... same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may decide
- ... to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code referencing
- ... the existing subscription resource with the same filter and callbackUri).
- Set headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- ${template}= Get File jsons/subscriptions.json
- ${body_request}= Format String ${template} callback_uri=${callback_uri} subscribe=${subscribe}
- POST ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions ${body_request}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- # Integer response status 303
- # Log Received a 303 See other as expected
- # ${contentType}= Output response headers Content-Type
- # Should Contain ${contentType} application/json
- # ${result}= Output response body
- # Should Be Empty ${result}
- # Log Body is empty
- # Log Trying to validate the Location header
- # ${headers}= Output response headers
- # Should Contain ${headers} Location
-
-
-
-Send Put Request for VNF Performance Subscriptions
- [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}/${apiMajorVersion}/subscriptions
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- # Integer response status 405
- # Log Received 405 Method not implemented as expected
-
-Send Patch Request for VNF Performance Subscriptions
- [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}/${apiMajorVersion}/subscriptions
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- # Integer response status 405
- # Log Received 405 Method not implemented as expected
-
-Send Delete Request for VNF Performance Subscriptions
- [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}"}
- DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- # 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}/${apiMajorVersion}/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}/${apiMajorVersion}/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}/${apiMajorVersion}/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}/${apiMajorVersion}/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}/${apiMajorVersion}/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}/${apiMajorVersion}/subscriptions/${subscriptionId}
- ${origOutput}= Output response
- Set Suite Variable ${origResponse} ${origOutput}
- PUT ${apiRoot}/${apiName}/${apiMajorVersion}/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}/${apiMajorVersion}/subscriptions/${subscriptionId}
- ${origOutput}= Output response
- Set Suite Variable ${origResponse} ${origOutput}
- PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/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 As Strings ${origResponse['body']['id']} ${subscription.id}
- Should Be Equal As Strings ${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}/${apiMajorVersion}/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 As Strings ${response['body']['id']} ${subscriptionId}
- Log Subscription identifier as expected
Check HTTP Response Status Code Is
[Arguments] ${expected_status}
Should Be Equal As Strings ${response['status']} ${expected_status}
Log Status code validated
-
-
Check HTTP Response Body Json Schema Is
[Arguments] ${input}
Should Contain ${response['headers']['Content-Type']} application/json
@@ -278,48 +26,9 @@ Check HTTP Response Body Json Schema Is
Validate Json ${schema} ${response['body']}
Log Json Schema Validation OK
-
Check HTTP Response Body Is Empty
Should Be Empty ${response['body']}
- Log No json schema is provided. Validation OK
-
-
-Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
- Log Check Response includes VNF Performance Management according to filter
- Should Be Equal As Strings ${response['body'][0]['callbackUri']} ${callbackUri_Sub}
-
-Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
- Log Check Response matches subscription
- ${body}= Get File jsons/subscriptions.json
- ${subscription}= evaluate json.loads('''${body}''') json
- Should Be Equal As Strings ${response['body']['callbackUri']} ${subscription['callbackUri']}
-
-Check Postcondition VNF Performance Subscription Is Set
- Log Check Postcondition subscription exist
- Set Headers {"Accept": "${ACCEPT_JSON}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- Check HTTP Response Status Code Is 200
-
-Check Postcondition Subscription Resource Returned in Location Header Is Available
- Log Going to check postcondition
- 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
- ${body}= Get File jsons/subscriptions.json
- ${subscription}= evaluate json.loads('''${body}''') json
- Should Be Equal ${result['callbackUri']} ${subscription['callbackUri']}
- Log Validated Issued subscription is same as original
-
-Check Postcondition VNF Performance Subscriptions Exists
- Log Checking that subscriptions exists
- Get all VNF Performance Subscriptions
+ Log No json schema is provided. Validation OK
Check HTTP Response Header Contains
[Arguments] ${CONTENT_TYPE}
@@ -350,6 +59,6 @@ Check Notification Endpoint
Wait Until Keyword Succeeds ${total_polling_time} ${polling_interval} Verify Mock Expectation ${notification_request}
Clear Requests ${callback_endpoint}
-Check LINK in Header
+Check HTTP Response Header Contain Link
${linkURL}= Get Value From Json ${response['headers']} $..Link
Should Not Be Empty ${linkURL}
diff --git a/SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt b/SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt
deleted file mode 100644
index 921749ff..00000000
--- a/SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${subscriptionId} 17563e75-0e14-4bd7-94b4-6bbb869c79aa
-${erroneousSubscriptionId} erroneousSubscriptionId
-${newSubscriptionId} newSubsciptionId
-${response} httpresponse
-${origResponse} httpresponse
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt b/SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt
deleted file mode 100644
index c4904574..00000000
--- a/SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Variables ***
-${callbackUri_Sub} http://172.22.1.7:9091/vnfpm/subscriptions
-${filter_ok} callbackUri=${callbackUri_Sub}
-${filter_ko} erroneousFilter=erroneous
-${total_polling_time} 2 min
-${polling_interval} 10 sec
-${response} httpresponse
-
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index 0772cedc..c6f2f9a8 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
@@ -4,7 +4,7 @@ ${VNFM_PORT} 8080 # Listening port of the VNFM
${VNFM_SCHEMA} https
${apiRoot} /
-${apiMajorVersion} v1
+${apiMajorVersion} v2
${apiName} vnfpm
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json b/SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json
deleted file mode 100644
index 7072ba32..00000000
--- a/SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{{
- "callbackUri": "{callback_uri}{subscribe}",
- "filter": {{
- "notificationTypes": ["ThresholdCrossedNotification"]
- }}
-}}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json
deleted file mode 100644
index c9ad0513..00000000
--- a/SOL002/VNFPerformanceManagement-API/schemas/PmSubscription.schema.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
- "description": "This type represents a subscription.\n",
- "type": "object",
- "required": [
- "id",
- "callbackUri",
- "_links"
- ],
- "properties": {
- "id": {
- "description": "An identifier with the intention of being globally unique.\n",
- "type": "string"
- },
- "filter": {
- "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events.\n",
- "type": "object",
- "properties": {
- "vnfInstanceSubscriptionFilter": {
- "description": "This type represents subscription filter criteria to match VNF instances.\n",
- "type": "object",
- "properties": {
- "vnfdIds": {
- "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "description": "An identifier with the intention of being globally unique.\n",
- "type": "string"
- }
- },
- "vnfProductsFromProviders": {
- "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "type": "object",
- "required": [
- "vnfProvider"
- ],
- "properties": {
- "vnfProvider": {
- "description": "Name of the VNF provider to match.\n",
- "type": "string"
- },
- "vnfProducts": {
- "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",
- "type": "array",
- "items": {
- "type": "object",
- "required": [
- "vnfProductName"
- ],
- "properties": {
- "vnfProductName": {
- "description": "Name of the VNF product to match.\n",
- "type": "string"
- },
- "versions": {
- "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",
- "type": "array",
- "items": {
- "type": "object",
- "required": [
- "vnfSoftwareVersion"
- ],
- "properties": {
- "vnfSoftwareVersion": {
- "description": "A version.\n",
- "type": "string"
- },
- "vnfdVersions": {
- "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
- "type": "array",
- "items": {
- "description": "A version.\n",
- "type": "string"
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- },
- "vnfInstanceIds": {
- "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "description": "An identifier with the intention of being globally unique.\n",
- "type": "string"
- }
- },
- "vnfInstanceNames": {
- "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "type": "string"
- }
- }
- }
- },
- "notificationTypes": {
- "description": "Match particular notification types. Permitted values: * ThresholdCrossedNotification * PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
- "type": "string",
- "enum": [
- "ThresholdCrossedNotification",
- "PerformanceInformationAvailableNotification"
- ]
- }
- }
- },
- "callbackUri": {
- "description": "The URI of the endpoint to send the notification to.\n",
- "type": "string",
- "format": "url"
- },
- "_links": {
- "description": "Links to resources related to this resource.\n",
- "type": "object",
- "required": [
- "self"
- ],
- "properties": {
- "self": {
- "description": "This type represents a link to a resource.\n",
- "type": "object",
- "required": [
- "href"
- ],
- "properties": {
- "href": {
- "description": "URI of the referenced resource.\n",
- "type": "string",
- "format": "url"
- }
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/PmSubscriptions.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/PmSubscriptions.schema.json
deleted file mode 100644
index fefb142d..00000000
--- a/SOL002/VNFPerformanceManagement-API/schemas/PmSubscriptions.schema.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "type": "array", "items": { "description": "This type represents a subscription.\n", "type": "object", "required": [ "id", "callbackUri", "_links" ], "properties": { "id": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" }, "filter": { "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events.\n", "type": "object", "properties": { "vnfInstanceSubscriptionFilter": { "description": "This type represents subscription filter criteria to match VNF instances.\n", "type": "object", "properties": { "vnfdIds": { "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", "type": "array", "items": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" } }, "vnfProductsFromProviders": { "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", "type": "array", "items": { "type": "object", "required": [ "vnfProvider" ], "properties": { "vnfProvider": { "description": "Name of the VNF provider to match.\n", "type": "string" }, "vnfProducts": { "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n", "type": "array", "items": { "type": "object", "required": [ "vnfProductName" ], "properties": { "vnfProductName": { "description": "Name of the VNF product to match.\n", "type": "string" }, "versions": { "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n", "type": "array", "items": { "type": "object", "required": [ "vnfSoftwareVersion" ], "properties": { "vnfSoftwareVersion": { "description": "A version.\n", "type": "string" }, "vnfdVersions": { "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n", "type": "array", "items": { "description": "A version.\n", "type": "string" } } } } } } } } } } }, "vnfInstanceIds": { "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", "type": "array", "items": { "description": "An identifier with the intention of being globally unique.\n", "type": "string" } }, "vnfInstanceNames": { "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n", "type": "array", "items": { "type": "string" } } } }, "notificationTypes": { "description": "Match particular notification types. Permitted values: * ThresholdCrossedNotification * PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n", "type": "string", "enum": [ "ThresholdCrossedNotification", "PerformanceInformationAvailableNotification" ] } } }, "callbackUri": { "description": "The URI of the endpoint to send the notification to.\n", "type": "string", "format": "url" }, "_links": { "description": "Links to resources related to this resource.\n", "type": "object", "required": [ "self" ], "properties": { "self": { "description": "This type represents a link to a resource.\n", "type": "object", "required": [ "href" ], "properties": { "href": { "description": "URI of the referenced resource.\n", "type": "string", "format": "url" } } } } } } }}
\ No newline at end of file
--
GitLab