Commit 31e5e98f authored by Muhammad Hamza's avatar Muhammad Hamza Committed by Giacomo Bernini
Browse files

minor fix in VNFD parsing for SOL003 APIs

parent ef5add67

SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot

+2 −2
Original line number Original line Diff line number Diff line
@@ -1530,7 +1530,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/SOL006/VNFD/vnfd_SOL001.yaml 

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

    @{VDU_labels}=    Create List

    @{VDU_labels}=    Create List

    @{VNF_labels}=    Create List

    @{VNF_labels}=    Create List

    @{VirtualLink_labels}=    Create List

    @{VirtualLink_labels}=    Create List
@@ -1566,7 +1566,7 @@ Fetch Information from SOL001 descriptor file 




Get VNF Attributes from SOL001

Get VNF Attributes from SOL001

    [Arguments]    ${VNF_label}

    [Arguments]    ${VNF_label}

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

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

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

SOL003/VNFLifecycleOperationGranting-API/VNFLifecycleOperationGrantingKeywords.robot

+2 −2
Original line number Original line Diff line number Diff line
@@ -173,7 +173,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/SOL006/VNFD/vnfd_SOL001.yaml    

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

    @{VDU_labels}=    Create List

    @{VDU_labels}=    Create List

    @{VNF_labels}=    Create List

    @{VNF_labels}=    Create List

    @{VirtualLink_labels}=    Create List

    @{VirtualLink_labels}=    Create List
@@ -208,7 +208,7 @@ Fetch Information from SOL001 descriptor file 




Get VNF Attributes from SOL001

Get VNF Attributes from SOL001

    [Arguments]    ${VNF_label}

    [Arguments]    ${VNF_label}

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

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

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

SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot

+2 −2
Original line number Original line Diff line number Diff line
@@ -1631,7 +1631,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/SOL006/VNFD/vnfd_SOL001.yaml    

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

    @{VDU_labels}=    Create List

    @{VDU_labels}=    Create List

    @{VNF_labels}=    Create List

    @{VNF_labels}=    Create List

    @{VirtualLink_labels}=    Create List

    @{VirtualLink_labels}=    Create List
@@ -1666,7 +1666,7 @@ Fetch Information from SOL001 descriptor file 




Get VNF Attributes from SOL001

Get VNF Attributes from SOL001

    [Arguments]    ${VNF_label}

    [Arguments]    ${VNF_label}

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

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

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