Commit 89700584 authored by zafar's avatar zafar
Browse files

descriptors added for test ID: 5.3.2.5.1

parent 67acbdbf

SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot

+25 −4
Original line number Original line Diff line number Diff line
@@ -558,12 +558,33 @@ POST Update NSInstance 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

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

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

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

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

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

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

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

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

    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfFlavourId=${flavour_Id}    newFlavourId=${flavour_Id}    vnfVirtualLinkDescId=${virtualLink_id}    instantiationLevelId=${instantiationLevel_id}    vnfInstantiationLevelId=${instantiationLevel_id}    

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update    ${body}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update    ${body}

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 





Add VNF Descriptor Content to NS Instance

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

   

Parse SOL001 NS 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}

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

    

Parse SOL006 NS 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}   

    ${instantiationLevel_id}=    Get Variable Value    ${nfv.vnfd[0].df[0].instantiation-level[0].id}  

 

DELETE Heal NSInstance

DELETE Heal NSInstance

    log    Trying to Delete an Heal NS instance. This method should not be implemented

    log    Trying to Delete an Heal NS instance. This method should not be implemented

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

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

SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml

+1 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ topology_template: 
        virtual_link_left:

        virtual_link_left:

        virtual_binding: VDU-B-1

        virtual_binding: VDU-B-1

    internal_vl:

    internal_vl:

      type: tosca.nodes.nfv.VnfVirtualLink

      type: "tosca.nodes.nfv.VnfVirtualLink"

      properties:

      properties:

        connectivity_type:

        connectivity_type:

          layer_protocols: [ ipv4 ]

          layer_protocols: [ ipv4 ]

SOL005/NSLifecycleManagement-API/environment/variables.txt

+4 −1
Original line number Original line Diff line number Diff line
@@ -88,3 +88,6 @@ ${product_name} 
${software_version}    

${software_version}    

${descriptor_version}

${descriptor_version}

${flavour_id}

${flavour_id}



${virtualLink_id}

${instantiationLevel_id}
 
 No newline at end of file

SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json

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

{{

	"updateType": "{vnfUpdateType}"	

	"updateType": "{vnfUpdateType}",

	"instantiateVnfData": {{

		"vnfdId": "{vnfdId}",

		"vnfFlavourId": "{vnfFlavourId}",

		"vnfInstantiationLevelId": "{vnfInstantiationLevelId}"

		"extManagedVirtualLinks": {{

			"vnfVirtualLinkDescId": "{vnfVirtualLinkDescId}"

		}},

	"changeVnfFlavourData": {{

		"vnfInstanceId": {},

		"newFlavourId": "{newFlavourId}",

		"instantiationLevelId": "{instantiationLevelId}"

		}}

}}
 
}}
 
 No newline at end of file