Commit 99865b67 authored by Giacomo Bernini's avatar Giacomo Bernini Committed by Giacomo Bernini
Browse files

fixed issue #194 in 2.8.1-fix-plu

parent fe1f0f44

SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot

+2 −2
Original line number Diff line number Diff line
@@ -82,9 +82,9 @@ PATCH Individual VNFInstance Conflict 
    ...    Pre-conditions: another LCM operation is ongoing

    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.8.1

    ...    Config ID: Config_prod_VNFM

    ...    Applicability: none

    ...    Applicability: 

    ...    Post-Conditions: VNFInstance not modified

    PATCH individual vnfInstance

    PATCH individual vnfInstance with conflict

    Check HTTP Response Status Code Is    409

    Check HTTP Response Body Json Schema Is    ProblemDetails

SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot

+23 −0
Original line number Diff line number Diff line
@@ -571,6 +571,29 @@ PATCH individual vnfInstance 
    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 



POST conflicting operation

    Log    Trying to create conflicting operation.

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

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

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

    ${template}=    Get File    jsons/terminateVnfRequest.json

    ${body}=        Format String   ${template}     terminationType=${terminationType}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${anotherInstantiatedVnfInstanceId}/terminate    ${body}

    

PATCH individual vnfInstance with conflict

    POST conflicting operation

    log    Trying to modify an individual VNF instance with conflict

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

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

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

    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File

    ${template}=    Get File    jsons/patchBodyRequest.json

    ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}    vnfdVersion= ${Descriptor_Version}

    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${anotherInstantiatedVnfInstanceId}    ${body}	

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 





PATCH individual vnfInstance - Etag mismatch

    log    Trying to modify an individual VNF instance

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

SOL003/VNFLifecycleManagement-API/environment/variables.txt

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ ${WRONG_ACCEPT} application/json 
${SYNC_MODE}    0



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

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

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

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

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