Commit 0faa7460 authored by Giacomo Bernini's avatar Giacomo Bernini Committed by Giacomo Bernini
Browse files

fixed issue #194 in 3.3.1-fix-plu

parent 0e3bb2dc

SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ PATCH Individual VNFInstance Conflict 
    ...    Config ID: Config_prod_VNFM

    ...    Applicability: none

    ...    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

+24 −1
Original line number Diff line number Diff line
@@ -583,6 +583,28 @@ 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}"}
@@ -603,6 +625,7 @@ DELETE individual vnfInstance 
    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

DELETE individual vnfInstance in INSTANTIATED state

    log    Trying to delete an individual VNF instance

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

SOL003/VNFLifecycleManagement-API/environment/variables.txt

+2 −1
Original line number Diff line number Diff line
@@ -44,11 +44,12 @@ ${erroneousRange} bytes=10000000-1000000000 # Requesting a out of range nu 
${full_length}    2000    #Full size of the content file to be transmitted using partial downloads



${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

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

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

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

${vnfInstanceId_NoSnapshotTask}    no-snapshot-task-supported

${vnfSnapshotInfoId}

${vnfSnapshotInfoId_InUse}    snapshotId-of-a-resource-AlreadyInUse-bySomeOther-operation