Commit 102df751 authored by uihassan's avatar uihassan
Browse files

VNF Descriptors added for 7.3.3.2.1

parent bb61db5f

SOL003/VNFLifecycleOperationGranting-API/Grants.robot

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=fals 
Library    OperatingSystem

Library    JSONLibrary

Library    JSONSchemaLibrary    schemas/

Variables    descriptors/SOL001/vnf-b-1_VNF.yaml

Documentation    This resource represents grants. The client can use this resource to obtain permission

...     from the NFVO to perform a particular VNF lifecycle operation.

SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ GET Individual VNF Package 
    Check HTTP Response Status Code Is    200

    Check HTTP Response Body Json Schema Is   vnfPkgInfo

    Check HTTP Response Body vnfPkgInfo Identifier matches the requested VNF Package

    Check HTTP Response Body of Individual VNF Package content against VNF Descriptor



GET Individual VNF Package with invalid resource identifier

    [Documentation]    Test ID: 7.3.3.2.2

SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot

+40 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Library Collections 
Library    JSONSchemaLibrary    schemas/

Library    Process

Library    String



Variables    descriptors/SOL001/vnf-b-1_VNF.yaml



*** Keywords ***

Get all VNF Packages
@@ -1525,3 +1525,41 @@ Check Postcondition VNF Package Subscription is Deleted 
    Log    Check Postcondition Subscription is deleted

    GET individual VNF Package Subscription

    Check HTTP Response Status Code Is    404 

    

Check HTTP Response Body of Individual VNF Package content against VNF Descriptor

    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Package    ELSE    Parse SOL006 VNF Package    

    

Parse SOL001 VNF Package

    Get key for VNF Descriptor

    

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

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

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

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

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

    

    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}

    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}

    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}

    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}

    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}

    

Get key for VNF Descriptor

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

        Log    ${key}

        ${check1}=    Run Keyword And Return Status    Should Be Equal As Strings    ${topology_template.node_templates.${key}.type}    tosca.nodes.nfv.VNF

        Run Keyword If     ${check1}     Set Global Variable    ${vnfKey}    ${key}   

    END

    

Parse SOL006 VNF Package

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

     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}

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

     

    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}

    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}

    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}

    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}

    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
 
 No newline at end of file