From cbe2eeb62c64e3589f0b5d8f64d0925a8c675a99 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Thu, 17 Jan 2019 12:40:12 +0100
Subject: [PATCH] Bug fix
---
.../VNFPackageArtifacts.robot | 20 +++++++++----------
.../IndividualPmJob.robot | 8 ++++++--
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
index fae947c5..5a549a0c 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -9,7 +9,7 @@ Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}
GET VNF Package Artifact
Log Trying to get a VNF Package Artifact
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}
+ GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}
Integer response status 200
Log Received a 200 OK as expected
${contentType}= Output response headers Content-Type
@@ -20,7 +20,7 @@ GET VNF Package Artifact - Range
Pass Execution If ${NFVO_RANGE_OK} == 0 Skipping this test as NFVO is not able to handle partial Requests.
Set Headers {"Range": "${range}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}
+ GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}
Integer response status 206
Log Received 206 Partial Content as expected.
${headers}= Output response headers
@@ -32,7 +32,7 @@ GET VNF Package Artifact - NFVO No RANGE
Pass Execution If ${NFVO_RANGE_OK} == 1 Skipping this test as NFVO is able to handle partial Requests.
Set Headers {"Range": "${range}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}
+ GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}
Integer response status 200
Log Received 200 OK as expected. The content is all available on this request. RANGE request has been ignored.
@@ -41,7 +41,7 @@ GET VNF Package Artifact - Negative Range
Pass Execution If ${NFVO_RANGE_OK} == 0 Skipping this test as NFVO is not able to handle partial Requests.
Set Headers {"Range": "${range}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}
+ GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}
Integer response status 416
Log Received 416 Range not satisfiable as expected.
${contentType}= Output response headers Content-Type
@@ -55,7 +55,7 @@ GET VNF Package Artifact - Negative Range
GET VNF Package Artifact- Negative (Not Found)
Log Trying to perform a negative get, using an erroneous package ID
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/{artifactPath}
+ GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}
Integer response status 404
Log Received 404 Not Found as expected
${contentType}= Output response headers Content-Type
@@ -69,7 +69,7 @@ GET VNF Package Artifact- Negative (Not Found)
GET VNF Package Artifact - Negative (onboardingState issue)
Log Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/{artifactPath}
+ GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}
Integer response status 409
Log Received 409 Conflict as expected
${contentType}= Output response headers Content-Type
@@ -83,27 +83,27 @@ GET VNF Package Artifact - Negative (onboardingState issue)
POST VNF Package Artifact - (Method not implemented)
Log Trying to perform a POST (method should not be implemented)
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- POST ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}
+ POST ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}
Integer response status 405
Log Received 405 Method not implemented as expected
PUT VNF Package Artifact - (Method not implemented)
Log Trying to perform a PUT. This method should not be implemented
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PUT ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}
+ PUT ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}
Integer response status 405
Log Received 405 Method not implemented as expected
PATCH VNF Package Artifact - (Method not implemented)
Log Trying to perform a PATCH. This method should not be implemented
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PATCH ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}
+ PATCH ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}
Integer response status 405
Log Received 405 Method not implemented as expected
DELETE VNF Package Artifact - (Method not implemented)
Log Trying to perform a DELETE. This method should not be implemented
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}
+ DELETE ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}
Integer response status 405
Log Received 405 Method not implemented as expected
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
index ad9fb364..40ea45ee 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -49,8 +49,12 @@ DELETE Individual PM Job - Negative (Not Found)
Run Keyword If ${VNFM_AUTH_USAGE} == 1 Set Headers {"Authorization": "${VNFM_AUTHENTICATION}"}
DELETE ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${erroneousPmJobId}
Integer response status 404
- Log Received 204 No Content as expected
-
+ Log Received 404 Not Found as expected
+ Log Trying to validate ProblemDetails
+ ${problemDetails}= Output response body
+ ${json}= evaluate json.loads('''${problemDetails}''') json
+ Validate Json ProblemDetails.schema.json ${json}
+ Log Validation OK
POST Individual PM Job - (Method not implemented)
Log Trying to perform a POST (method should not be implemented)
Set Headers {"Accept": "${ACCEPT_JSON}"}
--
GitLab