Commit 52911bf0 authored by Hammad Zafar's avatar Hammad Zafar Committed by Giacomo Bernini
Browse files

updated importing variables for descriptors

parent ad1b2ff2

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

+10 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ Library Collections 
Library    JSONSchemaLibrary    schemas/

Library    String

Library    Process

Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml

Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml

#Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml

#Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml



*** Keywords ***

Create Sessions
@@ -1455,6 +1455,7 @@ PARSE the Descriptor File 
    Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file

    

Fetch Information from SOL001 descriptor file

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

    @{VDU_labels}=    Create List

    @{VNF_labels}=    Create List

    @{VirtualLink_labels}=    Create List
@@ -1482,6 +1483,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}
@@ -1497,6 +1499,7 @@ Get VNF Attributes from SOL001 
    Set Global Variable    ${Flavour_ID}    ${flavour_id}



Fetch Information from SOL006 descriptor file

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

    ${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']}
@@ -1524,6 +1527,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}
@@ -1536,6 +1540,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}
@@ -1545,6 +1550,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']}
@@ -1553,6 +1559,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']}
@@ -1561,6 +1568,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']}