Commit 5bdf3d1e authored by juvancic's avatar juvancic
Browse files

Merge branch 'devel' of https://forge.etsi.org/rep/int/5g-core/ngap into devel

parents 3c9865a9 a1547418
Loading
Loading
Loading
Loading
+93 −0
Original line number Original line Diff line number Diff line
@@ -895,6 +895,99 @@ module NGAP_TCFunctions {
        group UE_Context_Management_Procedures{
        group UE_Context_Management_Procedures{
            //8.3.1
            //8.3.1
            group Initial_Context_Setup{
            group Initial_Context_Setup{
              
              /**
               * @desc Testcase function for TP_NGAP_GNB_CMP_01
               */
               function f_TC_NGAP_GNB_CMP_01() runs on aMFNGAPComponent {
             		 
             	   // Preamble
                   f_NGAP_amf_init();
                   f_NGAP_amf_UE_Register();
                   f_NGAP_amf_UE_PDU_ResourceSetup();
                   f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
                   log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                   
                   
                   // Body
                   f_send_NGAP_PDU(
                   	m_ngap_initMsg(
                   		m_n2_InitialContextSetupRequest 
                   		(	
                   		-,
                   		-,
                   		m_gUAMI,
                   		{	
                   		  {
                   		  	PX_PDU_SESSION_ID,
                   		  	omit,
							m_s_NSSAI('00'O, '000000'O),
							bit2oct(
                            	encvalue(
        							m_pDUSessionResourceSetupRequestTransfer(
        								m_pDUSessionResourceSetupRequestTransfer_mandatories(
                                                     m_pDUSessionType(ipv4),
                                                     {
                                                       m_qosFlowSetupRequestItem(
                                                         PX_QOS_FLOW_IDENTIFIER,
                                                         m_qosFlowLevelQosParameters(
                                                           m_qosCharacteristics_dynamic5QI(
                                                             m_dynamic5QIDescriptor(
                                                               1,//in template (value) PriorityLevelQos p_priorityLevelQos,
                                                               0,//in template (value) PacketDelayBudget p_packetDelayBudget,
                                                               m_PacketErrorRate(
                                                                 0,//in template (value) PacketErrorRate.pERScalar p_pERScalar,
                                                                 0//in template (value) PacketErrorRate.pERExponent p_pERExponent
                                                           ))),
                                                           m_allocationAndRetentionPriority(
                                                             1,//in template (value) PriorityLevelARP p_priorityLevelARP,
                                                             shall_not_trigger_pre_emption,//in template (value) Pre_emptionCapability p_pre_emptionCapability,
                                                             not_pre_emptable//in template (value) Pre_emptionVulnerability p_pre_emptionVulnerability,
                                                           )))
                                                     },
                                                     m_uPTransportLayerInformation_gTPTunnel(
                                                       m_gTPTunnel
                                       ))))
							),
							omit
                   		  }
							
                   		},
                   		{ 
                        m_allowedNSSAI_Item(
                        	m_s_NSSAI('00'O, '000000'O)
                            ) 
                        },
                   		m_uESecurityCapabilities,
                   		-	
                   		)));
                   		
                   		
                   f_recv_NGAP_PDU(
                     mw_ngap_succMsg(
                     	mw_n2_InitialContextSetupResponse(
                     		-,
                     		-,
                     		{
                     		  {
                     		    ?,
                     		    ?,
                     		    *
                     		  }
                     		}
                     	)
                     ));
                     
                   f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                   log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");

                   // Postamble
                   f_postamble_NGAP_gNB();
                   f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
                   log("*** " & __SCOPE__ & ": INFO: Postamble done. ***");
                   
               } // End of function f_TC_NGAP_GNB_CMP_01
              
            } // End of group Initial_Context_Setup
            } // End of group Initial_Context_Setup
            //8.3.2
            //8.3.2
            group UE_Context_Release_Request_NG_RAN_node_initiated{
            group UE_Context_Release_Request_NG_RAN_node_initiated{
+7 −7
Original line number Original line Diff line number Diff line
@@ -476,7 +476,7 @@ module NGAP_TestCases {
               /**
               /**
                 * @desc Test objective "Verify that the NG-RAN node successfully processes a INITIAL CONTEXT SETUP REQUEST contains optional PDU Session Resource Setup Request List field mandatory IEs and answers with INITIAL CONTEXT SETUP RESPONSE with successfully established UE context."
                 * @desc Test objective "Verify that the NG-RAN node successfully processes a INITIAL CONTEXT SETUP REQUEST contains optional PDU Session Resource Setup Request List field mandatory IEs and answers with INITIAL CONTEXT SETUP RESPONSE with successfully established UE context."
                 */
                 */
                testcase TP_NGAP_GNB_CMP_01() runs on aMFNGAPComponent system TestAdapter {
                testcase TC_NGAP_GNB_CMP_01() runs on aMFNGAPComponent system TestAdapter {
                  
                  
                  	// Local variables
                  	// Local variables
                    var aMFNGAPComponent v_ngap_amf;
                    var aMFNGAPComponent v_ngap_amf;
@@ -491,14 +491,14 @@ module NGAP_TestCases {
                    f_cf_NGAP_aMF_Up(v_ngap_amf);
                    f_cf_NGAP_aMF_Up(v_ngap_amf);


                    // Start
                    // Start
                   // v_ngap_amf.start(f_TC_NGAP_GNB_CMP_01());
                    v_ngap_amf.start(f_TC_NGAP_GNB_CMP_01());


                    // synchronize PTC on 1 sychronization points
                    // synchronize PTC on 1 sychronization points
                    f_serverSyncNClientsAndStop(1, {c_prDone, c_tbDone, c_poDone});
                    f_serverSyncNClientsAndStop(1, {c_prDone, c_tbDone, c_poDone});


                    f_cf_Down/*gNBoraMF*/();
                    f_cf_Down/*gNBoraMF*/();
                  
                  
                } // End of testcase TP_NGAP_GNB_CMP_01
                } // End of testcase TC_NGAP_GNB_CMP_01
            } // End of group Initial_Context_Setup
            } // End of group Initial_Context_Setup
            //8.3.2
            //8.3.2
            group UE_Context_Release_Request_NG_RAN_node_initiated{
            group UE_Context_Release_Request_NG_RAN_node_initiated{
@@ -509,7 +509,7 @@ module NGAP_TestCases {
              	/**
              	/**
                 * @desc Test objective "Verify that the NG-RAN node successfully processes a UE CONTEXT RELEASE COMMAND that contains both the AMF UE NGAP ID IE and the RAN UE NGAP ID IE and answers with UE CONTEXT RELEASE COMPLETE with successfully release UE context.""
                 * @desc Test objective "Verify that the NG-RAN node successfully processes a UE CONTEXT RELEASE COMMAND that contains both the AMF UE NGAP ID IE and the RAN UE NGAP ID IE and answers with UE CONTEXT RELEASE COMPLETE with successfully release UE context.""
                 */
                 */
                testcase TP_NGAP_GNB_CMP_08() runs on aMFNGAPComponent system TestAdapter {
                testcase TC_NGAP_GNB_CMP_08() runs on aMFNGAPComponent system TestAdapter {
                  
                  
                  	// Local variables
                  	// Local variables
                    var aMFNGAPComponent v_ngap_amf;
                    var aMFNGAPComponent v_ngap_amf;
@@ -531,12 +531,12 @@ module NGAP_TestCases {


                    f_cf_Down/*gNBoraMF*/();
                    f_cf_Down/*gNBoraMF*/();
                  
                  
                } // End of testcase TP_NGAP_GNB_CMP_08
                } // End of testcase TC_NGAP_GNB_CMP_08
                
                
                /**
                /**
                 * @desc Test objective "Verify that the NG-RAN node successfully processes a UE CONTEXT RELEASE COMMAND where only the AMF UE NGAP ID IE is available and answers with UE CONTEXT RELEASE COMPLETE with successfully release UE context."
                 * @desc Test objective "Verify that the NG-RAN node successfully processes a UE CONTEXT RELEASE COMMAND where only the AMF UE NGAP ID IE is available and answers with UE CONTEXT RELEASE COMPLETE with successfully release UE context."
                 */
                 */
                testcase TP_NGAP_GNB_CMP_09() runs on aMFNGAPComponent system TestAdapter {
                testcase TC_NGAP_GNB_CMP_09() runs on aMFNGAPComponent system TestAdapter {
                  
                  
                  	// Local variables
                  	// Local variables
                    var aMFNGAPComponent v_ngap_amf;
                    var aMFNGAPComponent v_ngap_amf;
@@ -558,7 +558,7 @@ module NGAP_TestCases {


                    f_cf_Down/*gNBoraMF*/();
                    f_cf_Down/*gNBoraMF*/();
                  
                  
                } // End of testcase TP_NGAP_GNB_CMP_09
                } // End of testcase TC_NGAP_GNB_CMP_09
              
              
            } // End of group UE_Context_Release_AMF_initiated
            } // End of group UE_Context_Release_AMF_initiated
            //8.3.4
            //8.3.4
+10 −2
Original line number Original line Diff line number Diff line
@@ -873,7 +873,11 @@ module LibNGAP_Templates {
                        template (value) InitiatingMessage m_n2_InitialContextSetupRequest(
                        template (value) InitiatingMessage m_n2_InitialContextSetupRequest(
                                                                                           in template (value) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID,
                                                                                           in template (value) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID,
                                                                                           in template (value) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID,
                                                                                           in template (value) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID,
                                                                                           in template (value) PDUSessionResourceSetupListCxtReq p_pDUSessionResourceSetupListCxtReq
                                                                                           in template (value) GUAMI p_gUAMI,
                                                                                           in template (value) PDUSessionResourceSetupListCxtReq p_pDUSessionResourceSetupListCxtReq,
                                                                                           in template (value) AllowedNSSAI p_allowedNSSAI,
                                                                                           in template (value) UESecurityCapabilities p_uESecurityCapabilities,
                                                                                           in template (value) SecurityKey p_nextHopNH := PX_NEXT_HOP_NH
                                                                                           ) := {
                                                                                           ) := {
                            procedureCode := id_InitialContextSetup,
                            procedureCode := id_InitialContextSetup,
                            criticality   := reject,
                            criticality   := reject,
@@ -910,7 +914,11 @@ module LibNGAP_Templates {
                        template (present) InitiatingMessage mw_n2_InitialContextSetupRequest(
                        template (present) InitiatingMessage mw_n2_InitialContextSetupRequest(
                                                                                              template (present) AMF_UE_NGAP_ID p_amfUeNgapID := ?,
                                                                                              template (present) AMF_UE_NGAP_ID p_amfUeNgapID := ?,
                                                                                              template (present) RAN_UE_NGAP_ID p_ranUeNgapID := ?,
                                                                                              template (present) RAN_UE_NGAP_ID p_ranUeNgapID := ?,
                                                                                              template (present) PDUSessionResourceSetupListCxtReq p_pDUSessionResourceSetupListCxtReq := ?
                                                                                              template (present) GUAMI p_gUAMI := ?,
                                                                                              template (present) PDUSessionResourceSetupListCxtReq p_pDUSessionResourceSetupListCxtReq := ?,
                                                                                              template (present) AllowedNSSAI p_allowedNSSAI := ?,
                                                                                              template (present) UESecurityCapabilities p_uESecurityCapabilities := ?,
                                                                                              template (present) SecurityKey p_nextHopNH := ?
                                                                                              ) := {
                                                                                              ) := {
                            procedureCode := id_InitialContextSetup,
                            procedureCode := id_InitialContextSetup,
                            criticality   := reject,
                            criticality   := reject,