From 988a980293aba526b8a21c9cfba9ac7c980b15a0 Mon Sep 17 00:00:00 2001 From: piscione Date: Mon, 13 May 2024 09:20:15 +0200 Subject: [PATCH] Fixes on TCs of MEC013 --- MEC013/SRV/UEAREALOOK/PlatUeAreaLookup.robot | 17 ++++++---- .../jsons/UserAreaSubscription.json | 1 + .../SRV/UEDISTLOOK/PlatUeDistanceLookup.robot | 2 +- .../jsons/UserDistanceSubscription.json | 32 +++++++++---------- .../SRV/UELOCLOOK/PlatUeLocationLookup.robot | 12 +++---- .../UserLocationPeriodicSubscription.json | 1 + MEC013/SRV/UEZONELOOK/PlatUeZoneLookup.robot | 2 +- 7 files changed, 35 insertions(+), 32 deletions(-) diff --git a/MEC013/SRV/UEAREALOOK/PlatUeAreaLookup.robot b/MEC013/SRV/UEAREALOOK/PlatUeAreaLookup.robot index 6d51d58..153174e 100644 --- a/MEC013/SRV/UEAREALOOK/PlatUeAreaLookup.robot +++ b/MEC013/SRV/UEAREALOOK/PlatUeAreaLookup.robot @@ -15,9 +15,10 @@ Default Tags TC_MEC_SRV_UEAREASUB *** Test Cases *** -TP_MEC_MEC013_SRV_UEAREALOOK_001_OK_01 +TC_MEC_MEC013_SRV_UEAREALOOK_001_OK_01 [Documentation] - ... Check that the IUT responds with a list of UE area subscriptions when queried by a MEC Application - No filter + ... Check that the IUT responds with a list of UE area subscriptions + ... when queried by a MEC Application - No filter ... ... Reference ETSI GS MEC 013 3.1.1 Clause 5.3.2 ... ETSI GS MEC 013 3.1.1 Clause 6.3.3 @@ -32,9 +33,10 @@ TP_MEC_MEC013_SRV_UEAREALOOK_001_OK_01 [TearDown] Remove subscription ${SUB_ID} -TP_MEC_MEC013_SRV_UEAREALOOK_001_OK_02 +TC_MEC_MEC013_SRV_UEAREALOOK_001_OK_02 [Documentation] - ... Check that the IUT responds with a list of UE area subscriptions when queried by a MEC Application - No filter + ... Check that the IUT responds with a list of UE area subscriptions + ... when queried by a MEC Application - No filter ... ... Reference ETSI GS MEC 013 3.1.1 Clause 5.3.2 ... ETSI GS MEC 013 3.1.1 Clause 6.3.8 @@ -50,7 +52,7 @@ TP_MEC_MEC013_SRV_UEAREALOOK_001_OK_02 [TearDown] Remove subscription ${SUB_ID} -TP_MEC_MEC013_SRV_UEAREALOOK_002_OK +TC_MEC_MEC013_SRV_UEAREALOOK_002_OK [Documentation] ... Check that the IUT acknowledges the change of UE area subscription request ... when commanded by a MEC Application @@ -68,10 +70,10 @@ TP_MEC_MEC013_SRV_UEAREALOOK_002_OK [TearDown] Remove subscription ${SUB_ID} -TP_MEC_MEC013_SRV_UEAREALOOK_002_NF +TC_MEC_MEC013_SRV_UEAREALOOK_002_NF [Documentation] ... Check that the IUT responds with an error - ... when a request for an URI that cannot be mapped to a valid resource URI is sent by a MEC Application + ... when a request for an URI that cannot be mapped to a valid resource URI is sent by a MEC Application ... ... Reference ETSI GS MEC 013 3.1.1 Clause 6.3.8 ... ETSI GS MEC 013 3.1.1 Clause 6.4.8 @@ -127,6 +129,7 @@ Create new subscription Set Headers {"Authorization":"${TOKEN}"} ${file}= Catenate SEPARATOR= jsons/ ${content} .json ${body}= Get File ${file} + Log ${apiRoot}/${apiName}/${apiVersion}/subscriptions/area Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions/area ${body} ${output}= Output response Set Suite Variable ${response} ${output} diff --git a/MEC013/SRV/UEAREALOOK/jsons/UserAreaSubscription.json b/MEC013/SRV/UEAREALOOK/jsons/UserAreaSubscription.json index aafb876..6d710e7 100644 --- a/MEC013/SRV/UEAREALOOK/jsons/UserAreaSubscription.json +++ b/MEC013/SRV/UEAREALOOK/jsons/UserAreaSubscription.json @@ -1,5 +1,6 @@ { "subscriptionType": "UserAreaSubscription", + "callbackReference" :"somecallback", "areaDefine": { "shape": 1, "points": [ diff --git a/MEC013/SRV/UEDISTLOOK/PlatUeDistanceLookup.robot b/MEC013/SRV/UEDISTLOOK/PlatUeDistanceLookup.robot index 1db676a..2ff8e90 100644 --- a/MEC013/SRV/UEDISTLOOK/PlatUeDistanceLookup.robot +++ b/MEC013/SRV/UEDISTLOOK/PlatUeDistanceLookup.robot @@ -17,7 +17,6 @@ ${response} *** Test Cases *** - TC_MEC_MEC013_SRV_UEDISTLOOK_001_OK [Documentation] ... Check that the IUT responds with the list of UE distance subscriptions to a UE @@ -97,6 +96,7 @@ Create new subscription Set Headers {"Authorization":"${TOKEN}"} ${file}= Catenate SEPARATOR= jsons/ ${content} .json ${body}= Get File ${file} + Log ${body} Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions/distance ${body} ${output}= Output response Set Suite Variable ${response} ${output} diff --git a/MEC013/SRV/UEDISTLOOK/jsons/UserDistanceSubscription.json b/MEC013/SRV/UEDISTLOOK/jsons/UserDistanceSubscription.json index 337a1f1..5c338c1 100644 --- a/MEC013/SRV/UEDISTLOOK/jsons/UserDistanceSubscription.json +++ b/MEC013/SRV/UEDISTLOOK/jsons/UserDistanceSubscription.json @@ -1,18 +1,16 @@ { - "userDistanceSubscription": { - "subscriptionType": "UserDistanceSubscription", - "clientCorrelator": "0123", - "callbackReference": "http://my.callback.com/user-distance/some-id", - "referenceAddress": [ - "acr:10.0.0.3" - ], - "monitoredAddress": [ - "acr:10.0.0.1", - "acr:10.0.0.2" - ], - "distance": 100, - "trackingAccuracy": 10, - "criteria": "AllWithinDistance", - "checkImmediate": true - } - } \ No newline at end of file + "subscriptionType": "UserDistanceSubscription", + "clientCorrelator": "0123", + "callbackReference": "http://my.callback.com/user-distance/some-id", + "referenceAddress": [ + "acr:10.0.0.3" + ], + "monitoredAddress": [ + "acr:10.0.0.1", + "acr:10.0.0.2" + ], + "distance": 100, + "trackingAccuracy": 10, + "criteria": "AllWithinDistance", + "checkImmediate": true +} \ No newline at end of file diff --git a/MEC013/SRV/UELOCLOOK/PlatUeLocationLookup.robot b/MEC013/SRV/UELOCLOOK/PlatUeLocationLookup.robot index db5cf88..9d2157a 100644 --- a/MEC013/SRV/UELOCLOOK/PlatUeLocationLookup.robot +++ b/MEC013/SRV/UELOCLOOK/PlatUeLocationLookup.robot @@ -87,7 +87,7 @@ TC_MEC_MEC013_SRV_UELOCLOOK_002_OK_03 -TP_MEC_MEC013_SRV_UELOCLOOK_002_BR +TC_MEC_MEC013_SRV_UELOCLOOK_002_BR [Documentation] ... Check that the IUT responds with an error when ... inconsistent request was sent by a MEC Application - Invalid filter @@ -104,7 +104,7 @@ TP_MEC_MEC013_SRV_UELOCLOOK_002_BR -TP_MEC_MEC013_SRV_UELOCLOOK_002_NF +TC_MEC_MEC013_SRV_UELOCLOOK_002_NF [Documentation] ... Check that the IUT responds with an error ... when inconsistent request was sent by a MEC Application @@ -113,14 +113,14 @@ TP_MEC_MEC013_SRV_UELOCLOOK_002_NF ... ETSI GS MEC 013 3.1.1, clause 7.5.3.1 [Tags] PIC_MEC_PLAT PIC_SERVICES - [Setup] Create multiple subscriptions and get sub ids UserLocationEventSubscription UserLocationPeriodicSubscription + [Setup] Remove subscriptions ${SUB_ID_01} ${SUB_ID_02} Get subscriptions Check HTTP Response Status Code Is 404 [TearDown] Remove subscriptions ${SUB_ID_01} ${SUB_ID_02} -TP_MEC_MEC013_SRV_UELOCLOOK_003_OK_01 +TC_MEC_MEC013_SRV_UELOCLOOK_003_OK_01 [Documentation] ... Check that the IUT responds with the subscription ... when queried by a MEC Application - UE location Event @@ -139,7 +139,7 @@ TP_MEC_MEC013_SRV_UELOCLOOK_003_OK_01 [TearDown] Remove subscription ${SUB_ID} -TP_MEC_MEC013_SRV_UELOCLOOK_003_OK_02 +TC_MEC_MEC013_SRV_UELOCLOOK_003_OK_02 [Documentation] ... Check that the IUT responds with the subscription when queried by a MEC Application - UE location Periodic ... @@ -158,7 +158,7 @@ TP_MEC_MEC013_SRV_UELOCLOOK_003_OK_02 -TP_MEC_MEC013_SRV_UELOCLOOK_003_NF +TC_MEC_MEC013_SRV_UELOCLOOK_003_NF [Documentation] ... Check that the IUT responds with an error ... when the non existing subscription is queried by a MEC Application diff --git a/MEC013/SRV/UELOCLOOK/jsons/UserLocationPeriodicSubscription.json b/MEC013/SRV/UELOCLOOK/jsons/UserLocationPeriodicSubscription.json index b2c76fa..c555314 100644 --- a/MEC013/SRV/UELOCLOOK/jsons/UserLocationPeriodicSubscription.json +++ b/MEC013/SRV/UELOCLOOK/jsons/UserLocationPeriodicSubscription.json @@ -1,5 +1,6 @@ { "subscriptionType": "UserLocationPeriodicSubscription", + "callbackReference": "http://10.3.0.0.8:8888", "address": "acr:10.0.4.3", "periodicEventInfo": { "reportingAmount": 10, diff --git a/MEC013/SRV/UEZONELOOK/PlatUeZoneLookup.robot b/MEC013/SRV/UEZONELOOK/PlatUeZoneLookup.robot index f18faa6..a986ac1 100644 --- a/MEC013/SRV/UEZONELOOK/PlatUeZoneLookup.robot +++ b/MEC013/SRV/UEZONELOOK/PlatUeZoneLookup.robot @@ -101,7 +101,7 @@ TC_MEC_MEC013_SRV_UEZONELOOK_002_NF ... ETSI GS MEC 013 3.1.1 Clause 6.3.3 ... ETSI GS MEC 013 3.1.1 Clause 7.11.3.1 [Tags] PIC_MEC_PLAT PIC_SERVICES - Get subscriptions + Get the zone info location ${NOT_EXISTING_SUB_ID} Check HTTP Response Status Code Is 404 -- GitLab