Commit 8d895f69 authored by Najam UI Hassan's avatar Najam UI Hassan
Browse files

added majorApiVersion and remove issues

parent ba41f1dc

SOL003/VNFIndicator-API/ApiVersion.robot

+5 −5
Original line number Diff line number Diff line
@@ -169,35 +169,35 @@ DELETE API Version 
POST API Version with apiMajorVersion

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/v1/api_version

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version

    ${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}"}

    Get    ${apiRoot}/${apiName}/v1/api_version

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version

    ${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}"}

    Put    ${apiRoot}/${apiName}/v1/api_version

    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version

    ${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}"}

    Patch    ${apiRoot}/${apiName}/v1/api_version

    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version

    ${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}"}

    Delete    ${apiRoot}/${apiName}/v1/api_version

    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot

+45 −45
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Get All VNF Indicators Subscriptions 
    Log    Trying to get the list of subscriptions

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

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

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    # Integer    response status    200
@@ -36,7 +36,7 @@ Get VNF Indicators Subscriptions with filter 
    Log    Trying to get the list of subscriptions using filters

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    # Integer    response status    200
@@ -52,7 +52,7 @@ Get VNF Indicators Subscriptions with invalid filter 
    Log    Trying to get the list of subscriptions using filters with wrong attribute name

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    # Integer    response status    400
@@ -69,7 +69,7 @@ Get VNF Indicators Subscriptions with invalid resource endpoint 
    Log    Trying to perform a request on a Uri which doesn't exist

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    # Integer    response status    404
@@ -86,7 +86,7 @@ Get VNF Indicators Subscriptions with invalid authentication token 
    Log    Trying to perform a negative get, using wrong authorization bearer

    Pass Execution If    ${AUTH_USAGE} == 0    Skipping test as VNFM is not supporting authentication

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

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

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    # Integer    response status    401
@@ -106,7 +106,7 @@ Send Post Request for VNF Indicator Subscription 
    ${template}=    Get File    jsons/subscriptions.json

    ${body}=        Format String   ${template}     callback=${callback}    {callback_subscribe}=${callback_subscribe}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
@@ -129,7 +129,7 @@ Send Post Request for Duplicated VNF indicator Subscription 
     ${template}=    Get File    jsons/subscriptions.json

    ${body}=        Format String   ${template}     callback=${callback}    {callback_subscribe}=${callback_subscribe}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    # Integer    response status    201
@@ -146,7 +146,7 @@ Send Put Request for VNF Indicator Subscriptions 
    Log    Trying to perform a PUT. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

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

    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -155,7 +155,7 @@ Send Patch Request for VNF Indicator Subscriptions 
    Log    Trying to perform a PATCH. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

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

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -164,7 +164,7 @@ Send Delete Request for VNF Indicator Subscriptions 
    Log    Trying to perform a DELETE. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

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

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -201,7 +201,7 @@ Check Postcondition VNF Indicator Subscription Is Set 
    Log    Trying to get the subscription

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Run Keyword If    Should Not Be Equal As Strings    ${location}    Location   GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}

    Run Keyword If    Should Not Be Equal As Strings    ${location}    Location   GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}

    Run Keyword If    Should Be Equal As Strings    ${location}    Location   GET    ${response['headers']['Location']}  

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -232,7 +232,7 @@ Get all VNF indicators 
    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${vnfIndicators}    ${response['body']}
