diff --git a/SOL011/NSInstanceUsageNotification-API/ApiVersion.robot b/SOL011/NSInstanceUsageNotification-API/ApiVersion.robot index aab84ef8fc008ef7f44a0b5f59d8d9ee3e6c8901..2d81ee08157d05ea171fafa3e82a56512170b738 100644 --- a/SOL011/NSInstanceUsageNotification-API/ApiVersion.robot +++ b/SOL011/NSInstanceUsageNotification-API/ApiVersion.robot @@ -13,7 +13,7 @@ POST API Version - Method not implemented ... Test title: POST API version - Method not implemented ... Test objective: The objective is to test that POST method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -25,7 +25,7 @@ GET API Version ... Test title: GET API Version ... Test objective: The objective is to test that GET method successfully return ApiVersionInformation ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -38,7 +38,7 @@ PUT API Version - Method not implemented ... Test title: PUT API Version - Method not implemented ... Test objective: The objective is to test that PUT method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -50,7 +50,7 @@ PATCH API Version - Method not implemented ... Test title: PATCH API Version - Method not implemented ... Test objective: The objective is to test that PATCH method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -62,7 +62,7 @@ DELETE API Version - Method not implemented ... Test title: DELETE API Version - Method not implemented ... Test objective: The objective is to test that DELETE method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -74,7 +74,7 @@ POST API Version with apiMajorVerion - Method not implemented ... Test title: POST API version with apiMajorVerion - Method not implemented ... Test objective: The objective is to test that POST method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -86,7 +86,7 @@ GET API Version with apiMajorVerion ... Test title: GET API Version with apiMajorVerion ... Test objective: The objective is to test that GET method successfully return ApiVersionInformation ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -99,7 +99,7 @@ PUT API Version with apiMajorVerion - Method not implemented ... Test title: PUT API Version with apiMajorVerion - Method not implemented ... Test objective: The objective is to test that PUT method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -111,7 +111,7 @@ PATCH API Version with apiMajorVerion - Method not implemented ... Test title: PATCH API Version with apiMajorVerion - Method not implemented ... Test objective: The objective is to test that PATCH method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -123,7 +123,7 @@ DELETE API Version with apiMajorVerion - Method not implemented ... Test title: DELETE API Version with apiMajorVerion - Method not implemented ... Test objective: The objective is to test that DELETE method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -133,70 +133,81 @@ DELETE API Version with apiMajorVerion - Method not implemented *** Keywords *** POST API Version Set Headers {"Accept":"${ACCEPT_JSON}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Post ${apiRoot}/${apiName}/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} GET API Version Set Headers {"Accept":"${ACCEPT_JSON}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Get ${apiRoot}/${apiName}/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} PUT API Version Set Headers {"Accept":"${ACCEPT_JSON}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} + Set Headers {"Accept":"${API_VERSION}"} Put ${apiRoot}/${apiName}/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} PATCH API Version Set Headers {"Accept":"${ACCEPT_JSON}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Patch ${apiRoot}/${apiName}/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} DELETE API Version Set Headers {"Accept":"${ACCEPT_JSON}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Delete ${apiRoot}/${apiName}/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} POST API Version with apiMajorVersion Set Headers {"Accept":"${ACCEPT_JSON}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Post ${apiRoot}/${apiName}/v1/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} GET API Version with apiMajorVersion Set Headers {"Accept":"${ACCEPT_JSON}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Get ${apiRoot}/${apiName}/v1/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} PUT API Version with apiMajorVersion Set Headers {"Accept":"${ACCEPT_JSON}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Put ${apiRoot}/${apiName}/v1/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} PATCH API Version with apiMajorVersion Set Headers {"Accept":"${ACCEPT_JSON}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Patch ${apiRoot}/${apiName}/v1/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} DELETE API Version with apiMajorVersion Set Headers {"Accept":"${ACCEPT_JSON}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Delete ${apiRoot}/${apiName}/v1/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} diff --git a/SOL011/NSInstanceUsageNotification-API/IndividualSubscription.robot b/SOL011/NSInstanceUsageNotification-API/IndividualSubscription.robot index f5ddf660efa0205352f4ac71ed57482e671a29ed..6c7bfa23c09c1d70ea98403ce0105819e63d5073 100644 --- a/SOL011/NSInstanceUsageNotification-API/IndividualSubscription.robot +++ b/SOL011/NSInstanceUsageNotification-API/IndividualSubscription.robot @@ -12,7 +12,7 @@ POST Individual Subscription - Method not implemented ... Test title: POST Individual Subscription - Method not implemented ... Test objective: The objective is to test that POST method is not implemented ... Pre-conditions: none - ... Reference: Clause 8.5.4.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.4.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -24,7 +24,7 @@ GET Information about an individual subscription - Successful ... Test title: GET Information about an individual subscription - Successful ... Test objective: The objective is to test the retrieval of NS instance usage notification subscription and perform a JSON schema validation of the returned subscription data structure ... Pre-conditions: An NS instance is instantiated. At least one NS instance usage notification subscription is available in the NFVO. - ... Reference: Clause 8.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -37,7 +37,7 @@ PUT an individual subscription - Method not implemented ... Test title: PUT an individual subscription - Method not implemented ... Test objective: The objective is to test that PUT method is not implemented ... Pre-conditions: none - ... Reference: Clause 8.5.4.3.3 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.4.3.3 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -49,7 +49,7 @@ PATCH an individual subscription - Method not implemented ... Test title: PATCH an individual subscription - Method not implemented ... Test objective: The objective is to test that PATCH method is not implemented ... Pre-conditions: none - ... Reference: Clause 8.5.4.3.4 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.4.3.4 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -61,7 +61,7 @@ DELETE an individual subscription ... Test title: DELETE an individual subscription ... Test objective: The objective is to test that DELETE method deletes an individual subscription ... Pre-conditions: At least one instance usage notification subscription is available in the NFVO - ... Reference: Clause 8.5.4.3.5 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.4.3.5 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: The NS instance usage notification subscription is not available anymore on NFVO @@ -74,7 +74,7 @@ GET Information about an individual subscription - NOT FOUND ... Test title: GET Information about an individual subscription - NOT FOUND ... Test objective: The objective is to test that the retrieval of individual NS instance usage notification subscription fails when using an invalid resource identifier. ... Pre-conditions: An NS instance is instantiated. At least one NS instance usage notification subscription is available in the NFVO. - ... Reference: Clause 8.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -86,7 +86,7 @@ GET Information about an individual subscription with permitted authorization sc ... Test title: GET Information about an individual subscription with permitted authorization scope - Successful ... Test objective: The objective is to test the retrieval of NS instance usage notification subscription and perform a JSON schema validation of the returned subscription data structure ... Pre-conditions: An NS instance is instantiated. At least one NS instance usage notification subscription is available in the NFVO. - ... Reference: Clause 8.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -98,7 +98,7 @@ GET Information about an individual subscription with not permitted authorizatio ... Test title: GET Information about an individual subscription with not permitted authorization scope - Successful ... Test objective: The objective is to test the retrieval of NS instance usage notification subscription and perform a JSON schema validation of the returned subscription data structure ... Pre-conditions: An NS instance is instantiated. At least one NS instance usage notification subscription is available in the NFVO. - ... Reference: Clause 8.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none diff --git a/SOL011/NSInstanceUsageNotification-API/NSInstanceUsageNotificationKeywords.robot b/SOL011/NSInstanceUsageNotification-API/NSInstanceUsageNotificationKeywords.robot index cc1a04fcb8d4381e153ff00e3844a37a7c14b48a..cf580aacf2190b54938c975feb30ee73e762cb09 100644 --- a/SOL011/NSInstanceUsageNotification-API/NSInstanceUsageNotificationKeywords.robot +++ b/SOL011/NSInstanceUsageNotification-API/NSInstanceUsageNotificationKeywords.robot @@ -26,7 +26,9 @@ Check HTTP Response Header Contains Resource URI Check subscription existence Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} + Set Headers {"Accept":"${API_VERSION}"} Get ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} Integer response status 200 @@ -45,7 +47,9 @@ POST subscriptions Log Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} + Set Headers {"Accept":"${API_VERSION}"} ${body}= Get File jsons/NsInstanceUsageSubscriptionRequest.json Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body} allow_redirects=false ${outputResponse}= Output response @@ -56,7 +60,9 @@ POST subscriptions DUPLICATION Pass Execution If ${NFVO_DUPLICATION} == 1 NFVO is permitting duplication. Skipping the test Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} + Set Headers {"Accept":"${API_VERSION}"} ${body}= Get File jsons/NsInstanceUsageSubscriptionRequest.json Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body} allow_redirects=false ${outputResponse}= Output response @@ -67,7 +73,9 @@ POST subscriptions NO DUPLICATION Pass Execution If ${NFVO_DUPLICATION} == 0 NFVO is not permitting duplication. Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} + Set Headers {"Accept":"${API_VERSION}"} ${body}= Get File jsons/NsInstanceUsageSubscriptionRequest.json Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body} allow_redirects=false ${outputResponse}= Output response @@ -77,7 +85,9 @@ GET Subscriptions Log Get the list of active subscriptions Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} + Set Headers {"Accept":"${API_VERSION}"} Log Execute Query and validate response Get ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${outputResponse}= Output response @@ -87,6 +97,7 @@ Get subscriptions with all_fields attribute selector Log Get the list of active subscriptions, using fields Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions?all_fields ${output}= Output response Set Suite Variable ${response} ${output} @@ -95,6 +106,7 @@ Get subscriptions with exclude_default attribute selector Log Get the list of active subscriptions, using fields Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_default ${output}= Output response Set Suite Variable ${response} ${output} @@ -103,6 +115,7 @@ Get subscriptions with fields attribute selector Log Get the list of active subscriptions, using fields Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions?fields=${fields} ${output}= Output response Set Suite Variable ${response} ${output} @@ -111,6 +124,7 @@ Get subscriptions with exclude_fields attribute selector Log Get the list of active subscriptions, using fields Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions?exclude_fields=${fields} ${output}= Output response Set Suite Variable ${response} ${output} @@ -119,6 +133,7 @@ GET subscriptions with filter Log Get the list of active subscriptions using a filter Set Headers {"Accept": "${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter} ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} @@ -127,6 +142,7 @@ Get subscriptions - invalid filter Log Get the list of active subscriptions using an invalid filter Set Headers {"Accept": "${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid} ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} @@ -135,7 +151,8 @@ PUT subscriptions Log Trying to perform a PUT. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Put ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} @@ -144,7 +161,8 @@ PATCH subscriptions Log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Patch ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} @@ -153,7 +171,8 @@ DELETE subscriptions Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Delete ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} @@ -162,7 +181,8 @@ POST Individual Subscription log Trying to perform a POST. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} @@ -170,7 +190,8 @@ POST Individual Subscription GET 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}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Get ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} @@ -179,7 +200,8 @@ PUT Individual Subscription log Trying to perform a PUT. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Put ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} @@ -188,7 +210,8 @@ PATCH Individual Subscription log Trying to perform a PATCH. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Patch ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} @@ -196,7 +219,8 @@ PATCH Individual Subscription DELETE Individual subscription log Trying to delete an individual subscription Set Headers {"Accept":"${ACCEPT}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Delete ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} @@ -204,7 +228,8 @@ DELETE Individual subscription Check resource existence and get CallbackUri Set Headers {"Accept":"${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Get ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} Integer response status 200 Validate Json response body subscription.schema.json @@ -214,7 +239,8 @@ POST NS Instance Usage Notification log Trying to perform a POST to deliver notification Set Headers {"Accept":"${ACCEPT_JSON}"} Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} ${template} = Get File jsons/NSInstanceUsageNotification.json ${body}= Format String ${template} subscriptionId=${subscriptionId} Post ${callbackResp} ${body} @@ -225,6 +251,7 @@ Get subscriptions with exclude_default and fields attribute selector Log Get the list of active subscriptions, using fields Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions?fields=${fields}&exclude_default ${output}= Output response Set Suite Variable ${response} ${output} @@ -239,6 +266,7 @@ Check Postcondition Subscription Is Set Log Trying to get the subscription Set Headers {"Accept": "${ACCEPT_JSON}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']} ${output}= Output response Set Suite Variable ${response} ${output} @@ -247,6 +275,7 @@ Check Postcondition Subscription Is Set Check Postcondition Subscription Resource Returned in Location Header Is Available Log Going to check postcondition Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} GET ${response['headers']['Location']} Integer response status 200 Log Received a 200 OK as expected @@ -269,7 +298,8 @@ JWT Encode [Return] ${encoded} POST subscriptions with permitted authorization scope Log Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} ${scope_value}= Create Dictionary scopeValue=${SUBSCRIPTION_SCOPE} ${authorizationToken}= JWT Encode payload=${scope_value} key='' algorithm=${OAUTH_Encryption_ALGORITHM} @@ -280,7 +310,8 @@ POST subscriptions with permitted authorization scope Set Global Variable ${response} ${outputResponse} POST subscriptions with not permitted authorization scope Log Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} ${scope_value}= Create Dictionary scopeValue=${NEG_SCOPE} ${authorizationToken}= JWT Encode payload=${scope_value} key='' algorithm=${OAUTH_Encryption_ALGORITHM} @@ -291,7 +322,8 @@ POST subscriptions with not permitted authorization scope Set Global Variable ${response} ${outputResponse} GET Individual subscription with permitted authorization scope log Trying to get information about an individual subscription - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} ${scope_value}= Create Dictionary scopeValue=${SUBSCRIPTION_SCOPE} ${authorizationToken}= JWT Encode payload=${scope_value} key='' algorithm=${OAUTH_Encryption_ALGORITHM} @@ -301,7 +333,8 @@ GET Individual subscription with permitted authorization scope Set Global Variable ${response} ${outputResponse} GET Individual subscription with not permitted authorization scope log Trying to get information about an individual subscription - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} ${scope_value}= Create Dictionary scopeValue=${NEG_SCOPE} ${authorizationToken}= JWT Encode payload=${scope_value} key='' algorithm=${OAUTH_Encryption_ALGORITHM} diff --git a/SOL011/NSInstanceUsageNotification-API/NotificationEndpoint.robot b/SOL011/NSInstanceUsageNotification-API/NotificationEndpoint.robot index 65c1e98a1e435e87b97e010149c248a8c5d70b5d..f7a197023dcd15acc62405123b6550a9c4772c60 100644 --- a/SOL011/NSInstanceUsageNotification-API/NotificationEndpoint.robot +++ b/SOL011/NSInstanceUsageNotification-API/NotificationEndpoint.robot @@ -13,7 +13,7 @@ NS Instance Usage Notification ... Test title: NS Instance Usage Notification ... Test objective: The objective is to test that NS Instance Usage Notification is delivered with success to the notification consumer ... Pre-conditions: A subscription for instance usage notification is available in the NFVO. - ... Reference: Clause 8.5.5.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.5.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_Notif_Endpoint ... Applicability: none ... Post-Conditions: none diff --git a/SOL011/NSInstanceUsageNotification-API/Notifications.robot b/SOL011/NSInstanceUsageNotification-API/Notifications.robot index d9e25466f9ac234dfbee04c181957b669ef52b3b..13348278aacdf4648145c997bfb957d9e2a00e21 100644 --- a/SOL011/NSInstanceUsageNotification-API/Notifications.robot +++ b/SOL011/NSInstanceUsageNotification-API/Notifications.robot @@ -13,7 +13,7 @@ NS Instance Usage START Notification ... Test title: NS Instance Usage START Notification ... Test objective: The objective is to test the dispatch of NS Instance Usage Start Notification when the usage of an NS instance is started, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system. ... Pre-conditions: A subscription for NS instance usage notification is available in the NFVO. - ... Reference: Clause 8.5.5.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.5.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -27,7 +27,7 @@ NS Instance Usage END Notification ... Test title: NS Instance Usage END Notification ... Test objective: The objective is to test the dispatch of NS Instance Usage End Notification when the usage of an NS instance is ended, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system. ... Pre-conditions: A subscription for NS instance usage notification is available in the NFVO. - ... Reference: Clause 8.5.5.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.5.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none diff --git a/SOL011/NSInstanceUsageNotification-API/Subscriptions.robot b/SOL011/NSInstanceUsageNotification-API/Subscriptions.robot index f0363ae8d0ebff6921da2f607bd7020aff4597d7..b2376dc38f6a8bfd907a1e1b6c7b1ec579c71484 100644 --- a/SOL011/NSInstanceUsageNotification-API/Subscriptions.robot +++ b/SOL011/NSInstanceUsageNotification-API/Subscriptions.robot @@ -12,7 +12,7 @@ POST Create a new subscription ... Test title: POST Create a new subscription ... Test objective: The objective is to test that POST method creates a subscription ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: Subscription is created in the NFVO @@ -28,7 +28,7 @@ POST Create a new Subscription - DUPLICATION ... Test title: POST Create a new subscription - DUPLICATION ... Test objective: The objective is to test that POST method creates a duplicate subscription ... Pre-conditions: A subscription shall already exist - ... Reference: Clause 8.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: Duplication supported by NFVO-C ... Post-Conditions: Duplicate subscription is created in the NFVO @@ -44,7 +44,7 @@ POST Create a new Subscription - NO-DUPLICATION ... Test title: POST Create a new subscription - NO-DUPLICATION ... Test objective: The objective is to test that POST method cannot create a duplicate subscription ... Pre-conditions: A subscription shall already exist - ... Reference: Clause 8.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: Duplication NOT supported by NFVO-C ... Post-Conditions: Duplicate subscription is not created in the NFVO @@ -58,7 +58,7 @@ GET Subscriptions ... Test title: GET Subscriptions ... Test objective: The objective is to test that GET method retrieves the list of existing subscriptions ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -71,7 +71,7 @@ GET Subscription - Filter ... Test title: GET Subscription - Filter ... Test objective: The objective is GET the list of active subscriptions using a filter ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -84,7 +84,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters ... Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters ... Test objective: The objective is GET the list of active subscriptions using an invalid filter ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -97,7 +97,7 @@ GET subscriptions - Bad Request Response too Big ... Test title: GET subscriptions - Bad Request Response too Big ... Test objective: The objective is test that the retrieval of active subscriptions list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response. ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -110,7 +110,7 @@ GET subscriptions with "all_fields" attribute selector ... Test title: GET subscriptions with "all_fields" attribute selector ... Test objective: The objective is to retrieve the list of active subscriptions with "all_fields" attribute selector ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -123,7 +123,7 @@ GET subscriptions with "exclude_default" attribute selector ... Test title: GET subscriptions with "exclude_default" attribute selector ... Test objective: The objective is to retrieve the list of active subscriptions with "exclude_default"s attribute selector ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -136,7 +136,7 @@ GET subscriptions with "fields" attribute selector ... Test title: GET subscriptions with "fields" attribute selector ... Test objective: The objective is to retrieve the list of active subscriptions with "fields" attribute selector ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -149,7 +149,7 @@ GET subscriptions with "exclude_fields" attribute selector ... Test title: GET subscriptions with "exclude_fields" attribute selector ... Test objective: The objective is to retrieve the list of active subscriptions with "exclude_fields" attribute selector ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -162,7 +162,7 @@ GET Subscriptions as Paged Response ... Test title: GET Subscriptions as Paged Response ... Test objective: The objective is to test that GET method retrieve the list of existing subscriptions as paged response. ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -175,7 +175,7 @@ PUT subscriptions - Method not implemented ... Test title: PUT subscriptions - Method not implemented ... Test objective: The objective is to test that PUT method cannot modify a NS instance usage subscription ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.3 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.3 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -187,7 +187,7 @@ PATCH subscriptions - Method not implemented ... Test title: PATCH subscriptions - Method not implemented ... Test objective: The objective is to test that PUT method cannot modify a NS instance usage subscription ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.4 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.4 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -199,7 +199,7 @@ DELETE subscriptions - Method not implemented ... Test title: DELETE subscriptions - Method not implemented ... Test objective: The objective is to test that DELETE method cannot delete a NS instance usage subscription ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.5 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.5 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: Subscriptions are not deleted @@ -212,7 +212,7 @@ GET subscriptions with "exclude_default" and "fields" attribute selector ... Test title: GET subscriptions with "exclude_default" and "fields" attribute selector ... Test objective: The objective is to retrieve the list of active subscriptions with "exclude_default" and "fields" attribute selector ... Pre-conditions: - ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -224,7 +224,7 @@ POST Create a new subscription with permitted authorization scope ... Test title: POST Create a new subscription with permitted authorization scope ... Test objective: The objective is to test that POST method creates a subscription ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: Subscription is created in the NFVO @@ -239,7 +239,7 @@ POST Create a new subscription with NOT permitted authorization scope ... Test title: POST Create a new subscription with not permitted authorization scope ... Test objective: The objective is to test that POST method creates a subscription ... Pre-conditions: none - ... Reference: Clause 8.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 8.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: Subscription is created in the NFVO diff --git a/SOL011/NSInstanceUsageNotification-API/environment/variables.txt b/SOL011/NSInstanceUsageNotification-API/environment/variables.txt index 5ccf61726e71e0b3495b685c575542aabf94ec44..bae57eb88ea278f63a8015096c6b5ac11bfbba22 100644 --- a/SOL011/NSInstanceUsageNotification-API/environment/variables.txt +++ b/SOL011/NSInstanceUsageNotification-API/environment/variables.txt @@ -8,6 +8,7 @@ ${CONTENT_TYPE_JSON} application/json ${ACCEPT} application/json ${AUTH_USAGE} 1 ${ACCEPT_JSON} application/json +${API_VERSION} 1.0.0 ${apiRoot} / ${apiName} nsiun ${apiVersion} v1 diff --git a/SOL011/NSLifecycleOperationGranting-API/ApiVersion.robot b/SOL011/NSLifecycleOperationGranting-API/ApiVersion.robot index 6d2eb96b1fa49a8e869db0e42d95cdab61cb4792..7c6b1feb94a94670c68093ba76e0b33d8eb307c3 100644 --- a/SOL011/NSLifecycleOperationGranting-API/ApiVersion.robot +++ b/SOL011/NSLifecycleOperationGranting-API/ApiVersion.robot @@ -13,7 +13,7 @@ POST API Version - Method not implemented ... Test title: POST API version - Method not implemented ... Test objective: The objective is to test that POST method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -25,7 +25,7 @@ GET API Version ... Test title: GET API Version ... Test objective: The objective is to test that GET method successfully return ApiVersionInformation ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -38,7 +38,7 @@ PUT API Version - Method not implemented ... Test title: PUT API Version - Method not implemented ... Test objective: The objective is to test that PUT method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -50,7 +50,7 @@ PATCH API Version - Method not implemented ... Test title: PATCH API Version - Method not implemented ... Test objective: The objective is to test that PATCH method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -62,7 +62,7 @@ DELETE API Version - Method not implemented ... Test title: DELETE API Version - Method not implemented ... Test objective: The objective is to test that DELETE method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -74,7 +74,7 @@ POST API Version with apiMajorVerion - Method not implemented ... Test title: POST API version with apiMajorVerion - Method not implemented ... Test objective: The objective is to test that POST method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -86,7 +86,7 @@ GET API Version with apiMajorVerion ... Test title: GET API Version with apiMajorVerion ... Test objective: The objective is to test that GET method successfully return ApiVersionInformation ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -99,7 +99,7 @@ PUT API Version with apiMajorVerion - Method not implemented ... Test title: PUT API Version with apiMajorVerion - Method not implemented ... Test objective: The objective is to test that PUT method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -111,7 +111,7 @@ PATCH API Version with apiMajorVerion - Method not implemented ... Test title: PATCH API Version with apiMajorVerion - Method not implemented ... Test objective: The objective is to test that PATCH method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -123,7 +123,7 @@ DELETE API Version with apiMajorVerion - Method not implemented ... Test title: DELETE API Version with apiMajorVerion - Method not implemented ... Test objective: The objective is to test that DELETE method is not implemented ... Pre-conditions: none - ... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v4.4.1 + ... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -132,70 +132,80 @@ DELETE API Version with apiMajorVerion - Method not implemented *** Keywords *** POST API Version - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Post ${apiRoot}/${apiName}/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} GET API Version - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Get ${apiRoot}/${apiName}/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} PUT API Version - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Put ${apiRoot}/${apiName}/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} PATCH API Version - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Patch ${apiRoot}/${apiName}/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} DELETE API Version - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Delete ${apiRoot}/${apiName}/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} POST API Version with apiMajorVersion - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Post ${apiRoot}/${apiName}/v1/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} GET API Version with apiMajorVersion - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Get ${apiRoot}/${apiName}/v1/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} PUT API Version with apiMajorVersion - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Put ${apiRoot}/${apiName}/v1/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} PATCH API Version with apiMajorVersion - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Patch ${apiRoot}/${apiName}/v1/api_versions ${outputResponse}= Output response Set Global Variable ${response} ${outputResponse} DELETE API Version with apiMajorVersion - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} Delete ${apiRoot}/${apiName}/v1/api_versions ${outputResponse}= Output response diff --git a/SOL011/NSLifecycleOperationGranting-API/Grants.robot b/SOL011/NSLifecycleOperationGranting-API/Grants.robot index 7742892b47d294cab1fb4f6bb1c666fe6cc13aeb..a03c502156ffdaf4c4efbff0a322b9ce69bf3ac8 100644 --- a/SOL011/NSLifecycleOperationGranting-API/Grants.robot +++ b/SOL011/NSLifecycleOperationGranting-API/Grants.robot @@ -12,7 +12,7 @@ Requests a grant for a particular NS lifecycle operation ... Test title: Requests a grant for a particular NS lifecycle operation ... Test objective: The objective is to request a grant for a particular NS lifecycle operation and perform a JSON schema validation on the returned grant data structure ... Pre-conditions: - ... Reference: Clause 7.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: The NFVO can decide immediately what to respond to a grant request ... Post-Conditions: The grant information is available to the NFVO. @@ -27,7 +27,7 @@ Requests a grant for a particular NS lifecycle operation - Forbidden ... Test title: Requests a grant for a particular NS lifecycle operation - Forbidden ... Test objective: The objective is to request a grant for a particular NS lifecycle operation and the grant is rejected ... Pre-conditions: none - ... Reference: Clause 7.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -40,7 +40,7 @@ GET Grants - Method not implemented ... Test title: GET Grants - Method not implemented ... Test objective: The objective is to test that GET method is not allowed for Lifecycle operation granting ... Pre-conditions: none - ... Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.3.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -52,7 +52,7 @@ PUT Grants - Method not implemented ... Test title: PUT Grants - Method not implemented ... Test objective: The objective is to test that PUT method is not allowed for Lifecycle operation granting ... Pre-conditions: none - ... Reference: Clause 7.5.3.3.3 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.3.3.3 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -64,7 +64,7 @@ PATCH Grants - Method not implemented ... Test title: PATCH Grants - Method not implemented ... Test objective: The objective is to test that PATCH method is not allowed for Lifecycle operation granting ... Pre-conditions: none - ... Reference: Clause 7.5.3.3.4 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.3.3.4 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -76,7 +76,7 @@ DELETE Grants - Method not implemented ... Test title: DELETE Grants - Method not implemented ... Test objective: The objective is to test that DELETE method is not allowed for Lifecycle operation granting ... Pre-conditions: none - ... Reference: Clause 7.5.3.3.5 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.3.3.5 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: Resources are not deleted @@ -88,7 +88,7 @@ Requests a grant for a particular NS lifecycle operation with permitted authoriz ... Test title: Requests a grant for a particular NS lifecycle operation with permitted authorization scope ... Test objective: The objective is to request a grant for a particular NS lifecycle operation and perform a JSON schema validation on the returned grant data structure ... Pre-conditions: - ... Reference: Clause 7.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: The NFVO can decide immediately what to respond to a grant request ... Post-Conditions: The grant information is available to the NFVO. @@ -102,7 +102,7 @@ Requests a grant for a particular NS lifecycle operation with NOT permitted auth ... Test title: Requests a grant for a particular NS lifecycle operation with not permitted authorization scope ... Test objective: The objective is to request a grant for a particular NS lifecycle operation and perform a JSON schema validation on the returned grant data structure ... Pre-conditions: - ... Reference: Clause 7.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.3.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: The NFVO can decide immediately what to respond to a grant request ... Post-Conditions: The grant information is available to the NFVO. diff --git a/SOL011/NSLifecycleOperationGranting-API/IndividualGrant.robot b/SOL011/NSLifecycleOperationGranting-API/IndividualGrant.robot index 403ed67a492f9513af9cca24cec34f7e752940b5..1807b419d9a64536ae98dd7c03fcf3e54c1f71b8 100644 --- a/SOL011/NSLifecycleOperationGranting-API/IndividualGrant.robot +++ b/SOL011/NSLifecycleOperationGranting-API/IndividualGrant.robot @@ -15,7 +15,7 @@ POST Individual Grant - Method not implemented ... Test title: POST Individual Grant - Method not implemented ... Test objective: The objective is to test that POST method is not allowed for Lifecycle operation granting ... Pre-conditions: none - ... Reference: Clause 7.5.4.3.1 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.4.3.1 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -27,7 +27,7 @@ GET an individual grant - Successful ... Test title: GET an individual grant - Successful ... Test objective: The objective is to retrieve a grant for a particular NS Lifecycle Operation. ... Pre-conditions: The grant information is available to the NFVO - ... Reference: Clause 7.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -40,7 +40,7 @@ PUT an individual grant - Method not implemented ... Test title: PUT an individual grant - Method not implemented ... Test objective: The objective is to test that PUT method is not allowed to for Lifecycle operation granting ... Pre-conditions: none - ... Reference: Clause 7.5.4.3.3 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.4.3.3 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -52,7 +52,7 @@ PATCH an individual grant - Method not implemented ... Test title: PATCH an individual grant - Method not implemented ... Test objective: The objective is to test that PATCH method is not allowed to for Lifecycle operation granting ... Pre-conditions: none - ... Reference: Clause 7.5.4.3.4 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.4.3.4 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -64,7 +64,7 @@ DELETE an individual grant - Method not implemented ... Test title: DELETE an individual grant - Method not implemented ... Test objective: The objective is to test that DELETE method is not allowed to for Lifecycle operation granting ... Pre-conditions: none - ... Reference: Clause 7.5.4.3.5 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.4.3.5 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -76,7 +76,7 @@ GET an individual grant - NOT FOUND ... Test title: GET an individual grant - NOT FOUND ... Test objective: The objective is to test that the retrieval of individual grant for a particular Lifecycle operation fails when using an invalid resource identifier ... Pre-conditions: The grant information is available to the NFVO - ... Reference: Clause 7.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: Invalid resource identifier is used ... Post-Conditions: none @@ -88,7 +88,7 @@ GET an individual grant with permitted authorization scope - Successful ... Test title: GET an individual grant with permitted authorization scope - Successful ... Test objective: The objective is to retrieve a grant for a particular NS Lifecycle Operation. ... Pre-conditions: The grant information is available to the NFVO - ... Reference: Clause 7.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none @@ -100,7 +100,7 @@ GET an individual grant with not permitted authorization scope - Successful ... Test title: GET an individual grant with not permitted authorization scope - Successful ... Test objective: The objective is to retrieve a grant for a particular NS Lifecycle Operation. ... Pre-conditions: The grant information is available to the NFVO - ... Reference: Clause 7.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v4.5.1 + ... Reference: Clause 7.5.4.3.2 - ETSI GS NFV-SOL 011 [8] v5.3.1 ... Config ID: Config_prod_NFVO ... Applicability: none ... Post-Conditions: none diff --git a/SOL011/NSLifecycleOperationGranting-API/NSLCOperationGrantingKeywords.robot b/SOL011/NSLifecycleOperationGranting-API/NSLCOperationGrantingKeywords.robot index be8cfda5865acee80b51816df9749c1a442dc938..4fcb75551978352ff4993122929a991d9502480a 100644 --- a/SOL011/NSLifecycleOperationGranting-API/NSLCOperationGrantingKeywords.robot +++ b/SOL011/NSLifecycleOperationGranting-API/NSLCOperationGrantingKeywords.robot @@ -12,6 +12,7 @@ Send Post Request for Grant Set Headers {"Accept": "${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} ${body}= Get File jsons/grantNSLifecycleOperationRequest.json Post ${apiRoot}/${apiName}/${apiVersion}/grants ${body} ${body}= Output response @@ -23,6 +24,7 @@ Send Request for a new Grant Forbiden Operation Set Headers {"Accept": "${ACCEPT}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} ${body}= Get File jsons/grantRejected.json Post ${apiRoot}/${apiName}/${apiVersion}/grants ${body} ${body}= Output response @@ -52,7 +54,8 @@ Check HTTP Response Body Json Schema Is Get Grants Log Trying to perform a GET. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Get ${apiRoot}/${apiName}/${apiVersion}/grants ${body}= Output response Set Suite Variable ${response} ${body} @@ -60,7 +63,8 @@ Get Grants Put Grants 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}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Put ${apiRoot}/${apiName}/${apiVersion}/grants ${body}= Output response Set Suite Variable ${response} ${body} @@ -68,7 +72,8 @@ Put Grants Patch Grants 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}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Patch ${apiRoot}/${apiName}/${apiVersion}/grants ${body}= Output response Set Suite Variable ${response} ${body} @@ -77,7 +82,8 @@ Patch Grants Delete Grants Log Trying to perform a DELETE. This method should not be implemented Set Headers {"Accept":"${ACCEPT}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Delete ${apiRoot}/${apiName}/${apiVersion}/grants ${body}= Output response Set Suite Variable ${response} ${body} @@ -85,7 +91,8 @@ Delete Grants Get an individual grant - Successful log Trying to read an individual grant Set Headers {"Accept":"${ACCEPT}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Get ${response['headers']['Location']} Log Validate Status code Integer response status 200 @@ -93,7 +100,8 @@ Get an individual grant - Successful Get individual grant log Trying to read an individual grant Set Headers {"Accept":"${ACCEPT}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Get ${apiRoot}/${apiName}/${apiVersion}/grants/${grantId} ${body}= Output response Set Suite Variable ${response} ${body} @@ -101,7 +109,8 @@ Get individual grant Post individual Grant log Trying to create an individual grant Set Headers {"Accept":"${ACCEPT}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Get ${apiRoot}/${apiName}/${apiVersion}/grants/${grantId} ${body}= Output response Set Suite Variable ${response} ${body} @@ -109,7 +118,8 @@ Post individual Grant Put individual Grant Log Trying to update an individual grant. This method should not be implemented. Set Headers {"Accept":"${ACCEPT}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Put ${apiRoot}/${apiName}/${apiVersion}/grants/${grantId} ${body}= Output response Set Suite Variable ${response} ${body} @@ -117,7 +127,8 @@ Put individual Grant Patch individual Grant Log Trying to update an individual grant. This method should not be implemented. Set Headers {"Accept":"${ACCEPT}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Patch ${apiRoot}/${apiName}/${apiVersion}/grants/${grantId} ${body}= Output response Set Suite Variable ${response} ${body} @@ -125,7 +136,8 @@ Patch individual Grant Delete individual Grant Log Trying to delete an individual grant. This method should not be implemented. Set Headers {"Accept":"${ACCEPT}"} - Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"} + Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} Delete ${apiRoot}/${apiName}/${apiVersion}/grants/${grantId} ${body}= Output response Set Suite Variable ${response} ${body} @@ -139,6 +151,7 @@ Check Postcondition Grant Is Set Log Trying to get the subscription Set Headers {"Accept": "${ACCEPT}"} Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"} + Set Headers {"Accept":"${API_VERSION}"} GET ${apiRoot}/${apiName}/${apiVersion}/grants/${response['body']['id']} ${output}= Output response Set Suite Variable ${response} ${output} @@ -150,6 +163,7 @@ JWT Encode Send Post Request for Grant with permitted authorization scope Log Request a new Grant for an NS LCM operation by POST to ${apiRoot}/${apiName}/${apiVersion}/grants Set Headers {"Accept": "${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} ${scope_value}= Create Dictionary scopeValue=${OPERATION_GRANTING_SCOPE} ${authorizationToken}= JWT Encode payload=${scope_value} key='' algorithm=${OAUTH_Encryption_ALGORITHM} @@ -161,6 +175,7 @@ Send Post Request for Grant with permitted authorization scope Send Post Request for Grant with not permitted authorization scope Log Request a new Grant for an NS LCM operation by POST to ${apiRoot}/${apiName}/${apiVersion}/grants Set Headers {"Accept": "${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Set Headers {"Content-Type": "${CONTENT_TYPE}"} ${scope_value}= Create Dictionary scopeValue=${NEG_SCOPE} ${authorizationToken}= JWT Encode payload=${scope_value} key='' algorithm=${OAUTH_Encryption_ALGORITHM} @@ -172,6 +187,7 @@ Send Post Request for Grant with not permitted authorization scope Get individual grant with permitted authorization scope log Trying to read an individual grant Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Set Headers {"Content-Type":"${CONTENT_TYPE}"} ${scope_value}= Create Dictionary scopeValue=${OPERATION_GRANTING_SCOPE} ${authorizationToken}= JWT Encode payload=${scope_value} key='' algorithm=${OAUTH_Encryption_ALGORITHM} @@ -181,7 +197,8 @@ Get individual grant with permitted authorization scope Set Suite Variable ${response} ${body} Get individual grant with permitted not authorization scope log Trying to read an individual grant - Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${ACCEPT}"} + Set Headers {"Accept":"${API_VERSION}"} Set Headers {"Content-Type":"${CONTENT_TYPE}"} ${scope_value}= Create Dictionary scopeValue=${NEG_SCOPE} ${authorizationToken}= JWT Encode payload=${scope_value} key='' algorithm=${OAUTH_Encryption_ALGORITHM} diff --git a/SOL011/NSLifecycleOperationGranting-API/environment/variables.txt b/SOL011/NSLifecycleOperationGranting-API/environment/variables.txt index 816f5f1fcbbf1a9eee78b29b2bed11282aceb0d5..8b199c4c8d497ac07fdea7fdec29b75d1170233a 100644 --- a/SOL011/NSLifecycleOperationGranting-API/environment/variables.txt +++ b/SOL011/NSLifecycleOperationGranting-API/environment/variables.txt @@ -5,6 +5,7 @@ ${NFVO_SCHEMA} https ${AUTHORIZATION} Bearer QWxhZGRpbjpvcGVuIHNlc2FtZQ== ${CONTENT_TYPE} application/json ${ACCEPT} application/json +${API_VERSION} 1.0.0 ${AUTH_USAGE} 1 ${grantId} 6fc3539c-e602-4afa-8e13-962fb5a7d81d diff --git a/SOL011/README.md b/SOL011/README.md index f2eeb43ce529503d4f7d7ae0c8f4b05d8b01adcd..00e2d5cf95f63dc7cad3e63a8d6630045f7503ee 100644 --- a/SOL011/README.md +++ b/SOL011/README.md @@ -2,7 +2,7 @@ This folder includes the NFV API conformance test descriptions for NFV SOL011 APIs. -The reference spec version is v4.5.1. +The reference spec version is v5.3.1. ## Applicable Tests In addition to the SOL011 tests included in this folder for NS Instance Usage Notification API and NS Lifecycle Operation Granting API, the SOL011 tests make use of applicable SOL005 tests. @@ -15,17 +15,17 @@ The following SOL005 NSD Management conformance tests only are applicable to SOL | Resource | Applicable Test IDs | |---------------------------|-------------------------------| -| NS Descriptors | 5.3.1.1.1-10, 5.3.1.1.1-15-17 | +| NS Descriptors | 5.3.1.1.1-10, 5.3.1.1.15-19 | | Individual NS Descriptors | 5.3.1.2.1-2 | ### SOL011 NS Lifecycle Management -The interface follows the provisions specified in the clause 6 of ETSI GS NFV-SOL 005 [3] for the NS lifecycle management interface, except that the producer is NFVO-N and the consumer is NFVO-C. +The interface follows the provisions specified in the clause 6 of ETSI GS NFV-SOL 005 for the NS lifecycle management interface, except that the producer is NFVO-N and the consumer is NFVO-C. All of the SOL005 NS Lifecycle Management tests are applicable to SOL011, except for the following ones: | Resource | Not Applicable Test IDs | |---------------------------|-------------------------------| -| Update NS task | 5.3.2.5.1-6, 5.3.2.24.1 | +| Update NS task | 5.3.2.5.1-9, 5.3.2.24.1 | ### SOL011 NS Performance Management The interface follows the provisions specified in the clause 7 of ETSI GS NFV-SOL 005 for the performance management interface, except that the producer is NFVO-N and the consumer is NFVO-C.