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

fixed issue #154 on SOL005 v2.6.1

parent 8e3f8792

SOL005/NSDManagement-API/NSDManagementKeywords.robot

+28 −13
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Library JSONLibrary 
Library    Collections

Library    JSONSchemaLibrary    schemas/

Library    Process

Library    String



*** Keywords ***

GET all Network Service Descriptors Information
@@ -815,26 +816,41 @@ 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}"}

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

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

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

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

    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}

    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

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    

	${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1

    ...    Check Notification Endpoint  

	Set Global Variable    ${response}    ${output}

	Clear Requests    ${callback_endpoint}

    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques

    #...    Check Notification Endpoint     







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}"}

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

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

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

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

    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}

    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

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    

	${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1

    ...    Check Notification Endpoint  

	Set Global Variable    ${response}    ${output}

	Clear Requests    ${callback_endpoint}

    #Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1    #removed as the check of notif endpoint is done by NFVO while processing subscription reques

    #...    Check Notification Endpoint
@@ -1024,7 +1040,6 @@ Check HTTP Response Header Contains Etag 




Create Sessions

    Pass Execution If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 0    MockServer not started as NFVO is not checking the notification endpoint

    Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance

    Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue

    Create Mock Session  ${callback_uri}:${callback_port}

SOL005/NSDManagement-API/jsons/subscriptions.json

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

	"callbackUri": "http://172.22.1.7:9091/nsd/subscriptions"

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

}
 
 No newline at end of file

SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot

+35 −12
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Library OperatingSystem 
#Suite Teardown    Terminate All Processes    kill=true

Library    MockServerLibrary

Library    Process

Library    String



*** Keywords ***

Create Sessions
@@ -211,10 +212,17 @@ POST Subscription 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

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

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

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

    ${body}=        Format String   ${template}     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

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint} 



Post Create subscription - DUPLICATION

    Log    Trying to create a subscription with an already created content
@@ -222,10 +230,18 @@ 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}"}

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

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

    ${body}=        Format String   ${template}     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

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint} 



	

Post Create subscription - NO-DUPLICATION	

    Log    Trying to create a subscription with an already created content
@@ -233,10 +249,17 @@ 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}"}

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

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

    ${body}=        Format String   ${template}     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

    Log    Issue the subscription request

    Create Mock Expectation  ${notification_request}  ${notification_response}

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}    

	${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

	Clear Requests    ${callback_endpoint} 

	

GET Subscriptions

    Log    Get the list of active subscriptions

SOL005/NSFaultManagement-API/Subscriptions.robot

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ Library OperatingSystem 
Library  DependencyLibrary

Library    JSONLibrary

Library    JSONSchemaLibrary    schemas/

Library    Process

Suite Setup       Create Sessions

Suite Teardown    Terminate All Processes    kill=true



*** Test Cases ***

Create a new alarm subscription

SOL005/NSFaultManagement-API/jsons/fmSubscriptionRequest.json

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ 
      ]

    }

  },

  "callbackUri": "http://127.0.0.1/subscribe"

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

}
 
 No newline at end of file