Commit 50ed41b9 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

fixed callbackuri replace string - SOL005

parent b4adf06f

SOL005/NSDManagement-API/NSDManagementKeywords.robot

+8 −4
Original line number Diff line number Diff line
@@ -818,8 +818,10 @@ Send Post Request for NSD Management 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}
@@ -839,8 +841,10 @@ Send Post Request for Duplicated NSD Management 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}

SOL005/NSDManagement-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

SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot

+12 −6
Original line number Diff line number Diff line
@@ -212,8 +212,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
@@ -230,8 +232,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
@@ -249,8 +253,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

SOL005/NSFaultManagement-API/jsons/fmSubscriptionRequest.json

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

  "filter": {

    "nsInstanceSubscriptionFilter": {

      "notificationTypes": [

        "AlarmNotification"

      ]

    }

  },

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

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

SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot

+12 −6
Original line number Diff line number Diff line
@@ -881,8 +881,10 @@ POST subscriptions 
    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
@@ -899,8 +901,10 @@ POST subscriptions 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
@@ -917,8 +921,10 @@ POST subscriptions 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