Commit 4e774dd7 authored by Muhammad Hamza's avatar Muhammad Hamza Committed by Giacomo Bernini
Browse files

fixed VNFD parsing in SOL002 VNF-LCM-API

parent 7cbb1a35

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

+15 −7
Original line number Original line Diff line number Diff line
@@ -1132,8 +1132,16 @@ Fetch Information from SOL001 descriptor file 
    @{VirtualLink_labels}=    Create List

    @{VirtualLink_labels}=    Create List

    @{CP_labels}=    Create List

    @{CP_labels}=    Create List

    @{Storage_labels}=    Create List

    @{Storage_labels}=    Create List

    FOR    ${key}    IN    @{node_types.keys()}

        ${node_type}=    Get Variable Value    ${node_types['${key}']['derived_from']}

        ${is_VNF}=    Run Keyword And Return Status    Should Be Equal As Strings    ${node_type}    ${tosca_type_VNF}

        Run Keyword If    ${is_VNF}    Set Global Variable    ${tosca_type_derived_from_VNF}    ${key}

    END  

    ${derived_type_is_used}=    Run Keyword And Return Status    Should not be empty    ${tosca_type_derived_from_VNF}

    Run Keyword If    ${derived_type_is_used}    Set Global Variable    ${tosca_type_VNF}    ${tosca_type_derived_from_VNF} 



    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 

    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 

        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}

        ${key_type}=    Get Variable Value    ${topology_template.node_templates['${key}'].type}

        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}

        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}

        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}

        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}

        ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}

        ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}
@@ -1155,12 +1163,12 @@ Fetch Information from SOL001 descriptor file 
Get VNF Attributes from SOL001

Get VNF Attributes from SOL001

    Import Variables    ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml

    Import Variables    ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml

    [Arguments]    ${VNF_label}

    [Arguments]    ${VNF_label}

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

    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.descriptor_id}

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

    ${provider}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.provider}

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

    ${product_name}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.product_name}

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

    ${software_version}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.software_version}

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

    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.descriptor_version}

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

    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.flavour_id}

    

    

    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}

    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}

    Set Global Variable    ${Provider}    ${provider}

    Set Global Variable    ${Provider}    ${provider}

SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml

+0 −2
Original line number Original line Diff line number Diff line
@@ -90,7 +90,6 @@ topology_template: 
        order: 1

        order: 1

      requirements:

      requirements:

        - virtual_binding: VDU-B

        - virtual_binding: VDU-B

    vdu-b-1-vsd:

    management:

    management:

      type: "tosca.nodes.nfv.VduCp"

      type: "tosca.nodes.nfv.VduCp"

      properties:

      properties:
@@ -98,7 +97,6 @@ topology_template: 
        order: 0

        order: 0

      requirements:

      requirements:

        - virtual_binding: VDU-B

        - virtual_binding: VDU-B

    vdu-b-1-vsd:

    left:

    left:

      type: "tosca.nodes.nfv.VduCp"

      type: "tosca.nodes.nfv.VduCp"

      properties:

      properties:

SOL002/VNFLifecycleManagement-API/environment/variables.txt

+2 −1
Original line number Original line Diff line number Diff line
@@ -88,10 +88,11 @@ ${descriptorType} SOL006 
${check_multiple_instances}    0

${check_multiple_instances}    0





${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute

${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute

${tosca_type_VNF}    tst010.vnf.simple    # custom tosca type defined in the descriptor vnfd_SOL001.yaml in descriptors folder

${tosca_type_VNF}    tosca.nodes.nfv.VNF

${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink

${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink

${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp

${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp

${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage

${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage

${tosca_type_derived_from_VNF}

 

 

${VDU_IDs}

${VDU_IDs}

${VNF_IDs}

${VNF_IDs}