From 08134a3f8911b6b750763872d441261ea961aafd Mon Sep 17 00:00:00 2001 From: Elian Kraja Date: Tue, 26 Feb 2019 12:33:31 +0100 Subject: [PATCH] Bug fix on SOL005 --- .../IndividualNSDescriptor.robot | 33 +++++----- .../IndividualPnfDescriptor.robot | 15 +++-- .../IndividualSubscription.robot | 14 ++--- SOL005/NSDManagement-API/NSDContent.robot | 17 +++-- .../NSDManagementNotification.robot | 4 +- SOL005/NSDManagement-API/NSDescriptors.robot | 43 ++++++------- SOL005/NSDManagement-API/PNFDContent.robot | 16 ++--- SOL005/NSDManagement-API/PNFDescriptors.robot | 43 ++++++------- SOL005/NSDManagement-API/Subscriptions.robot | 29 ++++----- .../NSDManagement-API/environment/generic.txt | 17 ----- .../environment/variables.txt | 22 ++++++- .../IndividualSubscription.robot | 22 +++---- .../IndividualVNFPackage.robot | 19 +++--- .../Notifications.robot | 4 +- .../Subscriptions.robot | 29 ++++----- .../VNFDInIndividualVNFPackage.robot | 15 ++--- .../VNFPackageArtifacts.robot | 15 ++--- .../VNFPackageContent.robot | 17 +++-- .../VNFPackageContentViaURI.robot | 9 ++- .../VNFPackages.robot | 62 ++++++++----------- .../environment/generic.txt | 22 ------- .../environment/variables.txt | 22 ++++++- .../IndividualPmJob.robot | 14 ++--- .../IndividualReport.robot | 12 ++-- .../IndividualSubscription.robot | 11 ++-- .../IndividualThreshold.robot | 14 ++--- .../Notifications.robot | 5 +- .../VNFPerformanceManagement-API/PMJobs.robot | 50 +++++++-------- .../Subscriptions.robot | 23 +++---- .../Thresholds.robot | 20 +++--- .../{generic.txt => variables.txt} | 7 +-- 31 files changed, 299 insertions(+), 346 deletions(-) delete mode 100644 SOL005/NSDManagement-API/environment/generic.txt delete mode 100644 SOL005/VNFPackageManagement-API/environment/generic.txt rename SOL005/VNFPerformanceManagement-API/environment/{generic.txt => variables.txt} (68%) diff --git a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot index 3216a694..a5b5ce59 100644 --- a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot +++ b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation This clause defines all the resources and methods provided by the Individual NS descriptor interface. \ Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/nsDescriptors.txt # Specific nsDescriptors Parameters Library OperatingSystem Library JSONLibrary @@ -24,8 +24,7 @@ GET Single Network Service Descriptor Log Validation of Content-Type : OK Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdInfo.schema.json ${json} + Validate Json NsdInfo.schema.json ${result} Log Validation OK @@ -40,8 +39,7 @@ GET Single Network Service Descriptor (Negative: Not found) Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -62,28 +60,26 @@ PATCH Single Network Service Descriptor - (Disabling a nsdInfo) Log Trying to perform a PATCH. As prerequisite the nsdInfo shall be in enabled operational state Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - ${body}= Get File json/NsdInfoModificationDisable.json + ${body}= Get File jsons/NsdInfoModificationDisable.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PATCH ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId} ${body} Integer response status 200 Log Received 200 OK as expected ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdInfoModification.schema.json ${json} + Validate Json NsdInfoModification.schema.json ${result} Log Validation of NsdInfoModifications OK PATCH Single Network Service Descriptor - (Enabling an previously disabled nsdInfo) Log Trying to perform a PATCH. As prerequisite the nsdInfo shall be in disabled operational state Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - ${body}= Get File json/NsdInfoModificationEnable.json + ${body}= Get File jsons/NsdInfoModificationEnable.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PATCH ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId} ${body} Integer response status 200 Log Received 200 OK as expected ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdInfoModification.schema.json ${json} + Validate Json NsdInfoModification.schema.json ${result} Log Validation of NsdInfoModifications OK @@ -91,7 +87,7 @@ PATCH Single Network Service Descriptor - NEGATIVE (Trying to enable an previous Log Trying to perform a PATCH. As prerequisite the nsdInfo shall be in enabled operational state Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - ${body}= Get File json/NsdInfoModificationEnable.json + ${body}= Get File jsons/NsdInfoModificationEnable.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PATCH ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${enabledNsdInfoId} ${body} Integer response status 409 @@ -100,8 +96,7 @@ PATCH Single Network Service Descriptor - NEGATIVE (Trying to enable an previous Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -110,7 +105,7 @@ PATCH Single Network Service Descriptor - NEGATIVE (Trying to enable an previous Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} Set Headers {"If-Match": "${Etag}"} - ${body}= Get File json/NsdInfoModificationEnable.json + ${body}= Get File jsons/NsdInfoModificationEnable.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PATCH ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${modifiedNsdInfoId} ${body} Integer response status 412 @@ -122,8 +117,7 @@ PATCH Single Network Service Descriptor - NEGATIVE (Trying to enable an previous Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -155,12 +149,12 @@ DELETE Single Network Service Descriptor (Negative: Trying to delete an enabled Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST Single Network Service Descriptor (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a POST. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} @@ -172,6 +166,7 @@ POST Single Network Service Descriptor (Method not implemented) PUT Single Network Service Descriptor (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}"} diff --git a/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot b/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot index 78f914c8..2cbb1a99 100644 --- a/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot +++ b/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation This clause defines all the resources and methods provided by the Iindividual PNF descriptor interface. \ Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/pnfDescriptors.txt # Specific nsDescriptors Parameters Library JSONLibrary Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} @@ -22,8 +22,7 @@ GET Single PNF Descriptor Log Validation of Content-Type : OK Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdInfo.schema.json ${json} + Validate Json NsdInfo.schema.json ${result} Log Validation OK @@ -38,8 +37,7 @@ GET Single PNF Descriptor (Negative: Not found) Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -50,14 +48,13 @@ PATCH Single PNF Descriptor - (Disabling a nsdInfo) Log The PATCH method modifies the user defined data of an individual PNF descriptor resource. Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - ${body}= Get File json/PnfdInfoModification.json + ${body}= Get File jsons/PnfdInfoModification.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PATCH ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId} ${body} Integer response status 200 Log Received 200 OK as expected ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PnfdInfoModification.schema.json ${json} + Validate Json PnfdInfoModification.schema.json ${result} Log Validation of PnfdInfoModification OK @@ -71,6 +68,7 @@ DELETE Single PNF Descriptor POST Single PNF Descriptor (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a POST. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} @@ -82,6 +80,7 @@ POST Single PNF Descriptor (Method not implemented) PUT Single PNF Descriptor (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}"} diff --git a/SOL005/NSDManagement-API/IndividualSubscription.robot b/SOL005/NSDManagement-API/IndividualSubscription.robot index 392a3716..a454f189 100644 --- a/SOL005/NSDManagement-API/IndividualSubscription.robot +++ b/SOL005/NSDManagement-API/IndividualSubscription.robot @@ -1,6 +1,6 @@ *** Settings *** Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/individualSubscription.txt Library OperatingSystem Library JSONLibrary @@ -17,8 +17,7 @@ GET Individual Subscription ${contentType}= Output response headers Content-Type Should Contain ${contentType} ${CONTENT_TYPE_JSON} ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdmSubscription.schema.json ${json} + Validate Json NsdmSubscription.schema.json ${result} Log Validated NsdmSubscription schema GET Subscription - Negative (Not Found) @@ -32,8 +31,7 @@ GET Subscription - Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK DELETE Subscription @@ -62,11 +60,11 @@ DELETE Subscription - Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK PUT Subscription - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}"} @@ -75,6 +73,7 @@ PUT Subscription - (Method not implemented) Log Received 405 Method not implemented as expected PATCH Subscription - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} @@ -83,6 +82,7 @@ PATCH Subscription - (Method not implemented) Log Received 405 Method not implemented as expected POST Subscription - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a POST. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} diff --git a/SOL005/NSDManagement-API/NSDContent.robot b/SOL005/NSDManagement-API/NSDContent.robot index b3ff9a68..8a7c0b38 100644 --- a/SOL005/NSDManagement-API/NSDContent.robot +++ b/SOL005/NSDManagement-API/NSDContent.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation This clause defines the content of the individual NS descriptor, i.e. NSD content Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/nsDescriptors.txt # Specific nsDescriptors Parameters Library JSONLibrary Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} @@ -78,8 +78,7 @@ GET NSD Content - Negative Range Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -96,8 +95,7 @@ GET NSD Content- Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -112,8 +110,7 @@ GET NSD Content - Negative (onboardingState issue) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -189,13 +186,13 @@ PUT a NSD Content - Negative. Nsd in CREATING state Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST a NSD Content (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PUT. This method should not be implemented Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoId}/nsd_content @@ -205,6 +202,7 @@ POST a NSD Content (Method not implemented) PATCH a NSD Content (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}/ns_descriptors/${nsdInfoId}/nsd_content @@ -212,6 +210,7 @@ PATCH a NSD Content (Method not implemented) Log Received 405 Method not implemented as expected DELETE a NSD Content (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}/ns_descriptors/${nsdInfoId}/nsd_content diff --git a/SOL005/NSDManagement-API/NSDManagementNotification.robot b/SOL005/NSDManagement-API/NSDManagementNotification.robot index 9197a43f..83228d36 100644 --- a/SOL005/NSDManagement-API/NSDManagementNotification.robot +++ b/SOL005/NSDManagement-API/NSDManagementNotification.robot @@ -1,6 +1,5 @@ *** Setting *** Resource environment/variables.txt -Resource environment/generic.txt Suite Setup Create Sessions Suite Teardown Terminate All Processes kill=true Library MockServerLibrary @@ -130,6 +129,7 @@ Post Notification Negative 404 PUT VNF Package Management Notification + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log PUT Method not implemented &{req}= Create Mock Request Matcher PUT ${callback_endpoint} &{rsp}= Create Mock Response status_code=405 @@ -142,6 +142,7 @@ PUT VNF Package Management Notification PATCH VNF Package Management Notification + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log PATCH Method not implemented &{req}= Create Mock Request Matcher PATCH ${callback_endpoint} &{rsp}= Create Mock Response status_code=405 @@ -154,6 +155,7 @@ PATCH VNF Package Management Notification DELETE VNF Package Management Notification + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log PATCH Method not implemented &{req}= Create Mock Request Matcher DELETE ${callback_endpoint} &{rsp}= Create Mock Response status_code=405 diff --git a/SOL005/NSDManagement-API/NSDescriptors.robot b/SOL005/NSDManagement-API/NSDescriptors.robot index b427aa85..b6a32f18 100644 --- a/SOL005/NSDManagement-API/NSDescriptors.robot +++ b/SOL005/NSDManagement-API/NSDescriptors.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation This clause defines all the resources and methods provided by the NS descriptors interface. \ Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/nsDescriptors.txt # Specific nsDescriptors Parameters Library JSONLibrary Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} @@ -22,8 +22,7 @@ GET all Network Service Descriptors Log Validation of Content-Type : OK Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdInfos.schema.json ${json} + Validate Json NsdInfos.schema.json ${result} Log Validation OK GET all Network Service Descriptors - Filter @@ -39,8 +38,7 @@ GET all Network Service Descriptors - Filter Should Contain ${contentType} application/json Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdInfos.schema.json ${json} + Validate Json NsdInfos.schema.json ${result} Log Validation OK GET all Network Service Descriptors - Negative (wronge filter name) @@ -54,8 +52,7 @@ GET all Network Service Descriptors - Negative (wronge filter name) Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET all Network Service Descriptors - Negative (Unauthorized: Wrong Token) @@ -70,8 +67,7 @@ GET all Network Service Descriptors - Negative (Unauthorized: Wrong Token) Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET all Network Service Descriptors - Negative (Unauthorized: No Token) @@ -86,8 +82,7 @@ GET all Network Service Descriptors - Negative (Unauthorized: No Token) Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET all Network Service Descriptors (Negative: Not found) @@ -101,8 +96,7 @@ GET all Network Service Descriptors (Negative: Not found) Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -119,10 +113,9 @@ GET all Network Service Descriptors - all_fields Should Contain ${contentType} application/json Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdInfos.schema.json ${json} + Validate Json NsdInfos.schema.json ${result} Log NsdInfo schema validated - ${links}= Get Value From Json ${json} $.._links + ${links}= Get Value From Json ${result} $.._links Validate Json links.schema.json ${links[0]} Log Validation for _links schema OK @@ -136,11 +129,10 @@ GET all Network Service Descriptors - exclude_default Should Contain ${contentType} application/json Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdInfos.schema.json ${json} + Validate Json NsdInfos.schema.json ${result} Log NsdInfo schema validated Log Checking missing information for _links element - ${links}= Get Value From Json ${json} $.._links + ${links}= Get Value From Json ${result} $.._links Should Be Empty ${links} Log _links element is missing as excepted @@ -156,11 +148,10 @@ GET all Network Service Descriptors - exclude_fields Should Contain ${contentType} application/json Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdInfos.schema.json ${json} + Validate Json NsdInfos.schema.json ${result} Log NsdInfo schema validated Log Checking missing information for _links element - ${links}= Get Value From Json ${json} $.._links + ${links}= Get Value From Json ${result} $.._links Should Be Empty ${links} Log _links element is missing as excepted @@ -169,7 +160,7 @@ POST a new Network Service Descriptors Log Creating a new network service descriptor Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - ${body}= Get File json/createNsdInfoRequest.json + ${body}= Get File jsons/createNsdInfoRequest.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors ${body} Integer response status 201 @@ -178,11 +169,11 @@ POST a new Network Service Descriptors Should Contain ${headers} Location Log Response has header Location ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdInfo.schema.json ${json} + Validate Json NsdInfo.schema.json ${result} Log Validation of NsdInfo OK PUT all Network Service Descriptors (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}"} @@ -191,6 +182,7 @@ PUT all Network Service Descriptors (Method not implemented) Log Received 405 Method not implemented as expected PATCH all Network Service Descriptors (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} @@ -199,6 +191,7 @@ PATCH all Network Service Descriptors (Method not implemented) Log Received 405 Method not implemented as expected DELETE all Network Service Descriptors (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} diff --git a/SOL005/NSDManagement-API/PNFDContent.robot b/SOL005/NSDManagement-API/PNFDContent.robot index ef178867..590d5816 100644 --- a/SOL005/NSDManagement-API/PNFDContent.robot +++ b/SOL005/NSDManagement-API/PNFDContent.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation This clause defines the content of the individual NS descriptor, i.e. NSD content Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/pnfDescriptors.txt # Specific nsDescriptors Parameters Library JSONLibrary Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} @@ -32,8 +32,7 @@ GET PNFD Content- Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -48,8 +47,7 @@ GET PNFD Content - Negative (onboardingState issue) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -58,7 +56,7 @@ PUT a PNFD Content Set Headers {"Accept": "${ACCEPT_PLAIN}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} ${body}= Get Binary File ${contentFile} - PUT ${apiRoot}/${apiName}/${apiVersion}//pnf_descriptors/${pnfdInfoId}/pnfd_content ${body} + PUT ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content ${body} Integer response status 204 Log Received 204 No Content as expected ${response}= Output response body @@ -80,13 +78,13 @@ PUT a PNFD Content - Negative. Nsd in CREATING state Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST a PNFD Content (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PUT. This method should not be implemented Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content @@ -96,6 +94,7 @@ POST a PNFD Content (Method not implemented) PATCH a NSDContent (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} @@ -104,6 +103,7 @@ PATCH a NSDContent (Method not implemented) Log Received 405 Method not implemented as expected DELETE a NSDContent (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} diff --git a/SOL005/NSDManagement-API/PNFDescriptors.robot b/SOL005/NSDManagement-API/PNFDescriptors.robot index e9d1b93f..739b2fea 100644 --- a/SOL005/NSDManagement-API/PNFDescriptors.robot +++ b/SOL005/NSDManagement-API/PNFDescriptors.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation This clause defines all the resources and methods provided by the PNF descriptors interface. \ Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/pnfDescriptors.txt # Specific nsDescriptors Parameters Library JSONLibrary Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} @@ -22,8 +22,7 @@ GET all PNF Descriptors Log Validation of Content-Type : OK Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PnfdInfos.schema.json ${json} + Validate Json PnfdInfos.schema.json ${result} Log Validation OK GET all PNF Descriptors - Filter @@ -39,8 +38,7 @@ GET all PNF Descriptors - Filter Should Contain ${contentType} application/json Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PnfdInfos.schema.json ${json} + Validate Json PnfdInfos.schema.json ${result} Log Validation OK GET all PNF Descriptors - Negative (wronge filter name) @@ -54,8 +52,7 @@ GET all PNF Descriptors - Negative (wronge filter name) Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET all PNF Descriptors - Negative (Unauthorized: Wrong Token) @@ -70,8 +67,7 @@ GET all PNF Descriptors - Negative (Unauthorized: Wrong Token) Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET all PNF Descriptors - Negative (Unauthorized: No Token) @@ -86,8 +82,7 @@ GET all PNF Descriptors - Negative (Unauthorized: No Token) Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET all PNF Descriptors (Negative: Not found) @@ -101,8 +96,7 @@ GET all PNF Descriptors (Negative: Not found) Should Contain ${contentType} application/json Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -119,10 +113,9 @@ GET all PNF Descriptors - all_fields Should Contain ${contentType} application/json Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PnfdInfos.schema.json ${json} + Validate Json PnfdInfos.schema.json ${result} Log PnfdInfos schema validated - ${links}= Get Value From Json ${json} $.._links + ${links}= Get Value From Json ${result} $.._links Validate Json links.schema.json ${links[0]} Log Validation for _links schema OK @@ -136,11 +129,10 @@ GET all PNF Descriptors - exclude_default Should Contain ${contentType} application/json Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PnfdInfos.schema.json ${json} + Validate Json PnfdInfos.schema.json ${result} Log PnfdInfo schema validated Log Checking missing information for _links element - ${links}= Get Value From Json ${json} $.._links + ${links}= Get Value From Json ${result} $.._links Should Be Empty ${links} Log _links element is missing as excepted @@ -156,11 +148,10 @@ GET all PNF Descriptors - exclude_fields Should Contain ${contentType} application/json Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PnfdInfos.schema.json ${json} + Validate Json PnfdInfos.schema.json ${result} Log PnfdInfo schema validated Log Checking missing information for _links element - ${links}= Get Value From Json ${json} $.._links + ${links}= Get Value From Json ${result} $.._links Should Be Empty ${links} Log _links element is missing as excepted @@ -168,7 +159,7 @@ POST a new PNF Descriptor Log Creating a new PNF descriptor Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - ${body}= Get File json/createPnfdInfoRequest.json + ${body}= Get File jsons/createPnfdInfoRequest.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors ${body} Integer response status 201 @@ -177,11 +168,11 @@ POST a new PNF Descriptor Should Contain ${headers} Location Log Response has header Location ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PnfdInfo.schema.json ${json} + Validate Json PnfdInfo.schema.json ${result} Log Validation of PnfdInfo OK PUT all PNF Descriptors (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}"} @@ -190,6 +181,7 @@ PUT all PNF Descriptors (Method not implemented) Log Received 405 Method not implemented as expected PATCH all PNF Descriptors (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} @@ -198,6 +190,7 @@ PATCH all PNF Descriptors (Method not implemented) Log Received 405 Method not implemented as expected DELETE all PNF Descriptors (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} diff --git a/SOL005/NSDManagement-API/Subscriptions.robot b/SOL005/NSDManagement-API/Subscriptions.robot index 04cfa069..071f16ff 100644 --- a/SOL005/NSDManagement-API/Subscriptions.robot +++ b/SOL005/NSDManagement-API/Subscriptions.robot @@ -1,6 +1,6 @@ *** Settings *** Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/subscriptions.txt Library OperatingSystem Library JSONLibrary @@ -19,8 +19,7 @@ GET Subscription ${contentType}= Output response headers Content-Type Should Contain ${contentType} ${CONTENT_TYPE_JSON} ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdmSubscriptions.schema.json ${json} + Validate Json NsdmSubscriptions.schema.json ${result} Log Validated NsdmSubscription schema GET Subscription - Filter @@ -33,8 +32,7 @@ GET Subscription - Filter ${contentType}= Output response headers Content-Type Should Contain ${contentType} ${CONTENT_TYPE_JSON} ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdmSubscriptions.schema.json ${json} + Validate Json NsdmSubscriptions.schema.json ${result} Log Validated NsdmSubscription schema GET Subscription - Negative Filter @@ -48,8 +46,7 @@ GET Subscription - Negative Filter Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET Subscription - Negative (Not Found) @@ -63,8 +60,7 @@ GET Subscription - Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST Subscription @@ -73,7 +69,7 @@ POST Subscription Log Trying to create a new subscription Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - ${body}= Get File json/subscriptions.json + ${body}= Get File jsons/subscriptions.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body} Integer response status 201 @@ -82,8 +78,7 @@ POST Subscription Should Contain ${headers} Location Log Response has header Location ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdmSubscription.schema.json ${json} + Validate Json NsdmSubscription.schema.json ${result} Log Validation of NsdmSubscription OK POST Subscription - DUPLICATION @@ -91,7 +86,7 @@ POST Subscription - DUPLICATION Pass Execution If ${NFVO_DUPLICATION} == 0 NFVO is not permitting duplication. Skipping the test Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - ${body}= Get File json/subscriptions.json + ${body}= Get File jsons/subscriptions.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body} Integer response status 201 @@ -100,8 +95,7 @@ POST Subscription - DUPLICATION Should Contain ${headers} Location Log Response has header Location ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json NsdmSubscription.schema.json ${json} + Validate Json NsdmSubscription.schema.json ${result} Log Validation of NsdmSubscription OK POST Subscription - NO DUPLICATION @@ -109,7 +103,7 @@ POST Subscription - NO DUPLICATION Pass Execution If ${NFVO_DUPLICATION} == 1 NFVO is permitting duplication. Skipping the test Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - ${body}= Get File json/subscriptions.json + ${body}= Get File jsons/subscriptions.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body} Integer response status 303 @@ -119,6 +113,7 @@ POST Subscription - NO DUPLICATION Log Response header contains Location PUT Subscription - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}"} @@ -127,6 +122,7 @@ PUT Subscription - (Method not implemented) Log Received 405 Method not implemented as expected PATCH Subscription - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} @@ -135,6 +131,7 @@ PATCH Subscription - (Method not implemented) Log Received 405 Method not implemented as expected DELETE Subscription - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} diff --git a/SOL005/NSDManagement-API/environment/generic.txt b/SOL005/NSDManagement-API/environment/generic.txt deleted file mode 100644 index 81b2ec62..00000000 --- a/SOL005/NSDManagement-API/environment/generic.txt +++ /dev/null @@ -1,17 +0,0 @@ -*** Variables *** -${NFVO_HOST} localhost # Hostname of the NFVO -${NFVO_PORT} 8081 # Listening port of the NFVO -${NFVO_SCHEMA} https -${AUTHORIZATION} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42 -${CONTENT_TYPE_JSON} application/json -${ACCEPT_JSON} application/json -${apiRoot} / -${AUTH_USAGE} 1 -${NEG_AUTHORIZATION} Bearer negativetoken -${apiVersion} v1 -${apiName} nsd -${FIELD_USAGE} 1 -${NFVO_AUTHENTICATION} Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9 -${NFVO_AUTH_USAGE} 1 - -${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt index c758145e..e588bf2a 100644 --- a/SOL005/NSDManagement-API/environment/variables.txt +++ b/SOL005/NSDManagement-API/environment/variables.txt @@ -1,7 +1,25 @@ - *** Variables *** +${NFVO_HOST} localhost # Hostname of the NFVO +${NFVO_PORT} 8081 # Listening port of the NFVO +${NFVO_SCHEMA} https +${AUTHORIZATION} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42 +${CONTENT_TYPE_JSON} application/json +${ACCEPT_JSON} application/json +${apiRoot} / +${AUTH_USAGE} 1 +${NEG_AUTHORIZATION} Bearer negativetoken +${apiVersion} v1 +${apiName} nsd +${FIELD_USAGE} 1 +${NFVO_AUTHENTICATION} Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9 +${NFVO_AUTH_USAGE} 1 + +${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar + ${callback_uri} http://localhost ${callback_port} 9091 ${callback_endpoint} /endpoint ${callback_endpoint_error} /endpoint_404 -${sleep_interval} 20s \ No newline at end of file +${sleep_interval} 20s + +${testOptionalMethods} 0 diff --git a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot index 1a14bd04..642ca9e5 100644 --- a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot +++ b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot @@ -1,6 +1,6 @@ *** Settings *** Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/individualSubscription.txt Library OperatingSystem Library JSONLibrary @@ -17,8 +17,7 @@ GET Individual Subscription ${contentType}= Output response headers Content-Type Should Contain ${contentType} ${CONTENT_TYPE_JSON} ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PkgmSubscription.schema.json ${json} + Validate Json PkgmSubscription.schema.json ${result} Log Validated PkgmSubscription schema GET Subscription - Negative (Not Found) @@ -32,8 +31,7 @@ GET Subscription - Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK DELETE Subscription @@ -43,13 +41,7 @@ DELETE Subscription DELETE ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} Integer response status 204 Log Received 204 No Content as expected - Comment Log Trying to get the deleted element - Comment Create HTTP Context ${NFVO_HOST}:${NFVO_PORT} ${NFVO_SCHEMA} - Comment Set Request Header Accept ${ACCEPT_JSON} - Comment Run Keyword If ${AUTH_USAGE} == 1 Set Request Header Authorization ${AUTHORIZATION} - Comment GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} - Comment Response Status Code Should Equal 404 - Comment Log The subscriptionId is not present in database + DELETE Subscription - Negative (Not Found) Log Trying to perform a DELETE on a subscriptionId which doesn't exist @@ -62,11 +54,11 @@ DELETE Subscription - Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK PUT Subscription - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}"} @@ -75,6 +67,7 @@ PUT Subscription - (Method not implemented) Log Received 405 Method not implemented as expected PATCH Subscription - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} @@ -83,6 +76,7 @@ PATCH Subscription - (Method not implemented) Log Received 405 Method not implemented as expected POST Subscription - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a POST. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} diff --git a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot index 853cf653..478aa79a 100644 --- a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot +++ b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot @@ -1,6 +1,6 @@ *** Settings *** Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/individualVnfPackage.txt Library JSONLibrary Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} @@ -16,8 +16,7 @@ GET Individual VNF Package Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate response ${vnfPkgInfo}= Output response body - ${json}= evaluate json.loads('''${vnfPkgInfo}''') json - Validate Json vnfPkgInfo.schema.json ${json} + Validate Json vnfPkgInfo.schema.json ${vnfPackageId} Log Validation OK GET Individual VNF Package - Negative (Not Found) @@ -31,8 +30,7 @@ GET Individual VNF Package - Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -46,8 +44,7 @@ PATCH Individual VNF Package Log Received 200 OK as expected Log Trying to validate VnfPkgInfoModification ${response}= Output response body - ${json}= evaluate json.loads('''${response}''') json - Validate Json VnfPkgInfoModification.schema.json ${json} + Validate Json VnfPkgInfoModification.schema.json ${response} Log Validation OK @@ -61,8 +58,7 @@ PATCH Individual VNF Package - Negative (Conflict on the state of the resource) Log Received 409 Conflict as expected Log Trying to validate ProblemDetails ${response}= Output response body - ${json}= evaluate json.loads('''${response}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${response} Log Validation OK @@ -89,12 +85,12 @@ DELETE Individual VNF Package - Negative (Conflict on the state of the resource) Log Received 409 Conflict as expected Log Trying to validate ProblemDetails ${response}= Output response body - ${json}= evaluate json.loads('''${response}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${response} Log Validation OK POST Individual VNF Package - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}"} @@ -103,6 +99,7 @@ POST Individual VNF Package - (Method not implemented) Log Received 405 Method not implemented as expected PUT Individual VNF Package - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}"} diff --git a/SOL005/VNFPackageManagement-API/Notifications.robot b/SOL005/VNFPackageManagement-API/Notifications.robot index 2a0e5a9a..6a2d0132 100644 --- a/SOL005/VNFPackageManagement-API/Notifications.robot +++ b/SOL005/VNFPackageManagement-API/Notifications.robot @@ -1,6 +1,5 @@ *** Setting *** Resource environment/variables.txt -Resource environment/generic.txt Suite Setup Create Sessions Suite Teardown Terminate All Processes kill=true Library MockServerLibrary @@ -76,6 +75,7 @@ Post Package Change Notification Negative 404 PUT VNF Package Management Notification + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log PUT Method not implemented &{req}= Create Mock Request Matcher PUT ${callback_endpoint} &{rsp}= Create Mock Response status_code=405 @@ -88,6 +88,7 @@ PUT VNF Package Management Notification PATCH VNF Package Management Notification + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log PATCH Method not implemented &{req}= Create Mock Request Matcher PATCH ${callback_endpoint} &{rsp}= Create Mock Response status_code=405 @@ -100,6 +101,7 @@ PATCH VNF Package Management Notification DELETE VNF Package Management Notification + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log PATCH Method not implemented &{req}= Create Mock Request Matcher DELETE ${callback_endpoint} &{rsp}= Create Mock Response status_code=405 diff --git a/SOL005/VNFPackageManagement-API/Subscriptions.robot b/SOL005/VNFPackageManagement-API/Subscriptions.robot index d74b799c..b14f9232 100644 --- a/SOL005/VNFPackageManagement-API/Subscriptions.robot +++ b/SOL005/VNFPackageManagement-API/Subscriptions.robot @@ -1,6 +1,6 @@ *** Settings *** Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/subscriptions.txt Library OperatingSystem Library JSONLibrary @@ -17,8 +17,7 @@ GET Subscription ${contentType}= Output response headers Content-Type Should Contain ${contentType} ${CONTENT_TYPE_JSON} ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PkgmSubscriptions.schema.json ${json} + Validate Json PkgmSubscriptions.schema.json ${result} Log Validated PkgmSubscription schema GET Subscription - Filter @@ -31,8 +30,7 @@ GET Subscription - Filter ${contentType}= Output response headers Content-Type Should Contain ${contentType} ${CONTENT_TYPE_JSON} ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PkgmSubscriptions.schema.json ${json} + Validate Json PkgmSubscriptions.schema.json ${result} Log Validated PkgmSubscription schema GET Subscription - Negative Filter @@ -46,8 +44,7 @@ GET Subscription - Negative Filter Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET Subscription - Negative (Not Found) @@ -61,15 +58,14 @@ GET Subscription - Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST Subscription Log Trying to create a new subscription Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - ${body}= Get File json/subscriptions.json + ${body}= Get File jsons/subscriptions.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body} Integer response status 201 @@ -78,8 +74,7 @@ POST Subscription Should Contain ${headers} Location Log Response has header Location ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PkgmSubscription.schema.json ${json} + Validate Json PkgmSubscription.schema.json ${result} Log Validation of PkgmSubscription OK POST Subscription - DUPLICATION @@ -87,7 +82,7 @@ POST Subscription - DUPLICATION Pass Execution If ${NFVO_DUPLICATION} == 0 NFVO is not permitting duplication. Skipping the test Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - ${body}= Get File json/subscriptions.json + ${body}= Get File jsons/subscriptions.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body} Integer response status 201 @@ -96,8 +91,7 @@ POST Subscription - DUPLICATION Should Contain ${headers} Location Log Response has header Location ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PkgmSubscription.schema.json ${json} + Validate Json PkgmSubscription.schema.json ${result} Log Validation of PkgmSubscription OK POST Subscription - NO DUPLICATION @@ -105,7 +99,7 @@ POST Subscription - NO DUPLICATION Pass Execution If ${NFVO_DUPLICATION} == 1 NFVO is permitting duplication. Skipping the test Set Headers {"Accept": "${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - ${body}= Get File json/subscriptions.json + ${body}= Get File jsons/subscriptions.json Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body} Integer response status 303 @@ -115,6 +109,7 @@ POST Subscription - NO DUPLICATION Log Response header contains Location PUT Subscription - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}"} @@ -123,6 +118,7 @@ PUT Subscription - (Method not implemented) Log Received 405 Method not implemented as expected PATCH Subscription - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} @@ -131,6 +127,7 @@ PATCH Subscription - (Method not implemented) Log Received 405 Method not implemented as expected DELETE Subscription - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} diff --git a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot index fe149c08..44096e75 100644 --- a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot +++ b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot @@ -1,6 +1,6 @@ *** Settings *** Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/vnfdInIndividualVnfPackage.txt Library JSONLibrary Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} @@ -45,8 +45,7 @@ GET VNFD in Individual VNF Package - Negative (PLAIN/ZIP) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET VNFD in Individual VNF Package - Negative (Not Found) @@ -61,8 +60,7 @@ GET VNFD in Individual VNF Package - Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET VNFD in Individual VNF Package - Negative (onboardingState issue) @@ -77,11 +75,11 @@ GET VNFD in Individual VNF Package - Negative (onboardingState issue) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST VNFD in Individual VNF Package (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a POST (method should not be implemented) Set Headers {"Accept": "${ACCEPT_ZIP}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization: "${AUTHORIZATION}"} @@ -90,6 +88,7 @@ POST VNFD in Individual VNF Package (Method not implemented) Log Received 405 Method not implemented as expected PUT VNFD in Individual VNF Package (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PUT. This method should not be implemented Set Headers {"Accept": "${ACCEPT_ZIP}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization: "${AUTHORIZATION}"} @@ -98,6 +97,7 @@ PUT VNFD in Individual VNF Package (Method not implemented) Log Received 405 Method not implemented as expected PATCH VNFD in Individual VNF Package (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept": "${ACCEPT_ZIP}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization: "${AUTHORIZATION}"} @@ -106,6 +106,7 @@ PATCH VNFD in Individual VNF Package (Method not implemented) Log Received 405 Method not implemented as expected DELETE VNFD in Individual VNF Package (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept": "${ACCEPT_ZIP}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization: "${AUTHORIZATION}"} diff --git a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot index e30759f7..26cc582a 100644 --- a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot +++ b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot @@ -1,6 +1,6 @@ *** Settings *** Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/vnfPackageArtifacts.txt Library JSONLibrary Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} @@ -48,8 +48,7 @@ GET VNF Package Artifact - Negative Range Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET VNF Package Artifact- Negative (Not Found) @@ -62,8 +61,7 @@ GET VNF Package Artifact- Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET VNF Package Artifact - Negative (onboardingState issue) @@ -76,11 +74,11 @@ GET VNF Package Artifact - Negative (onboardingState issue) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST VNF Package Artifact - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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} @@ -88,6 +86,7 @@ POST VNF Package Artifact - (Method not implemented) Log Received 405 Method not implemented as expected PUT VNF Package Artifact - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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} @@ -95,6 +94,7 @@ PUT VNF Package Artifact - (Method not implemented) Log Received 405 Method not implemented as expected PATCH VNF Package Artifact - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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} @@ -102,6 +102,7 @@ PATCH VNF Package Artifact - (Method not implemented) Log Received 405 Method not implemented as expected DELETE VNF Package Artifact - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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} diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot index 7a523f1b..176831c7 100644 --- a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot +++ b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot @@ -1,6 +1,6 @@ *** Settings *** Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/vnfPackageContent.txt Library JSONLibrary Library OperatingSystem @@ -54,8 +54,7 @@ GET VNF Package Content - Negative Range Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET VNF Package Content - Negative (Not Found) @@ -69,8 +68,7 @@ GET VNF Package Content - Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET VNF Package Content - Negative (onboardingState issue) @@ -84,8 +82,7 @@ GET VNF Package Content - Negative (onboardingState issue) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK @@ -113,12 +110,12 @@ PUT VNF Package Content - Negative (Conflict on onboarding status not in CREATED Log Received 409 Conflict as expected Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST VNF Package Content - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a POST (method should not be implemented) Set Headers {"Accept": "${ACCEPT_ZIP}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} @@ -128,6 +125,7 @@ POST VNF Package Content - (Method not implemented) PATCH VNF Package Content - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept": "${ACCEPT_ZIP}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} @@ -136,6 +134,7 @@ PATCH VNF Package Content - (Method not implemented) Log Received 405 Method not implemented as expected DELETE VNF Package Content - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept": "${ACCEPT_ZIP}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot b/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot index 77898996..eb39ff37 100644 --- a/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot +++ b/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot @@ -1,6 +1,6 @@ *** Settings *** Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/vnfPackageContent.txt Library JSONLibrary Library OperatingSystem @@ -33,12 +33,12 @@ POST VNF Package Content - Negative (VNF Package not in CREATED operational stat Log Received 409 Conflict as expected Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET VNF Package Content - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a GET. This method should not be implemented Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/package_content/upload_from_uri @@ -47,6 +47,7 @@ GET VNF Package Content - (Method not implemented) PUT VNF Package Content - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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/${vnfPackageId}/package_content/upload_from_uri @@ -54,6 +55,7 @@ PUT VNF Package Content - (Method not implemented) Log Received 405 Method not implemented as expected PATCH VNF Package Content - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept": "${ACCEPT_ZIP}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} @@ -62,6 +64,7 @@ PATCH VNF Package Content - (Method not implemented) Log Received 405 Method not implemented as expected DELETE VNF Package Content - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept": "${ACCEPT_ZIP}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} diff --git a/SOL005/VNFPackageManagement-API/VNFPackages.robot b/SOL005/VNFPackageManagement-API/VNFPackages.robot index f058f86a..8833d3c3 100644 --- a/SOL005/VNFPackageManagement-API/VNFPackages.robot +++ b/SOL005/VNFPackageManagement-API/VNFPackages.robot @@ -1,7 +1,7 @@ *** Settings *** Resource environment/vnfPackages.txt # VNF Packages specific parameters Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Library JSONLibrary Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} @@ -18,19 +18,18 @@ GET all Packages Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json vnfPkgsInfo.schema.json ${json} + Validate Json vnfPkgsInfo.schema.json ${result} Log Validation OK Log Checking missing information for softwareImages element - ${softwareImages}= Get Value From Json ${json} $..softwareImages + ${softwareImages}= Get Value From Json ${result} $..softwareImages Should Be Empty ${softwareImages} Log softwareImages element is missing as excepted Log Checking missing information for additionalArtifact element - ${additional_artifacts}= Get Value From Json ${json} $..additionalArtifacts + ${additional_artifacts}= Get Value From Json ${result} $..additionalArtifacts Should Be Empty ${additional_artifacts} Log additionalArtifact element is missing as excepted Log Checking missing information for _links element - ${links}= Get Value From Json ${json} $.._links + ${links}= Get Value From Json ${result} $.._links Should Be Empty ${links} Log _links element is missing as excepted @@ -44,8 +43,7 @@ GET all Packages - Filter Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json vnfPkgsInfo.schema.json ${json} + Validate Json vnfPkgsInfo.schema.json ${result} Log Validation OK GET all Packages - Negative (wronge filter name) @@ -59,8 +57,7 @@ GET all Packages - Negative (wronge filter name) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET all Packages - Negative (Unauthorized: Wrong Token) @@ -75,8 +72,7 @@ GET all Packages - Negative (Unauthorized: Wrong Token) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET all Packages - Negative (Unauthorized: No Token) @@ -90,8 +86,7 @@ GET all Packages - Negative (Unauthorized: No Token) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET all Packages - all_fields @@ -103,19 +98,18 @@ GET all Packages - all_fields ${contentType}= Output response headers Content-Type Should Contain ${contentType} ${CONTENT_TYPE_JSON} ${vnfPkgInfos}= Output response body - ${json}= evaluate json.loads('''${vnfPkgInfos}''') json Log Trying to validate response - Validate Json vnfPkgsInfo.schema.json ${json} + Validate Json vnfPkgsInfo.schema.json ${vnfPkgInfos} Log Validation OK Log Trying to validate softwareImages schema - ${softwareImages}= Get Value From Json ${json} $..softwareImages + ${softwareImages}= Get Value From Json ${vnfPkgInfos} $..softwareImages Validate Json softwareImage.schema.json ${softwareImages[0]} Log Validation for softwareImage schema OK Log Trying to validate additionalArtifacts schema - ${additional_artifacts}= Get Value From Json ${json} $..additionalArtifacts + ${additional_artifacts}= Get Value From Json ${vnfPkgInfos} $..additionalArtifacts Validate Json additionalArtifacts.schema.json ${additional_artifacts[0]} Log Validation for additionalArtifacts schema OK - ${links}= Get Value From Json ${json} $.._links + ${links}= Get Value From Json ${vnfPkgInfos} $.._links Validate Json links.schema.json ${links[0]} Log Validation for _links schema OK @@ -128,20 +122,19 @@ GET all Packages - exclude_default ${contentType}= Output response headers Content-Type Should Contain ${contentType} ${CONTENT_TYPE_JSON} ${vnfPkgInfos}= Output response body - ${json}= evaluate json.loads('''${vnfPkgInfos}''') json Log Trying to validate response - Validate Json vnfPkgsInfo.schema.json ${json} + Validate Json vnfPkgsInfo.schema.json ${vnfPkgInfos} Log Validation OK Log Checking missing information for softwareImages element - ${softwareImages}= Get Value From Json ${json} $..softwareImages + ${softwareImages}= Get Value From Json ${vnfPkgInfos} $..softwareImages Should Be Empty ${softwareImages} Log softwareImages element is missing as excepted Log Checking missing information for additionalArtifact element - ${additional_artifacts}= Get Value From Json ${json} $..additionalArtifacts + ${additional_artifacts}= Get Value From Json ${vnfPkgInfos} $..additionalArtifacts Should Be Empty ${additional_artifacts} Log additionalArtifact element is missing as excepted Log Checking missing information for _links element - ${links}= Get Value From Json ${json} $.._links + ${links}= Get Value From Json ${vnfPkgInfos} $.._links Should Be Empty ${links} Log _links element is missing as excepted @@ -155,16 +148,15 @@ GET all Packages - fields ${contentType}= Output response headers Content-Type Should Contain ${contentType} ${CONTENT_TYPE_JSON} ${vnfPkgInfos}= Output response body - ${json}= evaluate json.loads('''${vnfPkgInfos}''') json Log Trying to validate response, checking vnfPkgInfo and other complex attributes included in the vnfPkgInfo - Validate Json vnfPkgsInfo.schema.json ${json} + Validate Json vnfPkgsInfo.schema.json ${vnfPkgInfos} Log Validation for vnfPkgInfo OK Log Trying to validate softwareImages schema - ${softwareImages}= Get Value From Json ${json} $..softwareImages + ${softwareImages}= Get Value From Json ${vnfPkgInfos} $..softwareImages Validate Json softwareImage.schema.json ${softwareImages[0]} Log Validation for softwareImage schema OK Log Trying to validate additionalArtifacts schema - ${additional_artifacts}= Get Value From Json ${json} $..additionalArtifacts + ${additional_artifacts}= Get Value From Json ${vnfPkgInfos} $..additionalArtifacts Validate Json additionalArtifacts.schema.json ${additional_artifacts[0]} Log Validation for additionalArtifacts schema OK @@ -178,13 +170,12 @@ GET all Packages - exclude_fields ${contentType}= Output response headers Content-Type Should Contain ${contentType} ${CONTENT_TYPE_JSON} ${vnfPkgInfos}= Output response body - ${json}= evaluate json.loads('''${vnfPkgInfos}''') json Log Checking missing information for softwareImages element - ${softwareImages}= Get Value From Json ${json} $..softwareImages + ${softwareImages}= Get Value From Json ${vnfPkgInfos} $..softwareImages Should Be Empty ${softwareImages} Log softwareImages element is missing as excepted Log Checking missing information for additionalArtifact element - ${additional_artifacts}= Get Value From Json ${json} $..additionalArtifacts + ${additional_artifacts}= Get Value From Json ${vnfPkgInfos} $..additionalArtifacts Should Be Empty ${additional_artifacts} Log additionalArtifact element is missing as excepted @@ -199,8 +190,7 @@ GET all PACKAGE (Negative: Not found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST all VNF PACKAGE @@ -220,10 +210,10 @@ POST all VNF PACKAGE Log Validation of the vnfPkgInfo schema ${vnfPkgInfo}= Output response body Log Trying to validate response - ${json}= evaluate json.loads('''${vnfPkgInfo}''') json - Validate Json vnfPkgInfo.schema.json ${json} + Validate Json vnfPkgInfo.schema.json ${vnfPkgInfo} PUT all PACKAGE (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}"} @@ -232,6 +222,7 @@ PUT all PACKAGE (Method not implemented) Log Received 405 Method not implemented as expected PATCH all PACKAGE (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} @@ -240,6 +231,7 @@ PATCH all PACKAGE (Method not implemented) Log Received 405 Method not implemented as expected DELETE all PACKAGE (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} diff --git a/SOL005/VNFPackageManagement-API/environment/generic.txt b/SOL005/VNFPackageManagement-API/environment/generic.txt deleted file mode 100644 index 60457280..00000000 --- a/SOL005/VNFPackageManagement-API/environment/generic.txt +++ /dev/null @@ -1,22 +0,0 @@ -*** Variables *** -${VNFM_HOST} localhost # Hostname of the VNFM -${VNFM_PORT} 8080 # Listening port of the VNFM -${NFVO_HOST} localhost # Hostname of the NFVO -${NFVO_PORT} 8081 # Listening port of the NFVO -${VNFM_SCHEMA} https -${NFVO_SCHEMA} https -${AUTHORIZATION} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42 -${CONTENT_TYPE_JSON} application/json -${ACCEPT_JSON} application/json -${apiRoot} / -${AUTH_USAGE} 1 -${NEG_AUTHORIZATION} Bearer negativetoken -${apiVersion} v1 -${apiName} vnfpkgm -${FIELD_USAGE} 1 -${NFVO_PLAIN} 1 -${NFVO_FIELDS} 1 -${vnfPackageId} 788106a2-d692-44f3-a86d-384f0ce35e42 - -${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar - diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt index c758145e..3792edc0 100644 --- a/SOL005/VNFPackageManagement-API/environment/variables.txt +++ b/SOL005/VNFPackageManagement-API/environment/variables.txt @@ -1,5 +1,25 @@ - *** Variables *** + +${NFVO_HOST} localhost # Hostname of the NFVO +${NFVO_PORT} 8081 # Listening port of the NFVO +${NFVO_SCHEMA} https +${AUTHORIZATION} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42 +${CONTENT_TYPE_JSON} application/json +${ACCEPT_JSON} application/json +${apiRoot} / +${AUTH_USAGE} 1 +${NEG_AUTHORIZATION} Bearer negativetoken +${apiVersion} v1 +${apiName} vnfpkgm +${FIELD_USAGE} 1 +${NFVO_PLAIN} 1 +${NFVO_FIELDS} 1 +${vnfPackageId} 788106a2-d692-44f3-a86d-384f0ce35e42 + +${testOptionalMethods} 0 + +${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar + ${callback_uri} http://localhost ${callback_port} 9091 ${callback_endpoint} /endpoint diff --git a/SOL005/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL005/VNFPerformanceManagement-API/IndividualPmJob.robot index 00c0445d..a0f8d655 100644 --- a/SOL005/VNFPerformanceManagement-API/IndividualPmJob.robot +++ b/SOL005/VNFPerformanceManagement-API/IndividualPmJob.robot @@ -1,6 +1,6 @@ *** Settings *** Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Library JSONLibrary Resource environment/IndividualPmJob.txt Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} @@ -16,8 +16,7 @@ GET Individual PM Job Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJob.schema.json ${result} Log Validation OK GET Individual PM Job - Negative (Not Found) @@ -31,8 +30,7 @@ GET Individual PM Job - Negative (Not Found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK DELETE Individual PM Job @@ -50,11 +48,11 @@ DELETE Individual PM Job - Negative (Not Found) 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} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST Individual PM Job - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}/pm_jobs/${pmJobId} @@ -62,6 +60,7 @@ POST Individual PM Job - (Method not implemented) Log Received 405 Method not implemented as expected PUT Individual PM Job - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}/pm_jobs/${pmJobId} @@ -69,6 +68,7 @@ PUT Individual PM Job - (Method not implemented) Log Received 405 Method not implemented as expected PATCH Individual PM Job - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}/pm_jobs/${pmJobId} diff --git a/SOL005/VNFPerformanceManagement-API/IndividualReport.robot b/SOL005/VNFPerformanceManagement-API/IndividualReport.robot index 38e9da21..de5119e0 100644 --- a/SOL005/VNFPerformanceManagement-API/IndividualReport.robot +++ b/SOL005/VNFPerformanceManagement-API/IndividualReport.robot @@ -1,6 +1,6 @@ *** Settings *** Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Resource environment/reports.txt Library JSONLibrary Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} @@ -18,8 +18,7 @@ GET Report on Single PM Job Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate result with PerformanceReport schema ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PerformanceReport.schema.json ${json} + Validate Json PerformanceReport.schema.json ${result} GET Report on Single PM Job - Negative (Not Found) [Documentation] The client can use this resource to read the performance report. @@ -32,29 +31,32 @@ GET Report on Single PM Job - Negative (Not Found) 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} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST Reports - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId} Integer response status 405 Log Received 405 Method not implemented as expected PUT Reports - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PUT ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId} Integer response status 405 Log Received 405 Method not implemented as expected PATCH Reports - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PATCH ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId} Integer response status 405 Log Received 405 Method not implemented as expected DELETE Reports - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} DELETE ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId} Integer response status 405 diff --git a/SOL005/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL005/VNFPerformanceManagement-API/IndividualSubscription.robot index 2c6d9fae..26ad17d0 100644 --- a/SOL005/VNFPerformanceManagement-API/IndividualSubscription.robot +++ b/SOL005/VNFPerformanceManagement-API/IndividualSubscription.robot @@ -3,7 +3,7 @@ Documentation This resource represents an individual subscription for notifi ... The client can use this resource to read and to terminate a subscription to notifications related to NS performance ... management. Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} Library OperatingSystem Library JSONLibrary @@ -23,8 +23,7 @@ GET Individual Subscription ${contentType}= Output response headers Content-Type Should Contain ${contentType} application/json ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmSubscription.schema.json ${json} + Validate Json PmSubscription.schema.json ${result} Log Validated PmSubscription schema GET Individual Subscription - Negative (Not Found) @@ -40,13 +39,13 @@ GET Individual Subscription - Negative (Not Found) ${contentType}= Output response headers Content-Type Should Contain ${contentType} application/json ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${result} Log Validated ProblemDetails schema POST Individual Subscription - (Method not implemented) [Documentation] This method is not supported. When this method is requested on this resource, the NFVO shall return a "405 Method ... Not Allowed" response as defined in clause 4.3.5.4. + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} Integer response status 405 @@ -55,6 +54,7 @@ POST Individual Subscription - (Method not implemented) PUT Individual Subscription - (Method not implemented) [Documentation] This method is not supported. When this method is requested on this resource, the NFVO shall return a "405 Method ... Not Allowed" response as defined in clause 4.3.5.4. + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PUT ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} Integer response status 405 @@ -63,6 +63,7 @@ PUT Individual Subscription - (Method not implemented) PATCH Individual Subscription - (Method not implemented) [Documentation] This method is not supported. When this method is requested on this resource, the NFVO shall return a "405 Method ... Not Allowed" response as defined in clause 4.3.5.4. + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PATCH ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} Integer response status 405 diff --git a/SOL005/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL005/VNFPerformanceManagement-API/IndividualThreshold.robot index 717d143d..875101f4 100644 --- a/SOL005/VNFPerformanceManagement-API/IndividualThreshold.robot +++ b/SOL005/VNFPerformanceManagement-API/IndividualThreshold.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation This resource represents an individual threshold. Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Library JSONLibrary Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} Library OperatingSystem @@ -16,9 +16,8 @@ GET Individual Threshold ${contentType}= Output response headers Content-Type Should Contain ${contentType} application/json ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json Log Trying to validate result with thresholds schema - Validate Json Threshold.schema.json ${json} + Validate Json Threshold.schema.json ${result} GET Individual Threshold - Negative (Not Found) Set Headers {"Accept": "${ACCEPT_JSON}"} @@ -28,8 +27,7 @@ GET Individual Threshold - Negative (Not Found) 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} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK DELETE Individual Threshold @@ -47,23 +45,25 @@ DELETE Individual Threshold - Negative (Not Found) Integer response status 404 Log Received 404 Not Found as expected ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json Log Trying to validate result with ProblemDetails schema - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${result} POST Individual Threshold - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} POST ${apiRoot}/${apiName}/${apiVersion}/thresholds Integer response status 405 Log Received 405 Method not implemented as expected PUT Individual Threshold - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PUT ${apiRoot}/${apiName}/${apiVersion}/thresholds Integer response status 405 Log Received 405 Method not implemented as expected PATCH Individual Threshold - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PATCH ${apiRoot}/${apiName}/${apiVersion}/thresholds Integer response status 405 diff --git a/SOL005/VNFPerformanceManagement-API/Notifications.robot b/SOL005/VNFPerformanceManagement-API/Notifications.robot index 676cecc6..8fe01e3a 100644 --- a/SOL005/VNFPerformanceManagement-API/Notifications.robot +++ b/SOL005/VNFPerformanceManagement-API/Notifications.robot @@ -1,6 +1,6 @@ *** Setting *** Resource environment/notifications.txt -Resource environment/generic.txt +Resource environment/variables.txt Suite Setup Create Sessions Suite Teardown Terminate All Processes kill=true Library MockServerLibrary @@ -76,6 +76,7 @@ Post Threshold Crossed Notification Negative 404 PUT Performance Notification + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log PUT Method not implemented &{req}= Create Mock Request Matcher PUT ${callback_endpoint} &{rsp}= Create Mock Response status_code=405 @@ -88,6 +89,7 @@ PUT Performance Notification PATCH Performance Notification + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log PATCH Method not implemented &{req}= Create Mock Request Matcher PATCH ${callback_endpoint} &{rsp}= Create Mock Response status_code=405 @@ -100,6 +102,7 @@ PATCH Performance Notification DELETE Performance Notification + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log PATCH Method not implemented &{req}= Create Mock Request Matcher DELETE ${callback_endpoint} &{rsp}= Create Mock Response status_code=405 diff --git a/SOL005/VNFPerformanceManagement-API/PMJobs.robot b/SOL005/VNFPerformanceManagement-API/PMJobs.robot index 9269c1d7..dd2d35e2 100644 --- a/SOL005/VNFPerformanceManagement-API/PMJobs.robot +++ b/SOL005/VNFPerformanceManagement-API/PMJobs.robot @@ -1,6 +1,6 @@ *** Settings *** Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Library JSONLibrary Library OperatingSystem Resource environment/pmJobs.txt @@ -18,11 +18,10 @@ GET all Pm Jobs Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJobs.schema.json ${json} + Validate Json PmJobs.schema.json ${result} Log Validation OK Log Checking that reports element is missing - ${reports}= Get Value From Json ${json} $..reports + ${reports}= Get Value From Json ${result} $..reports Should Be Empty ${reports} Log Reports element is empty as expected @@ -36,8 +35,7 @@ GET all Pm Jobs - Filter Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJobs.schema.json ${json} + Validate Json PmJobs.schema.json ${result} Log Validation OK GET all Pm Jobs - all_fields @@ -50,19 +48,18 @@ GET all Pm Jobs - all_fields Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJobs.schema.json ${json} + Validate Json PmJobs.schema.json ${result} Log Validation OK Log Trying to validate criteria schema - ${criteria}= Get Value From Json ${json} $..criteria + ${criteria}= Get Value From Json ${result} $..criteria Validate Json criteria.schema.json ${criteria[0]} Log Validation for criteria schema OK Log Trying to validate criteria schema - ${reports}= Get Value From Json ${json} $..reports + ${reports}= Get Value From Json ${result} $..reports Validate Json reports.schema.json ${reports[0]} Log Validation for reports schema OK Log Validating _links schema - ${links}= Get Value From Json ${json} $.._links + ${links}= Get Value From Json ${result} $.._links Validate Json links.schema.json ${links[0]} Log Validation for _links schema OK @@ -76,11 +73,10 @@ GET all Pm Jobs - exclude_default Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJobs.schema.json ${json} + Validate Json PmJobs.schema.json ${result} Log Validation OK Log Checking that reports element is missing - ${reports}= Get Value From Json ${json} $..reports + ${reports}= Get Value From Json ${result} $..reports Should Be Empty ${reports} Log Reports element is empty as expected @@ -95,15 +91,14 @@ GET all Pm Jobs - fields Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJobs.schema.json ${json} + Validate Json PmJobs.schema.json ${result} Log Validation OK Log Trying to validate criteria schema - ${criteria}= Get Value From Json ${json} $..criteria + ${criteria}= Get Value From Json ${result} $..criteria Validate Json criteria.schema.json ${criteria[0]} Log Validation for criteria schema OK Log Trying to validate criteria schema - ${reports}= Get Value From Json ${json} $..reports + ${reports}= Get Value From Json ${result} $..reports Validate Json reports.schema.json ${reports[0]} Log Validation for reports schema OK @@ -118,15 +113,14 @@ GET all Pm Jobs - exclude_fields Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJobs.schema.json ${json} + Validate Json PmJobs.schema.json ${result} Log Validation OK Log Checking that reports element is missing - ${reports}= Get Value From Json ${json} $..reports + ${reports}= Get Value From Json ${result} $..reports Should Be Empty ${reports} Log Reports element is empty as expected Log Checking that criteria element is missing - ${criteria}= Get Value From Json ${json} $..criteria + ${criteria}= Get Value From Json ${result} $..criteria Should Be Empty ${criteria} Log Criteria element is empty as expected @@ -141,8 +135,7 @@ GET all Pm Jobs - Negative (wronge filter name) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response headers Content-Type - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK GET all Pm Jobs (Negative: Not found) @@ -156,8 +149,7 @@ GET all Pm Jobs (Negative: Not found) Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate ProblemDetails ${problemDetails}= Output response headers Content-Type - ${json}= evaluate json.loads('''${problemDetails}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST all PM Jobs - Create new PM Job @@ -173,11 +165,11 @@ POST all PM Jobs - Create new PM Job Should Contain ${contentType} ${CONTENT_TYPE_JSON} Log Trying to validate response ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmJob.schema.json ${json} + Validate Json PmJob.schema.json ${result} Log Validation OK PUT all PM Jobs - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. 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}"} @@ -186,6 +178,7 @@ PUT all PM Jobs - (Method not implemented) Log Received 405 Method not implemented as expected PATCH all Pm Jobs - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} @@ -194,6 +187,7 @@ PATCH all Pm Jobs - (Method not implemented) Log Received 405 Method not implemented as expected DELETE all Pm Jobs - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} diff --git a/SOL005/VNFPerformanceManagement-API/Subscriptions.robot b/SOL005/VNFPerformanceManagement-API/Subscriptions.robot index 52622658..9baec607 100644 --- a/SOL005/VNFPerformanceManagement-API/Subscriptions.robot +++ b/SOL005/VNFPerformanceManagement-API/Subscriptions.robot @@ -2,7 +2,7 @@ Documentation This resource represents subscriptions. The client can use this resource to subscribe to notifications related to VNF ... performance management and to query its subscriptions. Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} Library OperatingSystem Library JSONLibrary @@ -22,8 +22,7 @@ GET Subscription ${contentType}= Output response headers Content-Type Should Contain ${contentType} application/json ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmSubscriptions.schema.json ${json} + Validate Json PmSubscriptions.schema.json ${result} Log Validated PmSubscription schema GET Subscription - Filter @@ -39,8 +38,7 @@ GET Subscription - Filter ${contentType}= Output response headers Content-Type Should Contain ${contentType} application/json ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmSubscriptions.schema.json ${json} + Validate Json PmSubscriptions.schema.json ${result} Log Validated PmSubscription schema GET Subscription - Negative Filter (Erroneous filter) @@ -56,8 +54,7 @@ GET Subscription - Negative Filter (Erroneous filter) ${contentType}= Output response headers Content-Type Should Contain ${contentType} application/json ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${result} Log Validated ProblemDetails schema GET Subscription - Negative (Not Found) @@ -73,8 +70,7 @@ GET Subscription - Negative (Not Found) ${contentType}= Output response headers Content-Type Should Contain ${contentType} application/json ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${result} Log Validated ProblemDetails schema POST Subscription @@ -97,8 +93,7 @@ POST Subscription ${contentType}= Output response headers Content-Type Should Contain ${contentType} application/json ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmSubscription.schema.json ${json} + Validate Json PmSubscription.schema.json ${result} Log Validated PmSubscription schema Log Trying to validate the Location header ${headers}= Output response headers @@ -152,8 +147,7 @@ POST Subscription - NO DUPLICATION ${contentType}= Output response headers Content-Type Should Contain ${contentType} application/json ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json - Validate Json PmSubscription.schema.json ${json} + Validate Json PmSubscription.schema.json ${result} Log Validated PmSubscription schema Log Trying to validate the Location header ${headers}= Output response headers @@ -162,6 +156,7 @@ POST Subscription - NO DUPLICATION PUT Subscription - (Method not implemented) [Documentation] This method is not supported. When this method is requested on this resource, the NFVO shall return a "405 Method ... Not Allowed" response as defined in clause 4.3.5.4. + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PUT ${apiRoot}/${apiName}/${apiVersion}/subscriptions Integer response status 405 @@ -170,6 +165,7 @@ PUT Subscription - (Method not implemented) PATCH Subscription - (Method not implemented) [Documentation] This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method ... Not Allowed" response as defined in clause 4.3.5.4. + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PATCH ${apiRoot}/${apiName}/${apiVersion}/subscriptions Integer response status 405 @@ -178,6 +174,7 @@ PATCH Subscription - (Method not implemented) DELETE Subscription - (Method not implemented) [Documentation] This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method ... Not Allowed" response as defined in clause 4.3.5.4. + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} DELETE ${apiRoot}/${apiName}/${apiVersion}/subscriptions Integer response status 405 diff --git a/SOL005/VNFPerformanceManagement-API/Thresholds.robot b/SOL005/VNFPerformanceManagement-API/Thresholds.robot index 71a80669..44ab6f37 100644 --- a/SOL005/VNFPerformanceManagement-API/Thresholds.robot +++ b/SOL005/VNFPerformanceManagement-API/Thresholds.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation This resource represents thresholds. The client can use this resource to create and query thresholds. Library JSONSchemaLibrary schemas/ -Resource environment/generic.txt # Generic Parameters +Resource environment/variables.txt # Generic Parameters Library JSONLibrary Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} Resource environment/thresholds.txt @@ -18,9 +18,8 @@ GET Thresholds ${contentType}= Output response headers Content-Type Should Contain ${contentType} application/json ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json Log Trying to validate result with thresholds schema - Validate Json Thresholds.schema.json ${json} + Validate Json Thresholds.schema.json ${result} GET Thresholds - Filter Set Headers {"Accept": "${ACCEPT_JSON}"} @@ -30,9 +29,8 @@ GET Thresholds - Filter ${contentType}= Output response headers Content-Type Should Contain ${contentType} application/json ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json Log Trying to validate result with Threshold schema - Validate Json Thresholds.schema.json ${json} + Validate Json Thresholds.schema.json ${result} GET Thresholds - NEGATIVE Filter Set Headers {"Accept": "${ACCEPT_JSON}"} @@ -40,9 +38,8 @@ GET Thresholds - NEGATIVE Filter GET ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_KO} Integer response status 400 ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json Log Trying to validate result with ProblemDetails schema - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${result} GET Thresholds - Negative (Not Found) Set Headers {"Accept": "${ACCEPT_JSON}"} @@ -51,9 +48,8 @@ GET Thresholds - Negative (Not Found) Integer response status 404 Log Received 404 Not Found as expected ${problemDetails}= Output response body - ${json}= evaluate json.loads('''${problemDetails}''') json Log Trying to validate ProblemDetails - Validate Json ProblemDetails.schema.json ${json} + Validate Json ProblemDetails.schema.json ${problemDetails} Log Validation OK POST Reports @@ -65,26 +61,28 @@ POST Reports Integer response status 201 Log Received 201 Created as expected ${result}= Output response body - ${json}= evaluate json.loads('''${result}''') json Log Trying to validate result with thresholds schema - Validate Json Threshold.schema.json ${json} + Validate Json Threshold.schema.json ${result} Log Trying to validate the Location header ${headers}= Output response headers Should Contain ${headers} Location PUT Reports - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PUT ${apiRoot}/${apiName}/${apiVersion}/thresholds Integer response status 405 Log Received 405 Method not implemented as expected PATCH Reports - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} PATCH ${apiRoot}/${apiName}/${apiVersion}/thresholds Integer response status 405 Log Received 405 Method not implemented as expected DELETE Reports - (Method not implemented) + Pass Execution If ${testOptionalMethods} == 0 optional methods are not implemented on the FUT. Skipping test. Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} DELETE ${apiRoot}/${apiName}/${apiVersion}/thresholds Integer response status 405 diff --git a/SOL005/VNFPerformanceManagement-API/environment/generic.txt b/SOL005/VNFPerformanceManagement-API/environment/variables.txt similarity index 68% rename from SOL005/VNFPerformanceManagement-API/environment/generic.txt rename to SOL005/VNFPerformanceManagement-API/environment/variables.txt index 51879755..fc53947d 100644 --- a/SOL005/VNFPerformanceManagement-API/environment/generic.txt +++ b/SOL005/VNFPerformanceManagement-API/environment/variables.txt @@ -1,9 +1,6 @@ *** Variables *** -${VNFM_HOST} localhost # Hostname of the VNFM -${VNFM_PORT} 8080 # Listening port of the VNFM ${NFVO_HOST} localhost # Hostname of the NFVO ${NFVO_PORT} 8081 # Listening port of the NFVO -${VNFM_SCHEMA} https ${NFVO_SCHEMA} https ${AUTHORIZATION} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42 ${CONTENT_TYPE_JSON} application/json @@ -14,10 +11,8 @@ ${NEG_AUTHORIZATION} Bearer negativetoken ${apiVersion} v1 ${apiName} vnfpm ${FIELD_USAGE} 1 -${VNFM_AUTHENTICATION} Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9 -${VNFM_AUTH_USAGE} 1 -${VNFM_DUPLICATION} 1 ${NFVO_DUPLICATION} 1 ${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar +${testOptionalMethods} 0 \ No newline at end of file -- GitLab