Commit 818e5d3d authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

fixed callbackuri replace string - SOL002 - issue#195

parent 50ed41b9

SOL002/VNFFaultManagement-API/Subscriptions.robot

+12 −6
Original line number Diff line number Diff line
@@ -189,8 +189,10 @@ Post Create subscription 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

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

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

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

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

    ${body}=    Replace String    ${body}    \${callback_uri}    ${callback_uri}

    ${body}=    Replace String    ${body}    \${callback_port}    ${callback_port}

    ${body}=    Replace String    ${body}    \${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
@@ -207,8 +209,10 @@ Post Create subscription - DUPLICATION 
    Set Headers    {"Accept": "${ACCEPT}"}

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

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

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

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

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

    ${body}=    Replace String    ${body}    \${callback_uri}    ${callback_uri}

    ${body}=    Replace String    ${body}    \${callback_port}    ${callback_port}

    ${body}=    Replace String    ${body}    \${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
@@ -225,8 +229,10 @@ Post Create subscription - NO-DUPLICATION 
    Set Headers    {"Accept": "${ACCEPT}"}

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

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

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

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

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

    ${body}=    Replace String    ${body}    \${callback_uri}    ${callback_uri}

    ${body}=    Replace String    ${body}    \${callback_port}    ${callback_port}

    ${body}=    Replace String    ${body}    \${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/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json

+1 −10
Original line number Diff line number Diff line 
{

  "filter": {

    "vnfInstanceSubscriptionFilter": {

      "vnfdIds": [

        "6fc3539c-e602-4afa-8e13-962fb5a7d81f"

      ]

    }

  },

  "callbackUri": "{callback_uri}{callback_endpoint}"

}
 
 No newline at end of file
 
{ "callbackUri": "${callback_uri}:${callback_port}${callback_endpoint}" }
 
 No newline at end of file

SOL002/VNFIndicator-API/Subscriptions.robot

+4 −2
Original line number Diff line number Diff line
@@ -152,8 +152,10 @@ Send Post Request for VNF Indicator Subscription 
    Log    Trying to create a new 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_port}    callback_endpoint=${callback_endpoint}

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

    ${body}=    Replace String    ${body}    \${callback_uri}    ${callback_uri}

    ${body}=    Replace String    ${body}    \${callback_port}    ${callback_port}

    ${body}=    Replace String    ${body}    \${callback_endpoint}    ${callback_endpoint}

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

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

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

SOL002/VNFIndicator-API/jsons/subscriptions.json

+1 −3
Original line number Diff line number Diff line 
{

	"callbackUri": "{callback_uri}{callback_endpoint}"

}
 
 No newline at end of file
 
{ "callbackUri": "${callback_uri}:${callback_port}${callback_endpoint}" }
 
 No newline at end of file

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

+12 −6
Original line number Diff line number Diff line
@@ -768,8 +768,10 @@ Post Create subscription 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

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

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

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

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

    ${body}=    Replace String    ${body}    \${callback_uri}    ${callback_uri}

    ${body}=    Replace String    ${body}    \${callback_port}    ${callback_port}

    ${body}=    Replace String    ${body}    \${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
@@ -786,8 +788,10 @@ Post Create subscription - DUPLICATION 
    Set Headers    {"Accept": "${ACCEPT}"}

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

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

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

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

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

    ${body}=    Replace String    ${body}    \${callback_uri}    ${callback_uri}

    ${body}=    Replace String    ${body}    \${callback_port}    ${callback_port}

    ${body}=    Replace String    ${body}    \${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
@@ -804,8 +808,10 @@ Post Create subscription - NO-DUPLICATION 
    Set Headers    {"Accept": "${ACCEPT}"}

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

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

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

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

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

    ${body}=    Replace String    ${body}    \${callback_uri}    ${callback_uri}

    ${body}=    Replace String    ${body}    \${callback_port}    ${callback_port}

    ${body}=    Replace String    ${body}    \${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