Commit a2f15601 authored by zafar's avatar zafar
Browse files

SOL006 descriptors added

parent 3fb8875a

SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ Get status information about multiple VNF instances 
    ...    Post-Conditions: none 

    Get Individual VNF LCM OP occurrences

    Check HTTP Response Status Code Is    200

    Check HTTP Response Body Json Schema Is    VnfLcmOpOcc 

    Check HTTP Response Body Json Schema Is    vnfLcmOpOcc 

    Check HTTP Response Body vnf LCM OpOCC content against VNF Descriptor



PUT status information about multiple VNF instances - Method not implemented

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

+15 −8
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Library JSONLibrary 
Library    Collections

Library    JSONSchemaLibrary    schemas/

Library           String

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

Variables    descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml



*** Keywords ***
@@ -204,9 +204,9 @@ PATCH individual vnfInstance 
    Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}

    Set Headers    {"If-Match": "${original_etag}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance

    ${template}=    Get File    jsons/patchBodyRequest.json

    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}

    #Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance

    ${body}=    Get File    jsons/patchBodyRequest.json

    #${body}=        Format String   ${template}     vnfdId=${descriptor_id}

    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}
@@ -1108,12 +1108,19 @@ Parse SOL001 LCM Op Occ 
    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}

    ${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']['vnfdVersion']}    ${descriptor_version}

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

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

    

Parse SOL006 LCM Op Occ

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

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

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

     ${virtual_storage}=    Get Variable Value    ${nfv.vnfd[0].virtual-storage-desc.id}

     ${virtual_link}=    Get Variable Value    ${nfv.vnfd[0].int-virtual-link-desc.id}

     

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

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

    Should Be Equal As Strings    ${response['body']['resourceChanges']['affectedVirtualLinks']['vnfVirtualLinkDescId']}    ${virtual_link}

    Should Be Equal As Strings    ${response['body']['resourceChanges']['affectedVnfcs']['vduId']}    ${vdu_id}

    Should Be Equal As Strings    ${response['body']['resourceChanges']['affectedVirtualStorages']['virtualStorageDescId']}    ${virtual_storage}

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

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

SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json

+1 −1
Original line number Diff line number Diff line 
{

  "vnfInstanceName": "vnf new name",

  "vnfInstanceDescription": "new description",

  "vnfdId": "{vnfdId}"

  "vnfdId": ""

}
 
 No newline at end of file