Commit 8c282eb0 authored by Elian Kraja's avatar Elian Kraja
Browse files

Merge branch '2.7.1-mock-fix' into '2.7.1-dev' 

Fix on mockserver configuration (issue #134)

See merge request nfv/api-tests!143
parents 0ec7e72b b6598a73

SOL002/VNFFaultManagement-API/Subscriptions.robot

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ Post Create subscription 
    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

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

    ${template}=    Get File    jsons/fmSubscriptionRequest.json

    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}

    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

SOL002/VNFIndicator-API/Subscriptions.robot

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

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

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

    ${body}=        Format String    ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}

    ${body}=        Format String    ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}

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

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

    ${output}=    Output    response

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

+3 −3
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ Post Create subscription 
    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

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

    ${template}=    Get File    jsons/lccnSubscriptionRequest.json

    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}

    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
@@ -800,7 +800,7 @@ Post Create subscription - DUPLICATION 
    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}

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

    ${template}=    Get File    jsons/lccnSubscriptionRequest.json

    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}

    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
@@ -811,7 +811,7 @@ Post Create subscription - NO-DUPLICATION 
    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}

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

    ${template}=    Get File    jsons/lccnSubscriptionRequest.json

    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}

    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

SOL002/VNFPerformanceManagement-API/PMJobs.robot

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ Send Post Request Create new VNF Performance Monitoring Job 
    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

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

    ${template}=    Get File    jsons/CreatePmJobRequest.json

    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}

    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}:${callback_port}

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

SOL002/VNFPerformanceManagement-API/Thresholds.robot

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ Send Post Request Create new Performance Threshold 
    Set Headers    {"Accept": "${ACCEPT_JSON}"}

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

    ${template}=    Get File    jsons/CreateThresholdRequest.json

    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}

    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}:${callback_port}

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}