From fc67dbbdc8fb71e6b824f1a5ac5377f4ab7b8e3c Mon Sep 17 00:00:00 2001 From: Abbas Ahmad Date: Thu, 20 Jun 2019 13:44:44 +0200 Subject: [PATCH] Individual Subs Virtualised Resources Quota Available Notification Edits --- .gitignore | 2 + .../IndividualSubscription.robot | 38 ++++++++++--------- .../VRQANOperationKeywords.robot | 23 ++++++----- .../NSLCMOperationKeywords.robot | 2 +- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index d8fe4fa7..09d74d02 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /.project +/.pydevproject +/red.xml diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot index 54d276ea..5fa0848c 100644 --- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot +++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot @@ -13,60 +13,62 @@ Suite Setup Check Individual Subscription existance Post Individual Subscription - Method not implemented [Documentation] Test ID: 7.3.7.2.1 ... Test title: Post Individual Subscription - Method not implemented - ... Test objective: The objective is to test that POST method is not allowed to create a new individual subscription instance on NFV - ... Pre-conditions: A NFV instance is instantiated + ... Test objective: The objective is to test that POST method is not allowed to create a new Virtualised Resources Quota Available Notification individual subscription instance on VNF + ... Pre-conditions: A VNF instance is instantiated ... Reference: section 11.4.3.3.1 - SOL003 v2.4.1 ... Config ID: Config_prod_VNFM ... Applicability: none ... Post-Conditions: none - Do Post Individual Subscription + Send Post request for Virtualised Resources Quota Available Notification Individual Subscription Check HTTP Response Status Code Is 405 Get Information about an individual subscription [Documentation] Test ID: 7.3.7.2.2 ... Test title: Get Information about an individual subscription - ... Test objective: The objective is to read an individual subscription subscribed by the client + ... Test objective: The objective is to read an individual Virtualised Resources Quota Available Notification subscription subscribed by the client and perform a JSON schema and content validation of the returned individual subscription data structure ... Pre-conditions: The subscription with the given id exists ... Reference: section 11.4.3.3.2 - SOL003 v2.4.1 ... Config ID: Config_prod_VNFM ... Applicability: none ... Post-Conditions: none - Do Get individual subscription + Get Virtualised Resources Quota Available Notification individual subscription Check HTTP Response Status Code Is 200 - Check HTTP Response Body Json Schema Is VrQuotaAvailSubscription.schema.json + Check HTTP Response Body Json Schema Is VrQuotaAvailSubscription PUT an individual subscription - Method not implemented [Documentation] Test ID: 7.3.7.2.3 - ... Test title: Put Individual Subscription - Method not implemented - ... Test objective: The objective is to test that PUT method is not allowed to update a existing individual subscription instance on NFV - ... Pre-conditions: A NFV instance is instantiated + ... Test title: PUT an individual subscription - Method not implemented + ... Test objective: The objective is to test that PUT method is not allowed to update a existing Virtualised Resources Quota Available Notification individual subscription instance on VNF + ... Pre-conditions: A VNF instance is instantiated ... Reference: section 11.4.3.3.3 - SOL003 v2.4.1 ... Config ID: Config_prod_VNFM ... Applicability: none ... Post-Conditions: none - Do Put Individual Subscription + Put Virtualised Resources Quota Available Notification individual Subscription Check HTTP Response Status Code Is 405 PATCH an individual subscription - Method not implemented [Documentation] Test ID: 7.3.7.2.4 - ... Test title: Patch Individual Subscription - Method not implemented - ... Test objective: The objective is to test that PATCH method is not allowed to modify a existing individual subscription instance on NFV - ... Pre-conditions: A NFV instance is instantiated + ... Test title: PATCH an individual subscription - Method not implemented + ... Test objective: The objective is to test that PATCH method is not allowed to modify a existing Virtualised Resources Quota Available Notification individual subscription instance on VNF + ... Pre-conditions: A VNF instance is instantiated ... Reference: section 11.4.3.3.4 - SOL003 v2.4.1 ... Config ID: Config_prod_VNFM ... Applicability: none ... Post-Conditions: none - Do Patch Individual Subscription + Patch Virtualised Resources Quota Available Notification individual subscription Check HTTP Response Status Code Is 405 DELETE an individual subscription [Documentation] Test ID: 7.3.7.2.5 - ... Test title: Delete an Individual Subscription - ... Test objective: The objective is to test that Delete method is allowed to remove a existing individual subscription instance on NFV + ... Test title: DELETE an individual subscription + ... Test objective: The objective is to test that Delete method is allowed to remove a existing Virtualised Resources Quota Available Notification individual subscription instance on VNF ... Pre-conditions: The subscription with the given id exists ... Reference: section 11.4.3.3.5 - SOL003 v2.4.1 ... Config ID: Config_prod_VNFM ... Applicability: none ... Post-Conditions: none - Do Delete an individual subscription - Check HTTP Response Status Code Is 204 \ No newline at end of file + Delete Virtualised Resources Quota Available Notification individual subscription + Check HTTP Response Status Code Is 204 + Check Postcondition VNF Virtualised Resources Quota Available Notification individual Subscriptions is Deleted + \ No newline at end of file diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot index ed003b6c..a44300aa 100644 --- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot +++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot @@ -45,9 +45,14 @@ Check HTTP Response Header ContentType is Check Postcondition VNF Virtualised Resources Quota Available Notification Subscriptions Exists Log Checking that subscriptions exists - GET Virtualised Resources Quota Available Notification Subscriptions - -Do Post Individual Subscription + GET Virtualised Resources Quota Available Notification Subscriptions + +Check Postcondition VNF Virtualised Resources Quota Available Notification individual Subscriptions is Deleted + Log Check Postcondition Subscription is deleted + Get Virtualised Resources Quota Available Notification individual subscription + Check HTTP Response Status Code Is 404 + +Send Post request for Virtualised Resources Quota Available Notification Individual Subscription log Trying to perform a POST. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -55,7 +60,7 @@ Do Post Individual Subscription ${outputResponse}= Output response Set Global Variable @{response} ${outputResponse} -Do Put Individual Subscription +Put Virtualised Resources Quota Available Notification individual Subscription log Trying to perform a PUT. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -63,7 +68,7 @@ Do Put Individual Subscription ${outputResponse}= Output response Set Global Variable @{response} ${outputResponse} -Do Patch Individual Subscription +Patch Virtualised Resources Quota Available Notification individual subscription log Trying to perform a Patch. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -71,7 +76,7 @@ Do Patch Individual Subscription ${outputResponse}= Output response Set Global Variable @{response} ${outputResponse} -Do Get individual subscription +Get Virtualised Resources Quota Available Notification individual subscription log Trying to get information about an individual subscription Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -79,7 +84,7 @@ Do Get individual subscription ${outputResponse}= Output response Set Global Variable @{response} ${outputResponse} -Do Delete an individual subscription +Delete Virtualised Resources Quota Available Notification individual subscription log Try to delete an individual subscription Set Headers {"Accept":"${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} @@ -87,7 +92,7 @@ Do Delete an individual subscription ${outputResponse}= Output response Set Global Variable @{response} ${outputResponse} - Send Post request for new Virtualised Resources Quota Available Notification subscription +Send Post request for new Virtualised Resources Quota Available Notification subscription Log Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} @@ -97,7 +102,7 @@ Do Delete an individual subscription ${outputResponse}= Output response Set Global Variable @{response} ${outputResponse} - Send Post request for new Virtualised Resources Quota Available Notification subscription - DUPLICATION +Send Post request for new Virtualised Resources Quota Available Notification subscription - DUPLICATION Log Trying to create a subscription with an already created content Pass Execution If ${NFVO_DUPLICATION} == 0 NVFO is not permitting duplication. Skipping the test Set Headers {"Accept": "${ACCEPT}"} diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot index 9c3cea78..45848b99 100644 --- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot +++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot @@ -142,7 +142,7 @@ Check HTTP Response Body Json Schema Is Check HTTP Response Header ContentType is [Arguments] ${expected_contentType} Log Validate content type - Should Be Equal ${response[0]['headers']['Content-Type']} ${expected_contentType} + Should Be Equal as Strings ${response[0]['headers']['Content-Type']} ${expected_contentType} Log Content Type validated Do POST New nsInstance -- GitLab