Commit 6c159fa9 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

Merge branch '3.3.1-fix-plu' into '3.3.1-dev' 

merge 3.3.1 fix plu into 3.3.1 dev

See merge request !198
parents 176b7257 f24d1ff6

.jenkins.sh

+12 −0
Original line number Diff line number Diff line
@@ -12,7 +12,18 @@ run_dir="$(pwd)" 
echo "Using git branch $GIT_BRANCH"



bash ./scripts/build-container.sh

ret=$?

if [ "$ret" != "0" ]; then

     echo "build-container.sh failed"

     exit -1

fi



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

ret=$?

if [ "$ret" != "0" ]; then

     echo "run-container.sh failed"

     exit -1

fi



if [[ "$GIT_BRANCH" =~ .*fix-plu$ ]]; then
@@ -30,3 +41,4 @@ fi 
ret=$?

echo "Final validation result: $ret"

exit $ret

SOL002/VNFConfiguration-API/Configuration.robot

+2 −1
Original line number Diff line number Diff line
@@ -136,7 +136,8 @@ Check HTTP Response Header Contains 
    

Check HTTP Response Body Json Schema Is

    [Arguments]    ${input}

    Should Contain    ${response['headers']['Content-Type']}    application/problem+json

    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json

    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json

    ${schema}=    Catenate    SEPARATOR=    ${input}    .schema.json

    Validate Json    ${schema}    ${response['body']}

    Log    Json Schema Validation OK

SOL002/VNFFaultManagement-API/Alarms.robot

+2 −1
Original line number Diff line number Diff line
@@ -352,7 +352,8 @@ Check HTTP Response Header Contains 
    

Check HTTP Response Body Json Schema Is

    [Arguments]    ${input}

    Should Contain    ${response['headers']['Content-Type']}    application/json

    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json

    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json

    ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json

    Validate Json    ${schema}    ${response['body']}

    Log    Json Schema Validation OK

SOL002/VNFFaultManagement-API/IndividualAlarm.robot

+2 −1
Original line number Diff line number Diff line
@@ -191,7 +191,8 @@ Check HTTP Response Status Code Is 
    

Check HTTP Response Body Json Schema Is

    [Arguments]    ${input}

    Should Contain    ${response['headers']['Content-Type']}    application/json

    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json

    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json

    ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json

    Validate Json    ${schema}    ${response['body']}

    Log    Json Schema Validation OK

SOL002/VNFFaultManagement-API/IndividualSubscription.robot

+2 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ Check HTTP Response Status Code Is 
    

Check HTTP Response Body Json Schema Is

    [Arguments]    ${input}

    Should Contain    ${response['headers']['Content-Type']}    application/json

    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json

    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json

    ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json

    Validate Json    ${schema}    ${response['body']}

    Log    Json Schema Validation OK