Commit 9b8ec7fe authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

updated NSD, VNFD, PNFD files and zip management

parent 21fc5ae0

SOL005/NSDManagement-API/NSDManagementKeywords.robot

+5 −5
Original line number Original line Diff line number Diff line
@@ -373,7 +373,7 @@ GET NSD Content with invalid Range Request 




Send PUT Request to upload NSD Content as zip file in asynchronous mode

Send PUT Request to upload NSD Content as zip file in asynchronous mode

    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False

    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False

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

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

    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}

    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}

    Should Be Empty     ${response.text}

    Should Be Empty     ${response.text}

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

    ${response}=    Create Dictionary   status=${response.status_code}
@@ -381,7 +381,7 @@ Send PUT Request to upload NSD Content as zip file in asynchronous mode 




Send PUT Request to upload NSD Content as zip file in synchronous mode

Send PUT Request to upload NSD Content as zip file in synchronous mode

    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False

    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False

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

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

    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}

    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}

    Should Be Empty     ${response.text}

    Should Be Empty     ${response.text}

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

    ${response}=    Create Dictionary   status=${response.status_code}
@@ -405,7 +405,7 @@ Check Postcondition NSD Content is uploaded and available in the NFVO 
Send PUT Request to upload NSD Content with conflict due to onboarding state

Send PUT Request to upload NSD Content with conflict due to onboarding state

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

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

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

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

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

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

    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}

    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}

    Log         ${response}

    Log         ${response}

    ${response}=    Create Dictionary   status=${response.status_code}  headers=${response.headers}     body=${response.json()}

    ${response}=    Create Dictionary   status=${response.status_code}  headers=${response.headers}     body=${response.json()}
@@ -700,8 +700,8 @@ Get PNFD Content with conflict due to onboarding state 




Send PUT Request to upload PNFD Content as zip file

Send PUT Request to upload PNFD Content as zip file

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

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

    Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}"}      verify=False

    Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False

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

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

    ${response}=    Put Request     pnfd     ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content     data=${body}

    ${response}=    Put Request     pnfd     ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content     data=${body}

    Should Be Empty     ${response.text}

    Should Be Empty     ${response.text}

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

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

SOL005/NSDManagement-API/environment/variables.txt

+4 −2
Original line number Original line Diff line number Diff line
@@ -64,7 +64,8 @@ ${NFVO_RANGE_OK} 1 
${range}          bytes=0-1023

${range}          bytes=0-1023

${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes

${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes

${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6

${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6

${contentZipFile}    files/nsdContent.zip

${contentZipNsd}    files/nsd.zip

${contentFileNsd}    files/nsd.zip

${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44

${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44

${BAD_AUTHORIZATION}    Bear sometoken

${BAD_AUTHORIZATION}    Bear sometoken

${original_etag}    1234

${original_etag}    1234
@@ -82,7 +83,8 @@ ${erroneous_pnfdInfoId} erroneous_pnfdInfoId 
${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348

${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348

${erroneous_pnfdId}    erroneousPnfdId

${erroneous_pnfdId}    erroneousPnfdId

${onboardingStatePnfdId}    8ed2bf1f-f6ae-4d18-b478-bfab02fd4cd2

${onboardingStatePnfdId}    8ed2bf1f-f6ae-4d18-b478-bfab02fd4cd2

${contentFilePnfd}    files/pnfdContent.zip

${contentZipPnfd}    files/pnfd.zip

${contentFilePnfd}    files/pnfd.yml

${creatingPnfdId}    2e4ce0ef-3ea8-49f9-92dd-8771866015bb

${creatingPnfdId}    2e4ce0ef-3ea8-49f9-92dd-8771866015bb

${userDefinedDataSet}    some

${userDefinedDataSet}    some

SOL005/NSDManagement-API/files/nsd.yml

0 → 100644
+3 −0
Original line number Original line Diff line number Diff line 
nsd:

-id: nsd_id

-name: nsd_name
 
 No newline at end of file

SOL005/NSDManagement-API/files/nsd.zip

0 → 100644
+182 B

File added.

No diff preview for this file type.

View file

SOL005/NSDManagement-API/files/pnfd.yml

0 → 100644
+3 −0
Original line number Original line Diff line number Diff line 
pnfd:

-id: pnfd_id

-name: pnfd_name
 
 No newline at end of file