diff --git a/SRV/UETAG/PlatUeIdentity.robot b/SRV/UETAG/PlatUeIdentity.robot index ae5b0e629a3c13866eefa707d02aa676d647b927..836b914bebcace024f7fd5015eb2f8b476d7db3a 100644 --- a/SRV/UETAG/PlatUeIdentity.robot +++ b/SRV/UETAG/PlatUeIdentity.robot @@ -15,12 +15,12 @@ Request UE Identity Tag information [Documentation] TC_MEC_SRV_UETAG_001_OK ... Check that the IUT responds with the information on a UE Identity tag when queried by a MEC Application ... Reference ETSI GS MEC 014 V1.1.1, clause 7.3.3.1 - ... Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo + ... Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo Get UE Identity Tag information Check HTTP Response Status Code Is 200 Check HTTP Response Body Json Schema Is ueIdentityTagInfo Check Result Contains ${response['body']['ueIdentityTagInfo']['ueIdentityTags']} ueIdentityTag ${UE_IDENTITY_TAG} - + Request UE Identity Tag information using bad parameters [Documentation] TC_MEC_SRV_UETAG_001_BR @@ -44,13 +44,13 @@ Register an UE Identity Tag [Documentation] TP_MEC_SRV_UETAG_002_OK ... Check that the IUT registers a tag (representing a UE) or a list of tags when commanded by a MEC Application ... Reference ETSI GS MEC 014 V1.1.1, clause 7.3.3.2 - ... Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo + ... Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo Update an UE Identity Tag {"ueIdentityTags":[{"ueIdentityTag":"${UE_IDENTITY_TAG}","state":"REGISTERED"}]} Check HTTP Response Status Code Is 200 Check HTTP Response Body Json Schema Is UeIdentityTagInfo Log Checking Postcondition Check User Identity Tag state ${UE_IDENTITY_TAG} REGISTERED - + Register an UE Identity Tag using invalid state [Documentation] TP_MEC_SRV_UETAG_002_BR @@ -59,33 +59,34 @@ Register an UE Identity Tag using invalid state ... Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo Update an UE Identity Tag using invalid state {"ueIdentityTags":[{"ueIdentityTag":"${UE_IDENTITY_TAG}","state":"INVALID_STATE"}]} Check HTTP Response Status Code Is 400 - - + + Unregister an UE Identity Tag already in unregistered state [Documentation] TP_MEC_SRV_UETAG_002_PF ... Check that the IUT responds with ProblemDetails on information an invalid URI ... Reference ETSI GS MEC 014 V1.1.1, clause 7.3.3.2 - ... Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo + ... Reference https://forge.etsi.org/gitlab/mec/gs014-ue-identity-api/blob/master/UEidentityAPI.yaml#/definitions/UeIdentityTagInfo Update an UE Identity Tag using a not applicable valid state {"ueIdentityTags":[{"ueIdentityTag":"${UE_IDENTITY_TAG_INVALID_STATE}","state":"UNREGISTERED"}]} Check HTTP Response Status Code Is 412 - + *** Keywords *** Get UE Identity Tag information - Should Be True ${PIC_MEC_PLAT} == '1' - Should Be True ${PIC_SERVICES} == '1' + Should Be True ${PIC_MEC_PLAT} == 1 + Should Be True ${PIC_SERVICES} == 1 Set Headers {"Accept":"application/json"} Set Headers {"Content-Type":"application/json"} Set Headers {"Authorization":"${TOKEN}"} Set Headers {"Content-Length":"0"} Get /exampleAPI/ui/v1/${APP_INSTANCE_ID}/ue_identity_tag_info?ueIdentityTag=${UE_IDENTITY_TAG} ${output}= Output response - - + Set Suite Variable ${response} ${output} + + Get UE Identity Tag information using bad parameters # FIXME Which IE protocol should be invalid? - Should Be True ${PIC_MEC_PLAT} == '1' - Should Be True ${PIC_SERVICES} == '1' + Should Be True ${PIC_MEC_PLAT} == 1 + Should Be True ${PIC_SERVICES} == 1 Set Headers {"Accept":"application/json"} Set Headers {"Content-Type":"application/json"} Set Headers {"Authorization":"${TOKEN}"} @@ -96,8 +97,8 @@ Get UE Identity Tag information using bad parameters Get UE Identity Tag information using non-existent application instance - Should Be True ${PIC_MEC_PLAT} == '1' - Should Be True ${PIC_SERVICES} == '1' + Should Be True ${PIC_MEC_PLAT} == 1 + Should Be True ${PIC_SERVICES} == 1 Set Headers {"Accept":"application/json"} Set Headers {"Content-Type":"application/json"} Set Headers {"Authorization":"${TOKEN}"} @@ -105,27 +106,28 @@ Get UE Identity Tag information using non-existent application instance Get /exampleAPI/ui/v1/${NON_EXISTENT_APP_INSTANCE_ID}/ue_identity_tag_info?ueIdentityTag=${UE_IDENTITY_TAG} ${output}= Output response Set Suite Variable ${response} ${output} - + Update an UE Identity Tag [Arguments] ${content} - Should Be True ${PIC_MEC_PLAT} == '1' - Should Be True ${PIC_SERVICES} == '1' + Should Be True ${PIC_MEC_PLAT} == 1 + Should Be True ${PIC_SERVICES} == 1 Set Headers {"Accept":"application/json"} Set Headers {"Content-Type":"application/json"} Set Headers {"Authorization":"${TOKEN}"} - ## As far as I understood, we are not checking preconditions. + ## As far as I understood, we are not checking preconditions. # Preamble: Check that the user tag is not registered ## Check User Identity Tag state ${UE_IDENTITY_TAG} UNREGISTERED + log ${content} Put /exampleAPI/ui/v1/${APP_INSTANCE_ID}/ue_identity_tag_info ${content} ${output}= Output response Set Suite Variable ${response} ${output} - + Update an UE Identity Tag using invalid state [Arguments] ${content} - Should Be True ${PIC_MEC_PLAT} == '1' - Should Be True ${PIC_SERVICES} == '1' + Should Be True ${PIC_MEC_PLAT} == 1 + Should Be True ${PIC_SERVICES} == 1 Set Headers {"Accept":"application/json"} Set Headers {"Content-Type":"application/json"} Set Headers {"Authorization":"${TOKEN}"} @@ -133,12 +135,12 @@ Update an UE Identity Tag using invalid state Put /exampleAPI/ui/v1/${APP_INSTANCE_ID}/ue_identity_tag_info ${content} ${output}= Output response Set Suite Variable ${response} ${output} - -Update an UE Identity Tag using a not applicable valid state + +Update an UE Identity Tag using a not applicable valid state [Arguments] ${content} - Should Be True ${PIC_MEC_PLAT} == '1' - Should Be True ${PIC_SERVICES} == '1' + Should Be True ${PIC_MEC_PLAT} == 1 + Should Be True ${PIC_SERVICES} == 1 Set Headers {"Accept":"application/json"} Set Headers {"Content-Type":"application/json"} Set Headers {"Authorization":"${TOKEN}"} @@ -146,6 +148,5 @@ Update an UE Identity Tag using a not applicable valid state Put /exampleAPI/ui/v1/${APP_INSTANCE_ID}/ue_identity_tag_info ${content} ${output}= Output response Set Suite Variable ${response} ${output} - + # TODO Check ProblemDetails - \ No newline at end of file diff --git a/SRV/UETAG/environment/pics.txt b/SRV/UETAG/environment/pics.txt index 9a354ccca8bbfe4e1cab12ef8490c21e3e1ab8a9..24dbc9a87a21f6cc53c6bfb3ae51c051db9a8906 100644 --- a/SRV/UETAG/environment/pics.txt +++ b/SRV/UETAG/environment/pics.txt @@ -1,4 +1,4 @@ *** Variables *** -${PIC_MEC_PLAT} 1 -${PIC_SERVICES} 1 \ No newline at end of file +${PIC_MEC_PLAT} 1 +${PIC_SERVICES} 1 diff --git a/SRV/UETAG/environment/variables.txt b/SRV/UETAG/environment/variables.txt index d211c763304315bf8b8365a79c15db7ae5a3bb31..492b598d03722a2c7d227c8d077d66ffb40a1ee9 100644 --- a/SRV/UETAG/environment/variables.txt +++ b/SRV/UETAG/environment/variables.txt @@ -2,7 +2,7 @@ ${MEC-APP_SCHEMA} http #${MEC-APP_HOST} 172.28.4.87 #${MEC-APP_HOST} 127.0.0.1 -${MEC-APP_HOST} 10.192.2.172 +${MEC-APP_HOST} 192.168.56.1 ${MEC-APP_PORT} 8081 ${ZONE_ID} zone01 ${APP_INSTANCE_ID} appInst01 diff --git a/SRV/UETAG/resources/GenericKeywords.robot b/SRV/UETAG/resources/GenericKeywords.robot index f19dfc0f2faf991b7e838d72337f7f0ca8a601e2..d06df4d60538eb2fb1bb5860c1317a6929dea76a 100644 --- a/SRV/UETAG/resources/GenericKeywords.robot +++ b/SRV/UETAG/resources/GenericKeywords.robot @@ -33,7 +33,6 @@ Should Be Present In Json List Log Item found ${item} [return] ${item} - -Check Result Contains +Check Result Contains [Arguments] ${source} ${parameter} ${value} - Should Be Present In Json List ${source} ${parameter} ${value} \ No newline at end of file + Should Be Present In Json List ${source} ${parameter} ${value} diff --git a/SRV/UETAG/resources/UEidentityAPI.robot b/SRV/UETAG/resources/UEidentityAPI.robot index a3f3a8f93a070acbfaec0bd1031150f98b7876b7..9e4bafd13c3fc587e5fe2ed416bcc9137d97c8f8 100644 --- a/SRV/UETAG/resources/UEidentityAPI.robot +++ b/SRV/UETAG/resources/UEidentityAPI.robot @@ -9,8 +9,8 @@ Library JSONSchemaLibrary schemas/ *** Keywords *** Check User Identity Tag state [Arguments] ${ue_identity_tag} ${state} - Should Be True ${PIC_MEC_PLAT} == '1' - Should Be True ${PIC_SERVICES} == '1' + Should Be True ${PIC_MEC_PLAT} 1 + Should Be True ${PIC_SERVICES} 1 Log Check ueIdentityTag state ${state} Set Headers {"Accept":"application/json"} Set Headers {"Content-Type":"application/json"} diff --git a/schemas/UeIdentityTagInfo.schema.json b/SRV/UETAG/schemas/UeIdentityTagInfo.schema.json similarity index 100% rename from schemas/UeIdentityTagInfo.schema.json rename to SRV/UETAG/schemas/UeIdentityTagInfo.schema.json