From 0dd579b450d56e19fd0198ecfa38fee20eb1f54e Mon Sep 17 00:00:00 2001 From: Sascha Hackel Date: Fri, 15 Mar 2024 10:26:11 +0100 Subject: [PATCH] re-work initial conditions for CMP group --- test_purposes/Ngap_Common.tplan2 | 5 ++++ test_purposes/ngap/TP_AMF_NGAP2.tplan2 | 34 +++++++++++++++++--------- test_purposes/ngap/TP_GNB_NGAP.tplan2 | 32 +++++++++++++++--------- 3 files changed, 47 insertions(+), 24 deletions(-) diff --git a/test_purposes/Ngap_Common.tplan2 b/test_purposes/Ngap_Common.tplan2 index f41e1df..bba66d4 100644 --- a/test_purposes/Ngap_Common.tplan2 +++ b/test_purposes/Ngap_Common.tplan2 @@ -68,6 +68,7 @@ Package Ngap_Common { - PICS_A4/1_3 //AMF - PDU session management procedure - PDU SESSION RESOURCE MODIFY REQUEST - PICS_A4/1_4 //AMF - PDU session management procedure - PDU SESSION RESOURCE MODIFY NOTIFY - PICS_A4/1_5 //AMF - PDU session management procedure - PDU SESSION RESOURCE MODIFY INDICATION + - PICS_A4/2_1 //AMF - UE Context Management Procedures - INITIAL CONTEXT SETUP REQUEST - PICS_A4/2_3 //AMF - UE Context Management Procedures - UE CONTEXT RELEASE COMMAND - PICS_A4/2_4 //AMF - UE Context Management Procedures - UE CONTEXT MODIFICATION REQUEST - PICS_A4/2_6 //AMF - UE Context Management Procedures - CONNECTION ESTABLISHMENT INDICATION @@ -136,12 +137,15 @@ Package Ngap_Common { - hasInitiatedPS2CSinAlertingState - hasEstablishedDialog - hasEstablishedPS2CSDialog + - hasEstablishedInitialContext - isConfiguredWithENUMentryForTelURI_E164NumberOf - hasReceivedInitialRequestForDialog - hasReceived200OkOnInitialRequestForDialogWith - hasReceived180OnInitialRequest - hasReceived200OkCancel - hasReceivedTerminatedRequest + - hasSuspendedContext + - hasPendingDataTransmission - registeredPublicIdsWithTelUriAndSipUri - hasReceivedSubsequentOrTargetRefreshRequestInDialog - previouslyEstablishedCallWith @@ -151,6 +155,7 @@ Package Ngap_Common { - isNoLongerAvailable - isTriggeredToDetachUser - isRequestedToDetachfromNetwork + - isTransitioningTo - hasAchievedFirstREGISTER - hasResponded486INVITE - hasAchievedInitialINVITE diff --git a/test_purposes/ngap/TP_AMF_NGAP2.tplan2 b/test_purposes/ngap/TP_AMF_NGAP2.tplan2 index e9fe7b0..e8c3692 100644 --- a/test_purposes/ngap/TP_AMF_NGAP2.tplan2 +++ b/test_purposes/ngap/TP_AMF_NGAP2.tplan2 @@ -291,10 +291,10 @@ Package TP_AMF { Config Id CFG_AMF_01 - PICS Selection PICS_A2/2 and PICS_A3/5_1 //TODO: Not sure here. What is the PIC for INITIAL CONTEXT SETUP REQUEST? + PICS Selection PICS_A2/2 and PICS_A4/2_1 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF } Expected behaviour @@ -345,7 +345,8 @@ Package TP_AMF { PICS Selection PICS_A2/2 and PICS_A4/2_3 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO:check Initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext } Expected behaviour @@ -383,7 +384,8 @@ Package TP_AMF { PICS Selection PICS_A2/2 and PICS_A4/2_3 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO:check Initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext } Expected behaviour @@ -427,7 +429,8 @@ Package TP_AMF { PICS Selection PICS_A2/2 and PICS_A4/2_4 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext } Expected behaviour @@ -468,7 +471,7 @@ Package TP_AMF { PICS Selection PICS_A2/2 and PICS_A4/2_6 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF } Expected behaviour @@ -509,7 +512,8 @@ Package TP_AMF { PICS Selection PICS_A2/2 and PICS_A4/2_7 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext } Expected behaviour @@ -551,7 +555,8 @@ Package TP_AMF { PICS Selection PICS_A2/2 and PICS_A4/2_9 and PICS_A4/2_10 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext } Expected behaviour @@ -601,7 +606,8 @@ Package TP_AMF { PICS Selection PICS_A2/2 and PICS_A4/2_11 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext } Expected behaviour @@ -612,7 +618,7 @@ Package TP_AMF { RAN_UE_NGAP_ID, PDU_Session_Resource_Suspend_List containing PDU_Session_Resource_Suspend_Item containing - PDU_SessionId, + PDU_SessionId indicating value PX_PDU_ID, UE_Context_Suspend_Request_Transfer ; ; @@ -644,7 +650,9 @@ Package TP_AMF { PICS Selection PICS_A2/2 and PICS_A4/2_11 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext and + the UE entity hasPendingDataTransmission } Expected behaviour @@ -694,7 +702,8 @@ Package TP_AMF { PICS Selection PICS_A2/2 and PICS_A4/2_12 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasSuspendedContext } Expected behaviour @@ -730,6 +739,7 @@ Package TP_AMF { } // end TP TP_NGAP_AMF_CMP_07 + //TODO: error case 8.3.12.3 } // end Group "UE Context Resume" diff --git a/test_purposes/ngap/TP_GNB_NGAP.tplan2 b/test_purposes/ngap/TP_GNB_NGAP.tplan2 index 91ab7c8..ecedb0d 100644 --- a/test_purposes/ngap/TP_GNB_NGAP.tplan2 +++ b/test_purposes/ngap/TP_GNB_NGAP.tplan2 @@ -550,7 +550,7 @@ Package TP_GNB { PICS Selection PICS_A2/1 and PICS_A3/2_1 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO + the UE entity isRegisteredTo the AMF } Expected behaviour @@ -601,7 +601,8 @@ Package TP_GNB { PICS Selection PICS_A2/1 and PICS_A3/2_1 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO; check initial conditions + the UE entity isRegisteredTo the AMF + // TODO: and the UE entity notEstablishedContextProperly } Expected behaviour @@ -613,7 +614,7 @@ Package TP_GNB { GUAMI, PDU_Session_Resource_Setup_Request_List containing PDU_Session_Resource_Setup_Request_Item containing - PDU_SessionId, + PDU_SessionId indicating value PX_PDU_ID, S_NSSAI, PDU_Session_Resource_Setup_Request_Transfer ; @@ -658,7 +659,8 @@ Package TP_GNB { PICS Selection PICS_A2/1 and PICS_A3/2_2 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext } Expected behaviour @@ -704,7 +706,8 @@ Package TP_GNB { PICS Selection PICS_A2/1 and PICS_A3/2_3 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext } Expected behaviour @@ -751,7 +754,8 @@ Package TP_GNB { PICS Selection PICS_A2/1 and PICS_A3/2_3 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext } Expected behaviour @@ -841,7 +845,8 @@ Package TP_GNB { PICS Selection PICS_A2/1 and PICS_A3/2_4 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext } Expected behaviour @@ -884,7 +889,8 @@ Package TP_GNB { PICS Selection PICS_A2/1 and PICS_A3/2_5 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity isTransitioningTo the RRC_INACTIVE } Expected behaviour @@ -926,7 +932,8 @@ Package TP_GNB { PICS Selection PICS_A2/1 and PICS_A3/2_8 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext } Expected behaviour @@ -969,7 +976,8 @@ Package TP_GNB { PICS Selection PICS_A2/1 and PICS_A3/2_11 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasEstablishedInitialContext } Expected behaviour @@ -994,7 +1002,6 @@ Package TP_GNB { } // end TP TP_NGAP_GNB_CMP_05 - }// end Group UE Context Suspend Group "UE Context Resume" @@ -1015,7 +1022,8 @@ Package TP_GNB { PICS Selection PICS_A2/1 and PICS_A3/2_12 Initial conditions with { - the UE entity isRegisteredTo the AMF // TODO: check initial conditions + the UE entity isRegisteredTo the AMF and + the UE entity hasSuspendedContext } Expected behaviour -- GitLab