Commit b470052f authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

fixed callbackuri replace string - SOL003 - issue#195

parent 818e5d3d

SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot

+12 −6
Original line number Diff line number Diff line
@@ -242,8 +242,10 @@ POST 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
@@ -260,8 +262,10 @@ POST Subscription Duplication permitted 
    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
@@ -278,8 +282,10 @@ POST Subscription Duplication not permitted 
    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

SOL003/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

SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot

+8 −4
Original line number Diff line number Diff line
@@ -103,8 +103,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}
@@ -122,8 +124,10 @@ Send Post Request for Duplicated VNF indicator Subscription 
    Log    Trying to create a subscription with an already created content

    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}

SOL003/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

SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot

+12 −6
Original line number Diff line number Diff line
@@ -1002,8 +1002,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}

    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}
@@ -1021,8 +1023,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}

    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}
@@ -1040,8 +1044,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}

    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}