Commit d7494b97 authored by uihassan's avatar uihassan
Browse files

Descriptors for 6.3.5.2.2 added

parent 9530726b

SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ GET Information about an individual VNF Instance 
    GET individual vnfInstance

    Check HTTP Response Status Code Is    200

    Check HTTP Response Body Json Schema Is    vnfInstance

    Check HTTP Response Body vnfInstance content against VNF Descriptor

    

PUT Individual VNFInstance - Method not implemented 

     [Documentation]    Test ID: 6.3.5.2.3

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

+39 −0
Original line number Diff line number Diff line
@@ -1031,3 +1031,42 @@ Get key for VNF Descriptor 
        ${check1}=    Run Keyword And Return Status    Should End With    ${key}    VNF

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

    END



Check HTTP Response Body vnfInstance content against VNF Descriptor

    #${check_descriptors} flag, 1 to check descriptors

    Run Keyword If    ${check_descriptors} == 1    Check Individual VNF Instance Content

    

Check Individual VNF Instance Content    

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

    

Parse SOL001

    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}

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

    

    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}

    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}

    

Parse SOL006

    #Log    SOL006 code

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

SOL002/VNFLifecycleManagement-API/environment/variables.txt

+2 −1
Original line number Diff line number Diff line
@@ -81,3 +81,4 @@ ${callbackResp} localhost 


${descriptorType}    SOL001

${vnfKey}    {}

${check_descriptors}	1
 
 No newline at end of file