Commit 0e3bb2dc authored by Elian Kraja's avatar Elian Kraja Committed by Giacomo Bernini
Browse files

Fix issue #193

parent 348539eb

SOL002/VNFFaultManagement-API/Subscriptions.robot

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ Post Create subscription 
    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

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

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

	${output}=    Output    response

	Set Global Variable    ${response}    ${output}

	Clear Requests    ${callback_endpoint}

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

+3 −3
Original line number Diff line number Diff line
@@ -1168,7 +1168,7 @@ Post Create subscription 
    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

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

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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint}
@@ -1187,7 +1187,7 @@ Post Create subscription - DUPLICATION 
    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

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

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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint}
@@ -1205,7 +1205,7 @@ Post Create subscription - NO-DUPLICATION 
    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

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

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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint}

SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ Send Post Request for VNF Performance Subscription 
    Set headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    ${body_request}=    Get File    jsons/subscriptions.json

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

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}    allow_redirects=false

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
@@ -137,7 +137,7 @@ Send Post Request for Duplicated VNF Performance Subscription 
    Set headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    ${body_request}=    Get File    jsons/subscriptions.json

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

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}    allow_redirects=false

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}    

    # Integer    response status    303

SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot

+3 −3
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ POST Subscription 
    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

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

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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint}
@@ -293,7 +293,7 @@ Send POST Request for duplicated subscription 
    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

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

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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint}
@@ -311,7 +311,7 @@ Send POST Request for duplicated subscription not permitted 
    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

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

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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint}

SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ Send Post Request for VNF Indicator Subscription 
    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

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

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

	${output}=    Output    response

	Set Global Variable    ${response}    ${output}

	Clear Requests    ${callback_endpoint}
@@ -127,7 +127,7 @@ Send Post Request for Duplicated VNF indicator Subscription 
    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

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

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

	${output}=    Output    response

	Set Global Variable    ${response}    ${output}

	Clear Requests    ${callback_endpoint}