Commit 7e28b22d authored by Elian Kraja's avatar Elian Kraja
Browse files

Fix on issues: 66, 69, 73 (NXW endpoints), 74, 76, 78, 79, 80, 81, 85, 87, 88

parent d03f349e

SOL002/VNFConfiguration-API/Configuration.robot

+6 −7
Original line number Diff line number Diff line 
*** Settings ***

Resource    environment/variables.txt 

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

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

Library    JSONLibrary

Library    JSONSchemaLibrary    schemas/

Library    OperatingSystem
@@ -121,14 +121,13 @@ Send VNF configuration 
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

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

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

    Set Suite Variable    &{etag}    ${response['headers']['ETag']}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}



Check HTTP Response Status Code Is

    [Arguments]    ${expected_status}    

    ${status}=    Convert To Integer    ${expected_status}    

    Should Be Equal    ${response['status']}    ${status}

    Should Be Equal As Strings    ${response['status']}    ${status}

    Log    Status code validated



Check HTTP Response Header Contains
@@ -139,8 +138,8 @@ Check HTTP Response Header Contains 
    

Check HTTP Response Body Json Schema Is

    [Arguments]    ${input}

    Should Contain    ${response['headers']['Content-Type']}    application/json

    ${schema} =    Catenate    ${input}    .schema.json

    Should Contain    ${response['headers']['Content-Type']}    application/problem+json

    ${schema}=    Catenate    SEPARATOR=    ${input}    .schema.json

    Validate Json    ${schema}    ${response['body']}

    Log    Json Schema Validation OK
@@ -157,14 +156,14 @@ Check Postcondition VNF Is Configured 
    Get VNF configuration

    ${input_file}=    Get File    jsons/vnfConfigModifications.json

    ${input}=    evaluate    json.loads('''${input_file}''')    json

    Should Be Equal  ${response['body']}    ${input} 

    Should Be Equal As Strings  ${response['body']}    ${input} 



Send Duplicated VNF configuration

    Depends On Test    Send VNF configuration    # 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[0]}"}

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

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

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

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

SOL002/VNFConfiguration-API/environment/variables.txt

+6 −4
Original line number Diff line number Diff line
@@ -11,13 +11,15 @@ ${EM-VNF_SCHEMA} https 
${ACCEPT}         application/json

${AUTH_USAGE}     1

