Commit be5112ce authored by Elian Kraja's avatar Elian Kraja
Browse files

Merge branch '2.4.1-mock-fix' into '2.4.1-fix-plu' 

Issue #134 on Mock configuration inconsistency

See merge request nfv/api-tests!144
parents 6b3faf6e b995a6e2

.jenkins.sh

0 → 100644
+17 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright ETSI 2018

# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt



#set -vx

#set -e



cd "$(dirname "$0")"



run_dir="$(pwd)"



bash ./scripts/build-container.sh

bash ./scripts/run-container.sh "${run_dir}"



ret=$?

echo "Final validation result: $ret"

exit $ret

SOL005/NSDManagement-API/NSDManagementKeywords.robot

+1 −1
Original line number Diff line number Diff line
@@ -1027,7 +1027,7 @@ Create Sessions 
    Pass Execution If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 0    MockServer not started as NFVO is not checking the notification endpoint

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

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

    Create Mock Session  ${callback_uri}

    Create Mock Session  ${callback_uri}:${callback_port}

    

    

Check Notification Endpoint

SOL005/NSDManagement-API/environment/variables.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ ${NFVO_AUTH_USAGE} 1 
${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar



${callback_port}    9091

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

${callback_uri}    http://172.22.1.7

${callback_endpoint}    /nsd/subscriptions

${callback_endpoint_error}    /subs_404

${callback_endpoint_fwd}    /endpoint/check

SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot

+1 −1
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ Create Sessions 
    Pass Execution If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 0    MockServer not started as NFVO is not checking the notification endpoint

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

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

    Create Mock Session  ${callback_uri}

    Create Mock Session  ${callback_uri}:${callback_port}

    

    

Check Notification Endpoint

SOL005/NSPerformanceManagement-API/environment/variables.txt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ ${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies. 
${testOptionalMethods}    0



${callback_port}    9091

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

${callback_uri}    http://172.22.1.7

${callback_endpoint}    /nspm/subscriptions

${callback_endpoint_error}    /subs_404

${sleep_interval}    20s