Commit 563b2bad authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

fixed issue #149 on all SOL005 subscriptions - v2.6.1

parent 8645a139

SOL005/NSDManagement-API/NSDManagementKeywords.robot

+30 −11
Original line number Diff line number Diff line
@@ -824,26 +824,45 @@ 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

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

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

    ${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}

    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

    Pass Execution If    ${NFVO_DUPLICATION} == 0    NFVO is not permitting duplication. Skipping the test

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

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

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

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

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

    ${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}

    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

SOL005/NSDManagement-API/environment/variables.txt

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ ${FIELD_USAGE} 1 
${NFVO_AUTHENTICATION}    Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9

${NFVO_AUTH_USAGE}    1



${NFVO_DUPLICATION}    0



${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar



${callback_port}    9091

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_port}${callback_endpoint}"

}
 
 No newline at end of file

SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot

+34 −6
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Library OperatingSystem 
Library    MockServerLibrary

Library    Process

Library     Collections

Library    String



*** Keywords ***

Create Sessions
@@ -213,31 +214,58 @@ POST Subscription 
    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

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

    ${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

    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

    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test

    Pass Execution If    ${NFVO_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test

    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

    ${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

    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

    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    NVFO permits duplication. Skipping the test

    Pass Execution If    ${NFVO_ALLOWS_DUPLICATE_SUBS} == 1    NVFO permits duplication. Skipping the test

    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

    ${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

    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

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ 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