Commit 453a9d02 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

Merge branch 'master' into 'master' 

This commit fixes issues: #30, #31, #32, #33 (partially), #37, #38, #39, #40, #41, #42

See merge request !14
parents a03ecbe9 6e2862b6

SOL002/VNFFaultManagement-API/IndividualAlarm.robot

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ Get information about a configuration 
    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}

    Log    Validate Status code

    Integer    response status    200

    ${etag}    Output    response header ETag

    ${etag}    Output    response headers ETag

    Set Suite Variable    &{original_etag}    ${etag}

    ${contentType}=    Output    response headers Content-Type

    Should Contain    ${contentType}    ${CONTENT_TYPE}

SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot

+3 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ Change deployment flavour of a vnfInstance Conflict (Not-Instantiated) 
    ...    Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, 

    ...    or that another lifecycle management operation is ongoing. 

    ...    The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error.

    [Setup]    Check resource not instantiated

    [Setup]    Check resource not instantiated    ${vnfInstanceId}

    Log    Trying to change the deployment flavour of a VNF instance.

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

    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
@@ -99,10 +99,11 @@ Check resource existance 
    Integer    response status    200



Check resource not instantiated

    [Arguments]    ${instanceId}

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

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

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

    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 

    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId} 

    String    response body instantiationState    NOT_INSTANTIATED



Check change flavour not supported

SOL002/VNFLifecycleManagement-API/HealVNFTask.robot

+6 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Heal a vnfInstance 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

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

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

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

    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}

    Integer    response status    202

    Log    Status code validated
@@ -28,12 +28,12 @@ Heal a vnfInstance Conflict (Not-Instantiated) 
    ...    Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, 

    ...    or that another lifecycle management operation is ongoing. 

    ...    The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error.

    [Setup]    Check resource not instantiated

    [Setup]    Check resource not instantiated    ${vnfInstanceId}

    Log    Trying to heal a VNF instance.

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

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

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

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

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

    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}

    Integer    response status    409

    Log    Status code validated
@@ -53,7 +53,7 @@ Heal a vnfInstance Not Found 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

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

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

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

    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}

    Integer    response status    404

    Log    Status code validated
@@ -98,10 +98,11 @@ Check resource existance 
    Integer    response status    200



Check resource not instantiated

    [Arguments]    ${instanceId}

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

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

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

    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 

    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId} 

    String    response body instantiationState    NOT_INSTANTIATED



Check heal not supported

SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ Get Information about an individual VNF Instance 
    ${result}=    Output    response body

    Validate Json    vnfInstance.schema.json    ${result}

    Log    Validation OK

    ${etag}    Output    response header ETag

    ${etag}    Output    response headers ETag

    Set Suite Variable    &{original_etag}    ${etag}

    

PUT Individual VNFInstance - Method not implemented

SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot

+3 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ Operate a vnfInstance Conflict (Not-Instantiated) 
    ...    Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, 

    ...    or that another lifecycle management operation is ongoing. 

    ...    The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error.

    [Setup]    Check resource not instantiated

    [Setup]    Check resource not instantiated    ${vnfInstanceId}

    Log    Trying to change the operational state of a VNF instance.

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

    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
@@ -99,10 +99,11 @@ Check resource existance 
    Integer    response status    200



Check resource not instantiated

    [Arguments]    ${instanceId}

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

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

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

    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 

    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${instanceId} 

    String    response body instantiationState    NOT_INSTANTIATED



Check operate not supported