Commit e62c2a37 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

fixed VNF Package upload in v2.6.1 as per tacker feedback in NFVSOL(24)000060

parent f7acedb0

SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot

+15 −19
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_veri 
Library           Process

Library           MockServerLibrary

Library           String



Library           RequestsLibrary



*** Keywords ***

Get all VNF Packages
@@ -517,16 +517,13 @@ Send PUT Request for individual VNF Package Content 
    Set Suite Variable    ${response}    ${output}



Send PUT Request to upload VNF Package Content

    Log    Trying to perform a PUT. This method upload the content of a NSD

    Set Headers    {"Accept": "${ACCEPT_ZIP}"}

    Set Headers    {"Content-Type": "application/zip"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    ${body}=  Get Binary File     ${contentZipVnfPackage}

    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${newVnfPackageId}/package_content    ${body}

    ${response}=    Output    response body

    Should Be Empty    ${response} 

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Log    Trying to perform a PUT. This method upload the content of a VNFD

    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}      verify=False

    ${body}=  Get Binary File     files/vnfPackage2.zip

    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${newVnfPackageId}/package_content    data=${body}

    Should Be Empty     ${response.text}

    ${response}=    Create Dictionary   status=${response.status_code}

    Set Suite Variable      ${response}     ${response}



Check Postcondition VNF Package Content is uploaded and available in the NFVO

    Log    Trying to get a VNF Package Content
@@ -536,14 +533,13 @@ Check Postcondition VNF Package Content is uploaded and available in the NFVO 
    Integer    response status    200

 

Send PUT Request to upload VNF Package Content with conflict due to onboarding state

    Log    Trying to perform a PUT. This method upload the content of a NSD

    Set Headers    {"Accept": "${ACCEPT_ZIP}"}

    Set Headers    {"Content-Type": "application/zip"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    Log    Trying to perform a PUT. This method upload the content of a VNFD

    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}      verify=False

    ${body}=  Get Binary File     ${contentZipVnfPackage}

    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${creatingVnfPackageId}/package_content    ${body}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output} 

    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${creatingVnfPackageId}/package_content    data=${body}

    Should Be Empty     ${response.text}

    ${response}=    Create Dictionary   status=${response.status_code}

    Set Suite Variable      ${response}     ${response}

 

Send PATCH Request for individual VNF Package Content

    Log    Trying to perform a PATCH (method should not be implemented)