Commit ea60d8f7 authored by Frank Bryden's avatar Frank Bryden Committed by Frank Bryden
Browse files

Reverted extra changes 



Signed-off-by: default avatarbrydenf <frank.bryden@etsi.org>
parent 73a7ab39

SOL005/NSDManagement-API/NSDManagementKeywords.robot

+0 −6
Original line number Original line Diff line number Diff line
@@ -342,7 +342,6 @@ Get single file NSD Content in Plain or Zip Format 
    Set Headers    {"Accept": "${ACCEPT_ZIP}, ${ACCEPT_PLAIN}"}

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

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

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

    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content

    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd_content

    Rest Instances      frankie.json

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -402,10 +401,8 @@ 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  ${contentZipFile}

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

    Log     ${response}

    Should Be Empty     ${response.text}

    Should Be Empty     ${response.text}

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

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

    Log     ${response}

    Set Suite Variable      ${response}     ${response}

    Set Suite Variable      ${response}     ${response}
@@ -423,7 +420,6 @@ Send PUT Request to upload NSD Content as zip file in synchronous mode 
    ${body}=  Get Binary File  ${contentZipFile}

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

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

    #Log     Got frankie's put with ${response.status_code}

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

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

    Set Suite Variable      ${response}     ${response}

    Set Suite Variable      ${response}     ${response}
@@ -748,10 +744,8 @@ Send PUT Request to upload PNFD Content as plain text file 
    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": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}"}      verify=False

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

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

    ${response}=    Put Request     pnfd     ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoUpld}/pnfd_content     data=${body}

    ${response}=    Put Request     pnfd     ${apiRoot}/${apiName}/${apiVersion}/pnf_descriptors/${pnfdInfoUpld}/pnfd_content     data=${body}

    Log     ${response}

    Should Be Empty     ${response.text}

    Should Be Empty     ${response.text}

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

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

    Log     ${response}

    Set Suite Variable      ${response}     ${response}

    Set Suite Variable      ${response}     ${response}

SOL005/NSDManagement-API/NSDManagementNotification.robot

+0 −2
Original line number Original line Diff line number Diff line
@@ -295,8 +295,6 @@ Configure Notification Forward 
    Create Mock Expectation With Http Forward  ${notification_tmp}  ${notification_fwd}

    Create Mock Expectation With Http Forward  ${notification_tmp}  ${notification_fwd}





Create Sessions

Create Sessions

    ${dir}=     List Directory  ${MOCK_SERVER_DIR}

    Log     ${dir}

    Start Process  java  -jar ${MOCK_SERVER_JAR} -serverPort  ${callback_port}  alias=mockInstance

    Start Process  java  -jar ${MOCK_SERVER_JAR} -serverPort  ${callback_port}  alias=mockInstance

    Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue

    Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue

    Create Mock Session  ${callback_uri}:${callback_port}
 
    Create Mock Session  ${callback_uri}:${callback_port}
 
 No newline at end of file

SOL005/NSDManagement-API/environment/variables.txt

+0 −2
Original line number Original line Diff line number Diff line
@@ -15,9 +15,7 @@ ${FIELD_USAGE} 1 
${NFVO_AUTHENTICATION}    Bearer isDGF7TiifGUgzeNb0Fls9aatfZRy4iX #never referenced

${NFVO_AUTHENTICATION}    Bearer isDGF7TiifGUgzeNb0Fls9aatfZRy4iX #never referenced

${NFVO_AUTH_USAGE}    1 #never refernced

${NFVO_AUTH_USAGE}    1 #never refernced





#MOCK_SERVER_JAR one too many '..'

${MOCK_SERVER_JAR}    ../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar

${MOCK_SERVER_JAR}    ../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar

${MOCK_SERVER_DIR}    ../../bin/





${callback_port}    9091

${callback_port}    9091

${callback_uri}    http://172.22.1.7:${callback_port}

${callback_uri}    http://172.22.1.7:${callback_port}