Commit a411d463 authored by Elian Kraja's avatar Elian Kraja
Browse files

Fix issue #155

parent 3702fe41

SOL002/VNFIndicator-API/Subscriptions.robot

+3 −3
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ Check Postcondition VNF Indicator Subscription Is Set 
    

Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter

    Log    Check Response includes VNF Indicators according to filter

    @{words} =  Split String    ${POS_FILTER}       ,${SEPERATOR} 

    @{words} =  Split String    ${POS_FILTER}       ${SEPARATOR} 

    Should Be Equal As Strings    ${response['body'][0]['callbackUri']}    @{words}[1]

    

Create Sessions
@@ -331,7 +331,7 @@ Post Create subscription - DUPLICATION 
    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

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

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

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

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

    Log  Creating mock request and response to handle GET operation on notification endpoint

    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}

    &{notification_response}=  Create Mock Response	status_code=204
@@ -351,7 +351,7 @@ Post Create subscription - NO-DUPLICATION 
    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

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

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

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

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

    Log  Creating mock request and response to handle GET operation on notification endpoint

    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}

    &{notification_response}=  Create Mock Response	status_code=204

SOL002/VNFIndicator-API/VNFIndicators.robot

+3 −3
Original line number Diff line number Diff line
@@ -293,9 +293,9 @@ Check HTTP Response Body Json Schema Is 
    

Check HTTP Response Body vnfIndicators Matches the requested attribute-based filter

    Log    Check Response includes VNF Indicators according to filter

    @{attr} =  Split String    ${POS_FILTER}       ,${VAR_SEPERATOR} 

    @{var_name} =    Split String    @{attr}[0]       ,${SEPERATOR}

    @{var_id} =    Split String    @{attr}[1]       ,${SEPERATOR}

    @{attr} =  Split String    ${POS_FILTER}       ${VAR_SEPARATOR} 

    @{var_name} =    Split String    @{attr}[0]       ${SEPARATOR}

    @{var_id} =    Split String    @{attr}[1]       ${SEPARATOR}

    Should Be True     "${response['body'][0]['name']}"=="@{var_name}[1]" and "${response['body'][0]['vnfInstanceId']}"=="@{var_id}[1]"



Check HTTP Response Header Contain Link

SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ Check HTTP Response Body Includes Requested VNF Instance ID 
    

Check HTTP Response Body Matches Attribute-Based Filter

    Log    Check Response includes VNF Indicators according to filter

    @{words} =  Split String    ${POS_FIELDS}       ,${SEPERATOR} 

    @{words} =  Split String    ${POS_FIELDS}       ${SEPARATOR} 

    Should Be Equal As Strings    ${response['body'][0]['name']}    @{words}[1]

    

Check HTTP Response Header Contain Link

SOL002/VNFIndicator-API/environment/variables.txt

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ ${POS_FILTER} callbackUri=http://127.0.0.1/subscribe 
${NEG_FILTER}     callback=http://127.0.0.1/subscribe

${total_polling_time}   2 min

${polling_interval}     10 sec

${SEPERATOR}      =

${SEPARATOR}      =



${erroneousVnfInstanceId}    erroneousVnfInstanceId

${POS_FIELDS}     name=vnfIndicator
@@ -49,6 +49,6 @@ ${NEG_FIELDS} wrongName=any_value 




${vnfIndicators}  =     

${VAR_SEPERATOR}    &

${VAR_SEPARATOR}    &



${callbackResp}    localhost
 
 No newline at end of file

SOL002/VNFPerformanceManagement-API/PMJobs.robot

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ Check HTTP Response Body Matches all_fields selector 
    

Check HTTP Response Body Matches filter

    Log    Checking that attribute-based filter is matched

    @{words} =  Split String    ${POS_FILTER}       ,${SEPERATOR} 

    @{words} =  Split String    ${POS_FILTER}       ${SEPARATOR} 

    Should Be Equal As Strings    ${response['body'][0]['objectInstanceIds']}    @{words}[1]

    

Check HTTP Response Status Code Is