Merge 5.3.1-dev-SOL011 into 5.3.1-dev

Giacomo Berninirequested to merge
5.3.1-dev-SOL011 into 5.3.1-dev

Merge request reports

SOL011/NSInstanceUsageNotification-API/environment/variables.txt

+1 −0
Changes for SOL011/NSInstanceUsageNotification-API/environment/variables.txt: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -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

SOL011/NSInstanceUsageNotification-API/ApiVersion.robot

+21 −10
Changes for SOL011/NSInstanceUsageNotification-API/ApiVersion.robot: 21 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -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
@@ -134,6 +134,7 @@ DELETE API Version with apiMajorVerion - Method not implemented 
POST API Version

    Set Headers    {"Accept":"${ACCEPT_JSON}"} 

    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}
@@ -141,6 +142,7 @@ POST API Version 
GET API Version

    Set Headers    {"Accept":"${ACCEPT_JSON}"} 

    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}
@@ -148,6 +150,8 @@ GET API Version 
PUT API Version

    Set Headers    {"Accept":"${ACCEPT_JSON}"} 

    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}
@@ -155,6 +159,7 @@ PUT API Version 
PATCH API Version

    Set Headers    {"Accept":"${ACCEPT_JSON}"} 

    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}
@@ -162,6 +167,7 @@ PATCH API Version 
DELETE API Version

    Set Headers    {"Accept":"${ACCEPT_JSON}"} 

    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}
@@ -169,6 +175,7 @@ DELETE API Version 
POST API Version with apiMajorVersion

    Set Headers    {"Accept":"${ACCEPT_JSON}"} 

    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}
@@ -176,6 +183,7 @@ POST API Version with apiMajorVersion 
GET API Version with apiMajorVersion

    Set Headers    {"Accept":"${ACCEPT_JSON}"} 

    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}
@@ -183,6 +191,7 @@ GET API Version with apiMajorVersion 
PUT API Version with apiMajorVersion

    Set Headers    {"Accept":"${ACCEPT_JSON}"} 

    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}
@@ -190,6 +199,7 @@ PUT API Version with apiMajorVersion 
PATCH API Version with apiMajorVersion

    Set Headers    {"Accept":"${ACCEPT_JSON}"} 

    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}
@@ -197,6 +207,7 @@ PATCH API Version with apiMajorVersion 
DELETE API Version with apiMajorVersion

    Set Headers    {"Accept":"${ACCEPT_JSON}"} 

    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}

SOL011/NSInstanceUsageNotification-API/IndividualSubscription.robot

+8 −8
Changes for SOL011/NSInstanceUsageNotification-API/IndividualSubscription.robot: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -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

SOL011/NSInstanceUsageNotification-API/NSInstanceUsageNotificationKeywords.robot

+33 −0
Changes for SOL011/NSInstanceUsageNotification-API/NSInstanceUsageNotificationKeywords.robot: 33 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ Check subscription existence 
    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}"}

    Set Headers    {"Accept":"${API_VERSION}"}

    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 

    Integer    response status    200
@@ -46,6 +48,8 @@ POST subscriptions 
    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}"}

    Set Headers    {"Accept":"${API_VERSION}"}

    ${body}=    Get File    jsons/NsInstanceUsageSubscriptionRequest.json

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    allow_redirects=false

	${outputResponse}=    Output    response
@@ -57,6 +61,8 @@ POST subscriptions DUPLICATION 
    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}"}

    Set Headers    {"Accept":"${API_VERSION}"}

    ${body}=    Get File    jsons/NsInstanceUsageSubscriptionRequest.json

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}       allow_redirects=false

	${outputResponse}=    Output    response
@@ -68,6 +74,8 @@ POST subscriptions NO DUPLICATION 
    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}"}

    Set Headers    {"Accept":"${API_VERSION}"}

    ${body}=    Get File    jsons/NsInstanceUsageSubscriptionRequest.json

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    allow_redirects=false

	${outputResponse}=    Output    response
@@ -78,6 +86,8 @@ GET Subscriptions 
    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}"}

    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}
@@ -136,6 +152,7 @@ PUT subscriptions 
    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}"}

    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
@@ -145,6 +162,7 @@ PATCH subscriptions 
    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}"}

    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
@@ -154,6 +172,7 @@ DELETE subscriptions 
    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}"}

    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
@@ -163,6 +182,7 @@ POST Individual Subscription 
    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}"}

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
@@ -171,6 +191,7 @@ 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}"}

    Set Headers    {"Accept":"${API_VERSION}"}

    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
@@ -180,6 +201,7 @@ PUT Individual Subscription 
    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}"}

    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
@@ -189,6 +211,7 @@ PATCH Individual Subscription 
    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}"}

    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
@@ -197,6 +220,7 @@ DELETE Individual subscription 
    log    Trying to delete an individual subscription

    Set Headers  {"Accept":"${ACCEPT}"}  

    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}
@@ -205,6 +229,7 @@ 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}"}

    Set Headers    {"Accept":"${API_VERSION}"}

    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}

    Integer    response status    200

    Validate Json    response body    subscription.schema.json
@@ -215,6 +240,7 @@ POST NS Instance Usage Notification 
    Set Headers  {"Accept":"${ACCEPT_JSON}"}  

    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}

    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
@@ -270,6 +299,7 @@ JWT Encode 
POST subscriptions with permitted authorization scope

    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions

    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}
@@ -281,6 +311,7 @@ POST subscriptions with permitted authorization scope 
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":"${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}
@@ -292,6 +323,7 @@ POST subscriptions with not permitted authorization scope 
GET Individual subscription with permitted authorization scope

    log    Trying to get information about an individual subscription

    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}
@@ -302,6 +334,7 @@ GET Individual subscription with permitted authorization scope 
GET Individual subscription with not permitted authorization scope

    log    Trying to get information about an individual subscription

    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}

SOL011/NSInstanceUsageNotification-API/NotificationEndpoint.robot

+1 −1
Changes for SOL011/NSInstanceUsageNotification-API/NotificationEndpoint.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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