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

Merge branch 'master' into 'master' 

Master

See merge request !1
parents 565d7b62 850c8c3f

SOL002/VNFConfiguration-API/Configuration.robot

+14 −1
Original line number Diff line number Diff line 
*** Settings ***

Resource    environments/variables.txt 

Resource   environment/variables.txt

Library    REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}

...        spec=SOL002-VNFConfiguration-API.yaml

Library    JSONLibrary
@@ -7,6 +7,9 @@ Library JSONSchemaLibrary schemas/ 
Library    OperatingSystem

Library    DependencyLibrary



*** Variables ***

${response}=    httpresponse



*** Test Cases ***

POST Configuration - Method not implemented

    log    Trying to perform a POST. This method should not be implemented
@@ -135,3 +138,13 @@ Check Postcondition VNF Is Configured 
    ${output}=    evaluate    json.loads('''${response.body}''')    json

    ${input}=    Get File    json/vnfConfigModifications.json

    Should Be Equal  ${output}    ${input}   



Send Duplicated VNF configuration

    Depends On Test    PATCH Alarm    # If the previous test scceeded, it means that Etag has been modified

    log    Trying to perform a PATCH. This method modifies an individual alarm resource

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

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

    Set Headers    {"If-Match": "${Etag}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    ${body}=    Get File    json/vnfConfigModifications.json

    ${response}=    Patch    ${apiRoot}/${apiName}/${apiVersion}/configuration    ${body}

SOL002/VNFConfiguration-API/environment/variables.txt

+27 −0
Original line number Diff line number Diff line
@@ -11,3 +11,30 @@ ${apiName} vnfconfig 
${apiVersion}     v1

${Etag}=    an etag

${Etag_modified}=    a modified etag

${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX

${alarm_filter}       managedObjectId

${managedObjectId}    007c111c-38a1-42c0-a666-7475ecb1567c

${invalid_alarm_filter}    badFilter

${alarmId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d

${vnfInstanceDescription}    description vnf

${vnfInstanceDescription_Update}    Updated description vnf

${SINGLE_FILE_VNFD}    1    # If VNFD is PLAIN TEXT

${ACCEPT_PLAIN}    text/plain

${ACCEPT_ZIP}     application/zip

${vnfPkgId_processing}    007c111c-38a1-42c0-a666-7475ecb1567c

${ARTIFACT_TYPE}    application/octet-stream

${ARTIFACT_ID}    artifactId

${WRONG_ACCEPT}    application/json

${vnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d

${CancelMode}    GRACEFUL

${LccnSubscriptionRequest}    {}

${NVFM_DUPLICATION}    0

${sub_filter}    filter

${sub_filter_invalid}    filter_invalid

${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f

${notification_ep}    /notification

${notification_port}    9091

${AlarmNotification}    {}

${AlarmClearedNotification}    {}

${AlarmListRebuiltNotification}    {}

${PerceivedSeverity}    CRITICAL

SOL002/VNFFaultManagement-API/NotificationEndpoint.robot

+1 −1
Original line number Diff line number Diff line
@@ -110,6 +110,6 @@ DELETE subscriptions - Method not implemented 
    

*** Keywords ***

Create Sessions

    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance

    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_schema}://${callback_uri}:${callback_port}     #The API producer is set to NFVO according to SOL003-7.3.4

SOL002/VNFFaultManagement-API/Subscriptions.robot

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ Create a new Subscription - NO-DUPLICATION 
    ...    Applicability: the VNFM decides to not create a duplicate subscription resource 

    ...    Post-Conditions:

    Log    Trying to create a subscription with an already created content

    Pass Execution If    ${NVFM_DUPLICATION} == 1    VNFM permits duplication. Skipping the test

    Pass Execution If    ${VNFM_DUPLICATION} == 1    VNFM permits duplication. Skipping the test

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

SOL002/VNFFaultManagement-API/environment/variables.txt

+7 −0
Original line number Diff line number Diff line
@@ -34,3 +34,10 @@ ${AlarmClearedNotification} {} 
${AlarmListRebuiltNotification}    {}

${PerceivedSeverity}    CRITICAL

${sleep_interval}    20s

${alarm_filter}       managedObjectId

${managedObjectId}    007c111c-38a1-42c0-a666-7475ecb1567c

${invalid_alarm_filter}    badFilter

${notification_ep}    /notification

${notification_port}    9091

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