Commit 5a6e72a1 authored by uihassan's avatar uihassan
Browse files

Added SOL006 descriptors in 6.3.5.1.1

parent d7494b97

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

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

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

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

    Get key for VNF Descriptor

    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}

    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}

    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}

    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}

    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}

    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.flavour_id}

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
@@ -1057,7 +1051,6 @@ Parse SOL001 
    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}

    

Parse SOL006

    #Log    SOL006 code

     ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}

     ${provider}=    Get Variable Value    ${nfv.vnfd[0].provider}

     ${product_name}=    Get Variable Value    ${nfv.vnfd[0].product-name}
@@ -1070,3 +1063,20 @@ 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

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

    

Parse SOL001 VNF Instance

    Get key for VNF Descriptor

    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}

    ${provider}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.provider}

    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.product_name}

    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.software_version}

    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}

    

Parse SOL006 VNF Instance

    ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}

    ${provider}=    Get Variable Value    ${nfv.vnfd[0].provider}

    ${product_name}=    Get Variable Value    ${nfv.vnfd[0].product-name}

    ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}

    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}     
 No newline at end of file

SOL002/VNFLifecycleManagement-API/environment/variables.txt

+8 −1
Original line number Diff line number Diff line
@@ -82,3 +82,10 @@ ${callbackResp} localhost 
${descriptorType}    SOL001

${vnfKey}    {}

${check_descriptors}	1



${descriptor_id}	

${provider}	

${product_name}    

${software_version}    

${descriptor_version}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
 
 No newline at end of file