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

updated importing of variables for VNFD parsing

parent 84ee3ad3

SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot

+4 −2
Original line number Original line Diff line number Diff line
@@ -10,8 +10,8 @@ Library MockServerLibrary 
Library           String

Library           String

Library           Collections

Library           Collections

Library           String

Library           String

Variables         descriptors/SOL001/VNFD/vnfd_SOL001.yaml

#Variables         descriptors/SOL001/VNFD/vnfd_SOL001.yaml

Variables         descriptors/SOL006/VNFD/vnfd_SOL006.yaml

#Variables         descriptors/SOL006/VNFD/vnfd_SOL006.yaml





*** Keywords ***

*** Keywords ***

Get all VNF Packages

Get all VNF Packages
@@ -196,6 +196,7 @@ PARSE the Descriptor File 
    Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 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

Fetch Information from SOL001 descriptor file

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

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

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

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

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

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

    ${product_name}=    Get Variable Value    ${topology_template.node_templates.properties.product_name}
@@ -209,6 +210,7 @@ Fetch Information from SOL001 descriptor file 
    Set Global Variable    ${Descriptor_Version}    ${descriptor_version}

    Set Global Variable    ${Descriptor_Version}    ${descriptor_version}





Fetch Information from SOL006 descriptor file

Fetch Information from SOL006 descriptor file

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

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

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

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

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

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

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