diff --git a/MEC012/SRV/RNIS/RnisNotifications.robot b/MEC012/SRV/RNIS/RnisNotifications.robot index a80dadf5b881bba9cc2ef4926c0fecca8c58af88..984ac7636b6204d07bd03fef870dc78ed6816b5d 100644 --- a/MEC012/SRV/RNIS/RnisNotifications.robot +++ b/MEC012/SRV/RNIS/RnisNotifications.robot @@ -21,7 +21,7 @@ TC_MEC_MEC012_SRV_RNIS_001_OK ... service has an associated subscription and the event is generated ... ETSI GS MEC 012 2.2.1, clause 6.4.2 Should Be True ${PIC_RNIS_NOTIFICATIONS} == 1 - [Setup] Send a request for a subscription CellChangeSubscriptionRequest + [Setup] Send a request for a subscription CellChangeSubscription Spawn Notification Server CellChangeNotification Validate Json CellChangeNotification.schema.json ${payload_notification} [TearDown] Delete subscription ${SUB_ID} @@ -157,8 +157,6 @@ Delete subscription ${output}= Output response Set Suite Variable ${response} ${output} - - Spawn Notification Server [Arguments] ${payload_notification} ${output} Spawn Web Server ${NOTIFICATION_SERVER_IP} ${NOTIFICATION_SERVER_PORT} ${NOTIFICATION_SERVER_TIMEOUT} ${NOTIFICATION_SERVER_HTTP_METHOD} ${NOTIFICATION_SERVER_URI} ${payload_notification} diff --git a/MEC012/SRV/RNIS/RnisNotifications_noSetup.robot b/MEC012/SRV/RNIS/RnisNotifications_noSetup.robot deleted file mode 100644 index df5ddd2f6ea14c3c0476ff3f8bb093937afab832..0000000000000000000000000000000000000000 --- a/MEC012/SRV/RNIS/RnisNotifications_noSetup.robot +++ /dev/null @@ -1,165 +0,0 @@ -''[Documentation] robot --outputdir ../../outputs ./RnisNotifications_BV.robot -... Test Suite to validate RNIS/Notification (RNIS) operations. - -*** Settings *** - -Resource environment/variables.txt -Resource ../../../pics.txt -Resource ../../../GenericKeywords.robot -Library libraries/Server.py -Library REST ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT} ssl_verify=false -Library BuiltIn -Library OperatingSystem -Library Collections -Library String - - -*** Test Cases *** -TC_MEC_MEC012_SRV_RNIS_001_OK - [Documentation] - ... Check that the RNIS service sends an RNIS notification about cell change if the RNIS - ... service has an associated subscription and the event is generated - ... ETSI GS MEC 012 2.2.1, clause 6.4.2 - Should Be True ${PIC_RNIS_NOTIFICATIONS} == 1 - #[Setup] Send a request for a subscription CellChangeSubscriptionRequest - Spawn Notification Server 10.30.8.189 8888 ${NOTIFICATION_SERVER_TIMEOUT} POST /callback_url CellChangeNotification - Validate Json CellChangeNotification.schema.json ${payload_notification} - #[TearDown] Delete subscription ${SUB_ID} - -TC_MEC_MEC012_SRV_RNIS_002_OK - [Documentation] - ... Check that the RNIS service sends an RNIS notification about RAB establishment - ... if the RNIS service has an associated subscription and the event is generated - ... ETSI GS MEC 012 2.2.1, clause 6.4.3 - Should Be True ${PIC_RNIS_NOTIFICATIONS} == 1 - #[Setup] Send a request for a subscription RabEstSubscriptionRequest - Spawn Notification Server 10.30.8.189 8888 ${NOTIFICATION_SERVER_TIMEOUT} POST /callback_url RabEstNotification - Validate Json RabEstNotification.schema.json ${payload_notification} - #[TearDown] Delete subscription ${SUB_ID} - - - -TC_MEC_MEC012_SRV_RNIS_003_OK - [Documentation] - ... Check that the RNIS service sends an RNIS notification about RAB modification - ... if the RNIS service has an associated subscription and the event is generated - ... ETSI GS MEC 012 2.2.1, clause 6.4.4 - Should Be True ${PIC_RNIS_NOTIFICATIONS} == 1 - #[Setup] Send a request for a subscription RabModSubscription - Spawn Notification Server 10.30.8.189 8888 ${NOTIFICATION_SERVER_TIMEOUT} POST /callback_url RabModNotification - Validate Json RabModNotification.schema.json ${payload_notification} - #[TearDown] Delete subscription ${SUB_ID} - - -TC_MEC_MEC012_SRV_RNIS_004_OK - [Documentation] - ... Check that the RNIS service sends an RNIS notification about RAB release - ... if the RNIS service has an associated subscription and the event is generated - ... ETSI GS MEC 012 2.2.1, clause 6.4.5 - Should Be True ${PIC_RNIS_NOTIFICATIONS} == 1 - #[Setup] Send a request for a subscription RabRelSubscription - Spawn Notification Server 10.30.8.189 8888 5 POST /callback_url RabRelNotification - Validate Json RabRelNotification.schema.json ${payload_notification} - #[TearDown] Delete subscription ${SUB_ID} - - -TC_MEC_MEC012_SRV_RNIS_005_OK - [Documentation] - ... Check that the RNIS service sends an RNIS notification about UE measurement report - ... if the RNIS service has an associated subscription and the event is generated - ... ETSI GS MEC 012 2.2.1, clause 6.4.6 - Should Be True ${PIC_RNIS_NOTIFICATIONS} == 1 - #[Setup] Send a request for a subscription MeasRepUeSubscription - Spawn Notification Server 10.30.8.189 8888 ${NOTIFICATION_SERVER_TIMEOUT} POST /callback_url MeasRepUeNotification - Validate Json MeasRepUeNotification.schema.json ${payload_notification} - #[TearDown] Delete subscription ${SUB_ID} - -TC_MEC_MEC012_SRV_RNIS_006_OK - [Documentation] - ... Check that the RNIS service sends an RNIS notification about UE timing advance - ... if the RNIS service has an associated subscription and the event is generated - ... ETSI GS MEC 012 2.2.1, clause 6.4.7 - Should Be True ${PIC_RNIS_NOTIFICATIONS} == 1 - #[Setup] Send a request for a subscription MeasTaSubscription - Spawn Notification Server 10.30.8.189 8888 ${NOTIFICATION_SERVER_TIMEOUT} POST /callback_url MeasTaNotification - Validate Json MeasTaNotification.schema.json ${payload_notification} - #[TearDown] Delete subscription ${SUB_ID} - - -TC_MEC_MEC012_SRV_RNIS_007_OK - [Documentation] - ... Check that the RNIS service sends an RNIS notification about UE carrier aggregation reconfiguration - ... if the RNIS service has an associated subscription and the event is generated - ... ETSI GS MEC 012 2.2.1, clause 6.4.8 - Should Be True ${PIC_RNIS_NOTIFICATIONS} == 1 - #[Setup] Send a request for a subscription CaReconfSubscription - Spawn Notification Server 10.30.8.189 8888 ${NOTIFICATION_SERVER_TIMEOUT} POST /callback_url CaReconfNotification - Validate Json CaReconfNotification.schema.json ${payload_notification} - #[TearDown] Delete subscription ${SUB_ID} - - -TC_MEC_MEC012_SRV_RNIS_008_OK - [Documentation] - ... Check that the RNIS service sends an RNIS notification about S1-U bearer - ... if the RNIS service has an associated subscription and the event is generated - ... ETSI GS MEC 012 2.2.1, clause 6.4.10 - Should Be True ${PIC_RNIS_NOTIFICATIONS} == 1 - #[Setup] Send a request for a subscription S1BearerSubscription - Spawn Notification Server 10.30.8.189 8888 ${NOTIFICATION_SERVER_TIMEOUT} POST /callback_url S1BearerNotification - Validate Json S1BearerNotification.schema.json ${payload_notification} - #[TearDown] Delete subscription ${SUB_ID} - - -TC_MEC_MEC012_SRV_RNIS_009_OK - [Documentation] - ... Check that the RNIS service sends an RNIS notification about 5G NR UE measurement report - ... if the RNIS service has an associated subscription and the event is generated - ... ETSI GS MEC 012 2.2.1, clause 6.4.11 - Should Be True ${PIC_RNIS_NOTIFICATIONS} == 1 - #[Setup] Send a request for a subscription NrMeasRepUeSubscription - Spawn Notification Server 10.30.8.189 8888 ${NOTIFICATION_SERVER_TIMEOUT} POST /callback_url NrMeasRepUeNotification - Validate Json NrMeasRepUeNotification.schema.json ${payload_notification} - #[TearDown] Delete subscription ${SUB_ID} - -TC_MEC_MEC012_SRV_RNIS_010_OK - [Documentation] - ... Check that the RNIS service sends an RNIS notification about cell change if the RNIS - ... service has an associated subscription and the event is generated - ... ETSI GS MEC 012 2.2.1, clause 6.4.2 - Should Be True ${PIC_RNIS_NOTIFICATIONS} == 1 - #[Setup] Send a request for a subscription CellChangeSubscriptionRequestWithExpiration - Spawn Notification Server 10.30.8.189 8888 ${NOTIFICATION_SERVER_TIMEOUT} POST /callback_url ExpiryNotification - Validate Json ExpiryNotification.schema.json ${payload_notification} - #[TearDown] Delete subscription ${SUB_ID} - - -*** Keywords *** -Send a request for a subscription - [Arguments] ${content} - Set Headers {"Accept":"application/json"} - Set Headers {"Content-Type":"application/json"} - Set Headers {"Authorization":"${TOKEN}"} - ${file}= Catenate SEPARATOR= jsons/ ${content} .json - ${body}= Get File ${file} - Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body} - ${output}= Output response - Set Suite Variable ${response} ${output} - ${elements} = Split String ${response['headers']['Location']} / - Set Suite Variable ${SUB_ID} ${elements[4]} - - -Delete subscription - [Arguments] ${subscription_id} - Set Headers {"Accept":"application/json"} - Set Headers {"Content-Type":"application/json"} - Set Headers {"Authorization":"${TOKEN}"} - Delete ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscription_id} - ${output}= Output response - Set Suite Variable ${response} ${output} - - - -Spawn Notification Server - [Arguments] ${host} ${port} ${timeout} ${method} ${endpoint} ${payload_notification} - ${output} Spawn Web Server ${host} ${port} ${timeout} ${method} ${endpoint} ${payload_notification} - Set Suite Variable ${payload_notification} ${output} diff --git a/MEC012/SRV/RNIS/environment/variables.txt b/MEC012/SRV/RNIS/environment/variables.txt index d073df4ccd058253b4a0b845dc86c2aaf8f86d09..da47b01259af508794fb68f563c8b25c32b6d9cf 100644 --- a/MEC012/SRV/RNIS/environment/variables.txt +++ b/MEC012/SRV/RNIS/environment/variables.txt @@ -13,11 +13,11 @@ ${SUB_ID} ##Notification Server variables -${NOTIFICATION_SERVER_IP} 10.30.8.189 +${NOTIFICATION_SERVER_IP} 127.0.0.1 ${NOTIFICATION_SERVER_PORT} 8888 ${NOTIFICATION_SERVER_HTTP_METHOD} POST ${NOTIFICATION_SERVER_URI} /callback_url -${NOTIFICATION_SERVER_TIMEOUT} 10 +${NOTIFICATION_SERVER_TIMEOUT} 5 ${APP_INS_ID} appInsId diff --git a/MEC012/SRV/RNIS/jsons/S1BearerNotification.json b/MEC012/SRV/RNIS/jsons/S1BearerNotification.json index 6590a88f292143ca4153d86379a952103a118d13..56d2e002075386e99abae0b8190fe04900ebd99f 100644 --- a/MEC012/SRV/RNIS/jsons/S1BearerNotification.json +++ b/MEC012/SRV/RNIS/jsons/S1BearerNotification.json @@ -15,7 +15,7 @@ { "enbInfo": { "ipAddress": "127.0.0.1", - "tunnelIdaa": "tunnelId" + "tunnelId": "tunnelId" }, "erabId": 1234, "sGwInfo": {