${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==



${CONTENT_TYPE}    application/json



${apiRoot}        /

${apiName}        vnfconfig

${apiVersion}     v1



${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX

${alarm_filter}       managedObjectId

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

${invalid_alarm_filter}    badFilter

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

SOL002/VNFFaultManagement-API/Subscriptions.robot

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ Create a new Subscription - DUPLICATION 
    ...    Applicability: the VNFM allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists

    ...    Post-Conditions: 

    Log    Trying to create a subscription with an already created content

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

    Pass Execution If    ${VNFM_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": "${AUTHORIZATION}"}
@@ -65,7 +65,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    ${VNFM_DUPLICATION} == 1    VNFM permits duplication. Skipping the test

    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 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

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ ${apiName} vnffm 
${apiVersion}     v1

${CONTENT_TYPE}    application/json



${VNFM_DUPLICATION}    0

${VNFM_ALLOWS_DUPLICATE_SUBS}    0



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

${etags}    a modified etag

SOL002/VNFIndicator-API/IndividualSubscription.robot

+30 −31
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Library JSONSchemaLibrary schemas/ 
Resource          environment/variables.txt    # Generic Parameters

Resource          environment/individualSubscription.txt

Library           OperatingSystem

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

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



*** Test Cases ***

GET Individual VNF Indicator Subscription
@@ -32,32 +32,6 @@ GET Individual VNF Indicator Subscription with invalid resource identifier 
    Check HTTP Response Status Code Is    404

    Check HTTP Response Body Json Schema Is   ProblemDetails

    

DELETE Individual VNF Indicator Subscription

    [Documentation]    Test ID: 6.3.2.5.3

    ...    Test title: Delete individual subscription to VNF performance indicators

    ...    Test objective: The objective is to test the deletion of an individual VNF performance indicator subscription.

    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.

    ...    Reference:  section 8.4.6.3.5 - SOL002 v2.4.1

    ...    Config ID: Config_prod_VE

    ...    Applicability: The VNF supports the generation and maintenance of performance indicators

    ...    Post-Conditions: The subscription to VNF performance indicators is deleted

    Send Delete Request for Individual VNF Indicator Subscription

    Check HTTP Response Status Code Is    204

    Check Postcondition Individual VNF Indicator Subscription is Deleted



DELETE Individual VNF Indicator Subscription with invalid resource identifier

    [Documentation]    Test ID: 6.3.2.5.4

    ...    Test title: Delete individual subscription to VNF performance indicators

    ...    Test objective: The objective is to test that the deletion of an individual VNF performance indicator subscription fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.

    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.

    ...    Reference:  section 8.4.6.3.5 - SOL002 v2.4.1

    ...    Config ID: Config_prod_VE

    ...    Applicability: The VNF supports the generation and maintenance of performance indicators

    ...    Post-Conditions: none   

    Send Delete Request for Individual VNF Indicator Subscription with invalid resource identifier

    Check HTTP Response Status Code Is    404

    Check HTTP Response Body Json Schema Is   ProblemDetails



PUT Individual VNF Indicator Subscription - Method not implemented

    [Documentation]    Test ID 6.3.2.5.5

    ...    Test title: PUT individual VNF indicator subscription - Method not implemented
@@ -97,6 +71,32 @@ POST Individual VNF Indicator Subscription - Method not implemented 
    Check HTTP Response Status Code Is    405

    Check Postcondition VNF individual subscription is not created  



DELETE Individual VNF Indicator Subscription

    [Documentation]    Test ID: 6.3.2.5.3

    ...    Test title: Delete individual subscription to VNF performance indicators

    ...    Test objective: The objective is to test the deletion of an individual VNF performance indicator subscription.

    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.

    ...    Reference:  section 8.4.6.3.5 - SOL002 v2.4.1

    ...    Config ID: Config_prod_VE

    ...    Applicability: The VNF supports the generation and maintenance of performance indicators

    ...    Post-Conditions: The subscription to VNF performance indicators is deleted

    Send Delete Request for Individual VNF Indicator Subscription

    Check HTTP Response Status Code Is    204

    Check Postcondition Individual VNF Indicator Subscription is Deleted



DELETE Individual VNF Indicator Subscription with invalid resource identifier

    [Documentation]    Test ID: 6.3.2.5.4

    ...    Test title: Delete individual subscription to VNF performance indicators

    ...    Test objective: The objective is to test that the deletion of an individual VNF performance indicator subscription fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.

    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.

    ...    Reference:  section 8.4.6.3.5 - SOL002 v2.4.1

    ...    Config ID: Config_prod_VE

    ...    Applicability: The VNF supports the generation and maintenance of performance indicators

    ...    Post-Conditions: none   

    Send Delete Request for Individual VNF Indicator Subscription with invalid resource identifier

    Check HTTP Response Status Code Is    404

    Check HTTP Response Body Json Schema Is   ProblemDetails



*** Keywords ***

Get Individual VNF Indicator Subscription

    Log    Trying to get a given subscription identified by subscriptionId
@@ -173,7 +173,7 @@ Check HTTP Response Header Contains 
Check HTTP Response Body Json Schema Is

    [Arguments]    ${input}

    Should Contain    ${response['headers']['Content-Type']}    application/json

    ${schema} =    Catenate    ${input}    .schema.json

    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json

    Validate Json    ${schema}    ${response['body']}

    Log    Json Schema Validation OK
@@ -186,8 +186,7 @@ Check Postcondition VNF individual subscription Unmodified (Implicit) 
    Log    Check Postcondition subscription is not modified

    GET Individual VNF Indicator Subscription

    Log    Check Response matches original subscription

    ${subscription}=    evaluate    json.loads('''${response['body']}''')    json

    Should Be Equal    ${origResponse['body']['callbackUri']}    ${subscription.callbackUri}

    Should Be Equal As Strings    ${origResponse['body']['callbackUri']}    ${response['body']['callbackUri']}

    

Check Postcondition VNF individual subscription is not created

    Log    Check Postcondition subscription is not created