Commit 8645a139 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

updated NSD, VNFD, PNFD management in v2.6.1

parent 4ab1dd0a

SOL005/NSDManagement-API/NSDManagementKeywords.robot

+8 −7
Original line number Original line Diff line number Diff line
@@ -405,7 +405,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

    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_JSON}", "Content-Type": "application/zip", "${AUTHORIZATION_HEADER}": "${AUTHORIZATION_TOKEN}"}      verify=False

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

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

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

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

    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/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}
@@ -414,7 +414,7 @@ Send PUT Request to upload NSD Content as zip file in asynchronous mode 
Send PUT Request to upload NSD Content as plain text file in asynchronous mode

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

    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_PLAIN}", "${AUTHORIZATION_HEADER}": "${AUTHORIZATION_TOKEN}", "Content-Type": "text/plain"}      verify=False

    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_PLAIN}", "${AUTHORIZATION_HEADER}": "${AUTHORIZATION_TOKEN}", "Content-Type": "text/plain"}      verify=False

    ${body}=  Get File  ${contentPlainFile}

    ${body}=  Get File  ${contentPlainNsd}

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

    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/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}
@@ -423,7 +423,7 @@ Send PUT Request to upload NSD Content as plain text 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

    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_JSON}", "Content-Type": "application/zip", "${AUTHORIZATION_HEADER}": "${AUTHORIZATION_TOKEN}"}      verify=False

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

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

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

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

    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/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}
@@ -432,7 +432,7 @@ Send PUT Request to upload NSD Content as zip file in synchronous mode 
Send PUT Request to upload NSD Content as plain text file in synchronous mode

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

    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_PLAIN}", "${AUTHORIZATION_HEADER}": "${AUTHORIZATION_TOKEN}", "Content-Type": "text/plain"}      verify=False

    Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_PLAIN}", "${AUTHORIZATION_HEADER}": "${AUTHORIZATION_TOKEN}", "Content-Type": "text/plain"}      verify=False

    ${body}=  Get File  ${contentPlainFile}

    ${body}=  Get File  ${contentPlainNsd}

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

    ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiVersion}/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}
@@ -457,9 +457,9 @@ 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

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

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

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

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

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

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

    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${creatingNsdInfoId}/nsd_content    ${body}

    PUT    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${creatingNsdInfoId}/nsd_content    ${body}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output} 

    Set Suite Variable    ${response}    ${output}
@@ -747,9 +747,10 @@ Send PUT Request to upload PNFD Content as plain text file 
Send PUT Request to upload PNFD Content with conflict due to onboarding state

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

    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

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

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

    Set Headers    {"Content-Type": "text/plain"}

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

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

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

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

    PUT    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${creatingNsdInfoId}/pnfd_content    ${body}

    PUT    ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${creatingPnfdInfoId}/pnfd_content    ${body}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output} 

    Set Suite Variable    ${response}    ${output}

SOL005/NSDManagement-API/environment/nsDescriptors.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -19,8 +19,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

${contentPlainFile}    files/nsdContent.yaml

${contentPlainNsd}    files/nsd.yml

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

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

${NEG_AUTHORIZATION_TOKEN}    Bearer negativetoken

${NEG_AUTHORIZATION_TOKEN}    Bearer negativetoken

${BAD_AUTHORIZATION_TOKEN}    Bear sometoken

${BAD_AUTHORIZATION_TOKEN}    Bear sometoken

SOL005/NSDManagement-API/environment/pnfDescriptors.txt

+3 −2
Original line number Original line Diff line number Diff line
@@ -10,7 +10,8 @@ ${ACCEPT_PLAIN} text/plain 
${CONTENT_TYPE_PLAIN}    text/plain

${CONTENT_TYPE_PLAIN}    text/plain

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

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

${contentFilePnfd}    files/pnfd.yml

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

${userDefinedDataSet}    some

${userDefinedDataSet}    some

${pnfdInfoUpld}
 
${pnfdInfoUpld}
 
 No newline at end of file

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