Commit 34766cfb authored by Najam UI Hassan's avatar Najam UI Hassan Committed by Giacomo Bernini
Browse files

template bug fix added

parent 1f96373a

SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot

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

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

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

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

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

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

    ${body_request}=        Format String   ${template}     callback_uri=${callback_uri}

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

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

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -649,7 +649,7 @@ Send Post Request for Subscription 
Check HTTP Response Body CimSubscription Attributes Values Match the Issued Subscription

Check HTTP Response Body CimSubscription Attributes Values Match the Issued Subscription

    Log    Check Response matches subscription

    Log    Check Response matches subscription

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

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

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

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

    ${subscription}=    evaluate    json.loads('''${body}''')    json

    ${subscription}=    evaluate    json.loads('''${body}''')    json

    Should Be Equal As Strings    ${response['body']['callbackUri']}    ${subscription['callbackUri']}

    Should Be Equal As Strings    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
@@ -666,7 +666,7 @@ Send Post Request for Duplicated Subscription 
    Set headers    {"Accept": "${ACCEPT_JSON}"}

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

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

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

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

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

    ${body_request}=        Format String   ${template}     callback_uri=${callback_uri}

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

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

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}  

    Set Suite Variable    ${response}    ${output}

SOL009/NFVManoConfigurationAndInformationManagement-API/environment/variables.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ ${peerEntityId} 




${callback_port}    9091

${callback_port}    9091

${callback_uri}    http://172.22.1.7:${callback_port}

${callback_uri}    http://172.22.1.7:${callback_port}

${callback_endpoint}    /nfvmanocim/subscriptions

${callback_endpoint}    /subscriptions

${filter_ok}      callbackUri=${callbackUri}

${filter_ok}      callbackUri=${callbackUri}

${filter_ko}      erroneousFilter=erroneous

${filter_ko}      erroneousFilter=erroneous

${callback_endpoint_fwd}    /endpoint/check

${callback_endpoint_fwd}    /endpoint/check