Commit f45634fb authored by Giacomo Bernini's avatar Giacomo Bernini Committed by admin_forge
Browse files

NFV&MEC Plugtests 2020: fixes of issues found during Plugtests

parent 84c5580f

SOL002/VNFConfiguration-API/ApiVersion.robot

+13 −13
Original line number Diff line number Diff line 
*** Settings ***

Resource    environment/variables.txt

Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 

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

Library    DependencyLibrary

Library    JSONLibrary

Library    JSONSchemaLibrary    schemas/
@@ -134,78 +134,78 @@ POST API Version 
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/api_version

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

GET API Version

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

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

    Get    ${apiRoot}/${apiName}/api_version

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

PUT API Version

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

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

    Put    ${apiRoot}/${apiName}/api_version

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

PATCH API Version

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

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

    Patch    ${apiRoot}/${apiName}/api_version

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

DELETE API Version

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

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

    Delete    ${apiRoot}/${apiName}/api_version

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

POST API Version with apiMajorVersion

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

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

    Post    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

GET API Version with apiMajorVersion

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

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

    Get    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

PUT API Version with apiMajorVersion

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

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

    Put    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

PATCH API Version with apiMajorVersion

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

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

    Patch    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

DELETE API Version with apiMajorVersion

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

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

    Delete    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 



Check HTTP Response Status Code Is

    [Arguments]    ${expected_status}    

    Should Be Equal    ${response.status_code}    ${expected_status}

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

    Log    Status code validated 



Check HTTP Response Body Json Schema Is

    [Arguments]    ${input}

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

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

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

    Log    Json Schema Validation OK
 
 No newline at end of file

SOL002/VNFConfiguration-API/Configuration.robot

+1 −2
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ Send VNF configuration 


Check HTTP Response Status Code Is

    [Arguments]    ${expected_status}    

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

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

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

    Log    Status code validated



Check HTTP Response Header Contains