@@ -242,7 +242,7 @@ Get VNF indicators with filter 
    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators?${POS_FIELDS}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${POS_FIELDS}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -251,7 +251,7 @@ Get VNF indicators with invalid filter 
    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators?${NEG_FIELDS}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${NEG_FIELDS}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -261,7 +261,7 @@ Get all VNF indicators with malformed authorization token 
    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -271,7 +271,7 @@ Get all VNF indicators with expired or revoked authorization token 
    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -280,7 +280,7 @@ Get all VNF indicators without authorization token 
    Log    The GET method queries multiple VNF indicators omitting token

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

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -289,7 +289,7 @@ Get all VNF indicators with invalid resource endpoint 
    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -297,7 +297,7 @@ Send POST Request for all VNF indicators 
    log    Trying to perform a POST. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -305,7 +305,7 @@ Send PUT Request for all VNF indicators 
    log    Trying to perform a PUT. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -313,7 +313,7 @@ Send PATCH Request for all VNF indicators 
    log    Trying to perform a PATCH. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -321,7 +321,7 @@ Send DELETE Request for all VNF indicators 
    log    Trying to perform a DELETE. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/${apiVersion}/indicators

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -341,7 +341,7 @@ Get all indicators for a VNF instance 
    Log    This resource represents VNF indicators related to a VNF instance.

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -349,7 +349,7 @@ Get all indicators for a VNF instance with filter 
    Log    This resource represents VNF indicators related to a VNF instance.

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -357,7 +357,7 @@ Get all indicators for a VNF instance with invalid filter 
    Log    This resource represents VNF indicators related to a VNF instance.

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -365,7 +365,7 @@ Get all indicators for a VNF instance with invalid resource identifier 
    Log    Trying to perform a negative get, using wrong identifier

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${erroneousVnfInstanceId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousVnfInstanceId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -373,7 +373,7 @@ Send POST Request for indicators in VNF instance 
    Log    Trying to perform a POST (method should not be implemented)

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -381,7 +381,7 @@ Send PUT Request for indicators in VNF instance 
    Log    Trying to perform a PUT. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}

    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -389,7 +389,7 @@ Send PATCH Request for indicators in VNF instance 
    Log    Trying to perform a PATCH. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -397,7 +397,7 @@ Send DELETE Request for indicators in VNF instance 
    Log    Trying to perform a DELETE. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -409,7 +409,7 @@ Get Individual Indicator for a VNF instance 
    Log    This resource represents a VNF indicator related to a VNF instance.

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -417,7 +417,7 @@ Get Individual Indicator for a VNF instance with invalid indicator identifier 
    Log    Trying to perform a negative get, using wrong identifier

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -425,7 +425,7 @@ Send POST Request for individual indicator in VNF instance 
    Log    Trying to perform a POST (method should not be implemented)

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -433,7 +433,7 @@ Send PUT Request for individual indicator in VNF instance 
    Log    Trying to perform a PUT. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}

    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -441,7 +441,7 @@ Send PATCH Request for individual indicator in VNF instance 
    Log    Trying to perform a PATCH. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -449,7 +449,7 @@ Send DELETE Request for individual indicator in VNF instance 
    Log    Trying to perform a DELETE. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -471,7 +471,7 @@ GET Individual VNF Indicator Subscription 
    Log    Trying to get a given subscription identified by subscriptionId

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

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

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -479,7 +479,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier 
    Log    Trying to perform a request on a subscriptionID which doesn't exist

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -487,7 +487,7 @@ Send Delete Request for Individual VNF Indicator Subscription 
    Log    Trying to perform a DELETE on a subscriptionId

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

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

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -495,14 +495,14 @@ Send Delete Request for Individual VNF Indicator Subscription with invalid resou 
    Log    Trying to perform a DELETE on a subscriptionId which doesn't exist

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    

Send Post Request for Individual VNF Indicator Subscription

    Log    Trying to create a new subscription

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -510,20 +510,20 @@ Send Put Request for Individual VNF Indicator Subscription 
    Log    Trying to perform a PUT. This method should not be implemented

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

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

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

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

    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}   



Send Patch Request for Individual VNF Indicator Subscription

    Log    Trying to create a new subscription

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

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

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

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

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

SOL003/VNFIndicator-API/environment/variables.txt

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ ${AUTH_USAGE} 1 
${CONTENT_TYPE_JSON}    application/json



${apiRoot}        /

${apiVersion}     v1

${apiMajorVersion}     v1

${apiName}        vnfind



${VNFM_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the FUT performs a get to the notification endpoint