Commit eaf4dbc3 authored by uihassan's avatar uihassan
Browse files

Descriptors for 6.3.5.2.4 added

parent 5a6e72a1

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

+5 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ POST Create a new vnfInstance 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance Post

    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance

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

    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
@@ -204,7 +204,9 @@ PATCH individual vnfInstance 
    Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}

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

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

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

    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance

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

    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
@@ -1063,7 +1065,7 @@ Parse SOL006 
    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}

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



Add VNF Descriptor Content to VNF Instance Post

Add VNF Descriptor Content to VNF Instance

    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Instance    ELSE    Parse SOL006 VNF Instance

    

Parse SOL001 VNF Instance

SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json

+1 −5
Original line number Diff line number Diff line
@@ -5,9 +5,5 @@ 
  "vnfProvider":"{vnfProvider}",

  "vnfProductName":"{vnfProductName}",

  "vnfSoftwareVersion":"{vnfSoftwareVersion}",

  "vnfdVersion":"{vnfdVersion}",

  "instantiatedVnfInfo":{{

  	"flavourId":"{flavourId}",

  	"vnfState":"STARTED"

  }}

  "vnfdVersion":"{vnfdVersion}"

}}

SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json

+2 −1
Original line number Diff line number Diff line 
{

  "vnfInstanceName": "vnf new name",

  "vnfInstanceDescription": "new description"

  "vnfInstanceDescription": "new description",

  "vnfdId": "{vnfdId}"

}
 
 No newline at end of file