From a2ea192d4c229b938aeb5d2cf4b4927613ce7c30 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Mon, 12 Oct 2020 15:53:06 +0500
Subject: [PATCH] added majorAPIVersion
---
.../ApiVersion.robot | 10 ++---
.../IndividualPmJob.robot | 18 ++++-----
.../IndividualReport.robot | 18 ++++-----
.../IndividualThreshold.robot | 18 ++++-----
.../VNFPerformanceManagement-API/PMJobs.robot | 28 ++++++-------
.../Thresholds.robot | 18 ++++-----
.../VNFPerformanceManagementKeywords.robot | 40 +++++++++----------
.../environment/variables.txt | 2 +-
8 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
index bb484bf3..5832a7af 100644
--- a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
@@ -167,35 +167,35 @@ DELETE API Version
POST API Version with apiMajorVersion
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/v1/api_version
+ Post ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
GET API Version with apiMajorVersion
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Get ${apiRoot}/${apiName}/v1/api_version
+ Get ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
PUT API Version with apiMajorVersion
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Put ${apiRoot}/${apiName}/v1/api_version
+ Put ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
PATCH API Version with apiMajorVersion
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Patch ${apiRoot}/${apiName}/v1/api_version
+ Patch ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
DELETE API Version with apiMajorVersion
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Delete ${apiRoot}/${apiName}/v1/api_version
+ Delete ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index 5a84a174..61cd4bd0 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -119,7 +119,7 @@ GET individual VNF Performance Job
Log Trying to get a Pm Job present in the NFVO Catalogue
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -127,7 +127,7 @@ GET individual VNF Performance Job with invalid resource identifier
Log Trying to perform a negative get, using erroneous PM Job identifier
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${erroneousPmJobId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -135,7 +135,7 @@ Send Delete request for individual VNF Performance Job
Log Trying to delete an existing PM Job
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+ DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -143,7 +143,7 @@ Send Delete request for individual VNF Performance Job with invalid resource ide
Log Trying to perform a negative delete, using erroneous PM Job identifier
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${erroneousPmJobId}
+ DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -151,7 +151,7 @@ Send Post request for individual VNF Performance Job
Log Trying to perform a POST (method should not be implemented)
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- POST ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${newPmJobId}
+ POST ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -159,10 +159,10 @@ Send Put request for individual VNF Performance Job
Log Trying to perform a POST (method should not be implemented)
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
${origOutput}= Output response
Set Suite Variable ${origResponse} ${origOutput}
- PUT ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+ PUT ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -171,7 +171,7 @@ Send Patch request for individual VNF Performance Job
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
${body}= Get File jsons/PMJobModification.json
- PATCH ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId} ${body}
+ PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId} ${body}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -179,7 +179,7 @@ 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}/${apiVersion}/pm_jobs/${newPmJobId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
${output}= Output response
Set Suite Variable ${response} ${output}
Check HTTP Response Status Code Is 404
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index d6ba168b..f4240287 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -88,7 +88,7 @@ Get Individual Performance Report
Log Trying to get a performance report present in the VNFM
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -96,41 +96,41 @@ Get Individual Performance Report with invalid resource endpoint
Log Trying to get a performance report with invalid resource endpoint
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Post request for Individual Performance Report
Log Trying to create new performance report
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- POST ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
+ POST ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Put request for Individual Performance Report
Log Trying to update performance report
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
${origOutput}= Output response
Set Suite Variable ${origResponse} ${origOutput}
- PUT ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+ PUT ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Patch request for Individual Performance Report
Log Trying to update performance report
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
${origOutput}= Output response
Set Suite Variable ${origResponse} ${origOutput}
- PATCH ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+ PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Delete request for Individual Performance Report
Log Trying to delete performance report
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
+ DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -142,7 +142,7 @@ 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}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
${output}= Output response
Set Suite Variable ${response} ${output}
Check HTTP Response Status Code Is 404
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index d68f0961..429727d0 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -116,7 +116,7 @@ GET Individual VNF Performance Threshold
Log Trying to get a Threhsold present in the VNFM
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -124,28 +124,28 @@ GET individual VNF Performance Threshold with invalid resource identifier
Log Trying to get a Threhsold with invalid resource endpoint
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Delete request for individual VNF Performance Threshold
Log Trying to delete a Threhsold in the VNFM
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+ DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Delete request for individual VNF Performance Threshold with invalid resource identifier
Log Trying to delete a Threhsold in the VNFM with invalid id
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
+ DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Post request for individual VNF Performance Threshold
Log Trying to create new threshold
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- POST ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
+ POST ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -153,10 +153,10 @@ Send Put request for individual VNF Performance Threshold
Log Trying to PUT threshold
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
${origOutput}= Output response
Set Suite Variable ${origResponse} ${origOutput}
- PUT ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+ PUT ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -166,7 +166,7 @@ Send Patch request for individual VNF Performance Threshold
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
${body}= Get File jsons/ThresholdModification.json
- PATCH ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
+ PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -182,7 +182,7 @@ 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}/${apiVersion}/thresholds/${newThresholdId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
Check HTTP Response Status Code Is 404
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 27a85112..84283d72 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -212,7 +212,7 @@ GET all VNF Performance Monitoring Jobs
Log Trying to get all PM Jobs present in the VNFM
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -220,7 +220,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter
Log Trying to get all PM Jobs present in the VNFM, using filter params
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?${POS_FILTER}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${POS_FILTER}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -228,7 +228,7 @@ GET VNF Performance Monitoring Jobs with all_fields attribute selector
Log Trying to get all PM Jobs present in the VNFM, using 'all_fields' filter
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?all_fields
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?all_fields
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -236,7 +236,7 @@ GET VNF Performance Monitoring Jobs with exclude_default attribute selector
Log Trying to get all VNF Packages present in the VNFM, using filter params
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?exclude_default
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?exclude_default
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -245,7 +245,7 @@ GET VNF Performance Monitoring Jobs with fields attribute selector
Pass Execution If ${FIELD_USAGE} == 0 Skipping test as VNFM is not supporting 'fields'
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -253,7 +253,7 @@ GET VNF Performance Monitoring Jobs with exclude_default and fields attribute se
Log Trying to get all VNF Packages present in the VNFM, using filter params
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}&exclude_default
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}&exclude_default
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -262,7 +262,7 @@ GET VNF Performance Monitoring Jobs with exclude_fields attribute selector
Pass Execution If ${FIELD_USAGE} == 0 Skipping test as VNFM is not supporting 'fields'
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -270,7 +270,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
Log Trying to get all PM Jobs present in the VNFM, using an erroneous filter param
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?${NEG_FILTER}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${NEG_FILTER}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -278,7 +278,7 @@ GET VNF Performance Monitoring Jobs with invalid resource endpoint
Log Trying to perform a GET on a erroneous URI
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_job # wrong URI /pm_job instead of /pm_jobs
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_job # wrong URI /pm_job instead of /pm_jobs
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -289,7 +289,7 @@ Send Post Request Create new VNF Performance Monitoring Job
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
${template}= Get File jsons/CreatePmJobRequest.json
${body}= Format String ${template} objectInstanceIds=${objectInstanceIds} callback_uri=${callback_uri}
- POST ${apiRoot}/${apiName}/${apiVersion}/pm_jobs ${body}
+ POST ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs ${body}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -297,7 +297,7 @@ Send PUT Request for all VNF Performance Monitoring Jobs
Log Trying to perform a PUT. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PUT ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+ PUT ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -305,7 +305,7 @@ Send PATCH Request for all VNF Performance Monitoring Jobs
Log Trying to perform a PUT. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PATCH ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+ PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -313,7 +313,7 @@ Send DELETE Request for all VNF Performance Monitoring Jobs
Log Trying to perform a PUT. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PATCH ${apiRoot}/${apiName}/${apiVersion}/pm_jobs
+ PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -325,7 +325,7 @@ Check Postcondition PmJob Exists
Log Checking that Pm Job exists
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${response['body']['id']}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${response['body']['id']}
${output}= Output response
Set Suite Variable ${response} ${output}
Check HTTP Response Status Code Is 200
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index a0fb710e..c3804b28 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -143,7 +143,7 @@ GET all Performance Thresholds
Log Trying to get all thresholds present in the VNFM
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/thresholds
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -151,7 +151,7 @@ GET Performance Thresholds with attribute-based filter
Log Trying to get thresholds present in the VNFM with filter
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_OK}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_OK}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -159,7 +159,7 @@ GET Performance Thresholds with invalid attribute-based filter
Log Trying to get thresholds present in the VNFM with invalid filter
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_KO}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_KO}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -167,7 +167,7 @@ GET VNF Performance Thresholds with invalid resource endpoint
Log Trying to get thresholds present in the VNFM with invalid resource endpoint
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/threshold
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/threshold
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -178,7 +178,7 @@ Send Post Request Create new Performance Threshold
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
${template}= Get File jsons/CreateThresholdRequest.json
${body}= Format String ${template} objectInstanceIds=${objectInstanceIds} callback_uri=${callback_uri}
- POST ${apiRoot}/${apiName}/${apiVersion}/thresholds ${body}
+ POST ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds ${body}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -187,7 +187,7 @@ Send PUT Request for all Performance Thresholds
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Set Headers {"Accept": "${ACCEPT_JSON}"}
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
- PUT ${apiRoot}/${apiName}/${apiVersion}/thresholds
+ PUT ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -196,14 +196,14 @@ Send PATCH Request for all Performance Thresholds
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Set Headers {"Accept": "${ACCEPT_JSON}"}
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
- PATCH ${apiRoot}/${apiName}/${apiVersion}/thresholds
+ PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
${output}= Output response
Set Suite Variable ${response} ${output}
Send DELETE Request for all Performance Thresholds
Log DELETE THresholds
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiVersion}/thresholds
+ DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -215,7 +215,7 @@ Check Postcondition Threshold Exists
Log Checking that Threshold exists
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/thresholds/${response['body']['id']}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${response['body']['id']}
${output}= Output response
Set Suite Variable ${response} ${output}
Check HTTP Response Status Code Is 200
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index 80ac22c2..9a6c90f9 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -21,7 +21,7 @@ Get all VNF Performance Subscriptions
Set headers {"Accept": "application/json"}
Set headers {"Content-Type": "application/json"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
${output}= Output response
Set Suite Variable ${response} ${output}
# Integer response status 200
@@ -40,7 +40,7 @@ Get all VNF Performance Subscriptions
... 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?${filter_ok}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
${output}= Output response
Set Suite Variable ${response} ${output}
# Integer response status 200
@@ -60,7 +60,7 @@ Get VNF Performance Subscriptions with invalid attribute-based filters
... 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?${filter_ko}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
${output}= Output response
Set Suite Variable ${response} ${output}
# Integer response status 400
@@ -79,7 +79,7 @@ Get VNF Performance Subscriptions with invalid resource endpoint
... 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}/subscription
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
${output}= Output response
Set Suite Variable ${response} ${output}
# Integer response status 404
@@ -107,7 +107,7 @@ Send Post Request for VNF Performance Subscription
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}/${apiVersion}/subscriptions ${body_request}
+ POST ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions ${body_request}
${output}= Output response
Set Suite Variable ${response} ${output}
Run Keyword If ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
@@ -139,7 +139,7 @@ Send Post Request for Duplicated VNF Performance Subscription
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}/${apiVersion}/subscriptions ${body_request}
+ POST ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions ${body_request}
${output}= Output response
Set Suite Variable ${response} ${output}
# Integer response status 303
@@ -159,7 +159,7 @@ 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}/${apiVersion}/subscriptions
+ PUT ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
${output}= Output response
Set Suite Variable ${response} ${output}
# Integer response status 405
@@ -169,7 +169,7 @@ 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}/${apiVersion}/subscriptions
+ PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
${output}= Output response
Set Suite Variable ${response} ${output}
# Integer response status 405
@@ -179,7 +179,7 @@ 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}/${apiVersion}/subscriptions
+ DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
${output}= Output response
Set Suite Variable ${response} ${output}
# Integer response status 405
@@ -188,52 +188,52 @@ Send Delete Request for VNF Performance Subscriptions
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}
+ 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}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+ 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}/${apiVersion}/subscriptions/${subscriptionId}
+ 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}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+ 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}/${apiVersion}/subscriptions/${newSubscriptionId}
+ 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}/${apiVersion}/subscriptions/${subscriptionId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
${origOutput}= Output response
Set Suite Variable ${origResponse} ${origOutput}
- PUT ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+ 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}/${apiVersion}/subscriptions/${subscriptionId}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
${origOutput}= Output response
Set Suite Variable ${origResponse} ${origOutput}
- PATCH ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+ PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -249,7 +249,7 @@ 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}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
${output}= Output response
Set Suite Variable ${response} ${output}
Check HTTP Response Status Code Is 404
@@ -297,7 +297,7 @@ Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subsc
Check Postcondition VNF Performance Subscription Is Set
Log Check Postcondition subscription exist
Set Headers {"Accept": "${ACCEPT_JSON}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
${output}= Output response
Set Suite Variable ${response} ${output}
Check HTTP Response Status Code Is 200
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index 65cab3fb..0772cedc 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} /
-${apiVersion} v1
+${apiMajorVersion} v1
${apiName} vnfpm
--
GitLab