Commit 28a922e6 authored by Elian Kraja's avatar Elian Kraja
Browse files

Fix issue #134 on mockserver configuration incongruency

parent 043ba856

SOL005/NSDManagement-API/NSDManagementKeywords.robot

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

    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

    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}

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

       

       

Check Notification Endpoint

Check Notification Endpoint

    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}    

    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}

SOL005/NSDManagement-API/environment/variables.txt

+1 −1
Original line number Original line 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

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





${callback_port}    9091

${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}    /nsd/subscriptions

${callback_endpoint_error}    /subs_404

${callback_endpoint_error}    /subs_404

${callback_endpoint_fwd}    /endpoint/check

${callback_endpoint_fwd}    /endpoint/check

SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot

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

    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

    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}

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

    

    

    

    

Check Notification Endpoint

Check Notification Endpoint

SOL005/NSPerformanceManagement-API/environment/variables.txt

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

${testOptionalMethods}    0





${callback_port}    9091

${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}    /nspm/subscriptions

${callback_endpoint_error}    /subs_404

${callback_endpoint_error}    /subs_404

${sleep_interval}    20s

${sleep_interval}    20s