Commit 1b18c6f9 authored by Hammad Zafar's avatar Hammad Zafar
Browse files

updated importing of variables for descriptors

parent 84a1ec3f

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

+1 −1
Original line number Diff line number Diff line
@@ -1133,8 +1133,8 @@ Fetch Information from SOL001 descriptor file 
    Set Global Variable    @{Storage_IDs}    @{Storage_labels}



Get VNF Attributes from SOL001

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

    [Arguments]    ${VNF_label}

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

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

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

SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot

+9 −3
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ Fetch Information from SOL001 descriptor file 


Get VNF Attributes from SOL001

    [Arguments]    ${VNF_label}

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

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

    ${product_name}=    Get Variable Value    ${topology_template.node_templates['${VNF_label}'].properties.product_name}
@@ -272,6 +273,7 @@ Fetch Information from SOL006 descriptor file 


Get VDU IDs

    [Arguments]    ${count}

    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml    

    @{VDU_labels}=    Create List

    ${Storage_labels}=    Create List

    FOR    ${i}    IN RANGE    ${count}
@@ -284,6 +286,7 @@ Get VDU IDs 
            

Get Internal CPs for each VDU

    [Arguments]    ${vdu}

    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml

    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd']}    

    ${internal_CPs}=    Create List

    FOR    ${i}    IN RANGE    ${count}
@@ -293,6 +296,7 @@ Get Internal CPs for each VDU 
    

Get External CP IDs

    [Arguments]    ${count}

    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml 

    @{external_CPs}=    Create List

    FOR    ${i}    IN RANGE    ${count}

        Append To List    ${external_CPs}    ${nfv.vnfd[0]['ext-cpd'][${i}]['id']}
@@ -301,6 +305,7 @@ Get External CP IDs 


Get Virtual Link IDs

    [Arguments]    ${count}

    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml 

    ${VirtualLink_labels}=    Create List

    FOR    ${i}    IN RANGE    ${count}

        Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0]['int-virtual-link-desc'][${i}]['id']}
@@ -309,6 +314,7 @@ Get Virtual Link IDs 


Get Instantiation Levels

    [Arguments]    ${count}

    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml

    @{Instantiation_Levels}=    Create List

    FOR    ${i}    IN RANGE    ${count}

        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df['instantiation-level'][${i}]['id']}