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

Fix issue #193

parent ca8975bb

SOL002/VNFFaultManagement-API/Subscriptions.robot

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

    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    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

	${output}=    Output    response

	Set Global Variable    ${response}    ${output}

	Set Global Variable    ${response}    ${output}

	Clear Requests    ${callback_endpoint}

	Clear Requests    ${callback_endpoint}

SOL002/VNFIndicator-API/Subscriptions.robot

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

    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint}

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

    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint}

	Clear Requests    ${callback_endpoint}

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

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

    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint}

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

    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint}

	Clear Requests    ${callback_endpoint}

SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot

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

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

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

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}

    Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1

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

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

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

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}    

    Set Suite Variable    ${response}    ${output}    

    # Integer    response status    303

    # Integer    response status    303

SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot

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

    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	Log    Verify the notification endpoint has been tested

	Log    Verify the notification endpoint has been tested
@@ -293,7 +293,7 @@ Send POST Request for duplicated subscription 
    &{notification_response}=  Create Mock Response	status_code=204

    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	Log    Verify the notification endpoint has been tested

	Log    Verify the notification endpoint has been tested
@@ -313,7 +313,7 @@ Send POST Request for duplicated subscription not permitted 
    &{notification_response}=  Create Mock Response	status_code=204

    &{notification_response}=  Create Mock Response	status_code=204

    Log    Issue the subscription request

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    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

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	Log    Verify the notification endpoint has been tested

	Log    Verify the notification endpoint has been tested