Commit 0f0be8b1 authored by Steffen Ludtke's avatar Steffen Ludtke
Browse files

new TC TC_NGAP_GNB_CMP_07 and bugfixing templates

parent afd426f9
Loading
Loading
Loading
Loading
+45 −3
Original line number Diff line number Diff line
@@ -963,7 +963,8 @@ module NGAP_TCFunctions {
                        },
                   		m_uESecurityCapabilities,
                   		-
                   		)));
                   		)
                   		));
                   		
                   		
                   f_recv_NGAP_PDU(
@@ -1056,7 +1057,7 @@ module NGAP_TCFunctions {
                   // Body
                   f_send_NGAP_PDU(
                   	m_ngap_initMsg(
                   		m_n2_InitialContextSetupRequest_optionals
                   		m_n2_InitialContextSetupRequest_optional_TraceActivation
                   		(	
                   		-,
                   		-,
@@ -1142,6 +1143,47 @@ module NGAP_TCFunctions {
            } // End of group Initial_Context_Setup
            //8.3.2
            group UE_Context_Release_Request_NG_RAN_node_initiated{
              
              /**
               * @desc Testcase function for TC_NGAP_GNB_CMP_07
               */
               function f_TC_NGAP_GNB_CMP_07() 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());
                   
                   // TODO: hasEstablishedInitialContext
                   
                   log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                   
                   
                   // Body
                   action("Trigger UE context release request");
                   		
                   		
                   f_recv_NGAP_PDU(
                     mw_ngap_initMsg(
                     	mw_n2_UEContextReleaseRequest(
                     		-,
                     		-,
                     		*,
                     		-
                     	)
                     ));
                     
                   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_07
              
            } // End of group UE_Context_Release_Request_NG_RAN_node_initiated
            //8.3.3
            group UE_Context_Release_AMF_initiated{
+28 −0
Original line number Diff line number Diff line
@@ -497,6 +497,34 @@ module NGAP_TestCases {
            } // End of group Initial_Context_Setup
            //8.3.2
            group UE_Context_Release_Request_NG_RAN_node_initiated{
              
              /**
                 * @desc Test objective "Verify that the NG-RAN node successfully requests the AMF to release the UE-associated logical NG-connection."
                 */
                testcase TC_NGAP_GNB_CMP_07() runs on aMFNGAPComponent system TestAdapter {
                  
                  	// Local variables
                    var aMFNGAPComponent v_ngap_amf;

                    // Test control
                    if ((not PICS_NGAP_GNB_IUT) and (not PICS_A3_2_2){
                        log("*** " & __SCOPE__ & ": ERROR: 'PICS_NGAP_GNB_IUT and PICS_A3_2_2' shall be set to true for executing the TC. ***");
                        stop;
                    }

                    // Test component configuration
                    f_cf_NGAP_aMF_Up(v_ngap_amf);

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

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

                    f_cf_Down/*gNBoraMF*/();
                  
                } // End of testcase TC_NGAP_GNB_CMP_07
              
            } // End of group UE_Context_Release_Request_NG_RAN_node_initiated
            //8.3.3
            group UE_Context_Release_AMF_initiated{
+19 −2
Original line number Diff line number Diff line
@@ -935,12 +935,23 @@ module LibNGAP_Templates {
                        template (value) InitiatingMessage m_n2_InitialContextSetupRequest(
                                                                                           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) 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,
                            criticality   := reject,
                            value_        := {
                                              InitialContextSetupRequest := {
                                                
                                                
                                                
                                                
                                                
                                                
                                                
                                                                             protocolIEs := {
                                                                                             {
                                                                                                 id := id_AMF_UE_NGAP_ID,
@@ -1398,7 +1409,8 @@ module LibNGAP_Templates {
                        template (present) InitiatingMessage mw_n2_UEContextReleaseRequest(
                                                                                           template (present) AMF_UE_NGAP_ID p_amfUeNgapID := ?,
                                                                                           template (present) RAN_UE_NGAP_ID p_ranUeNgapID := ?,
                                                                                           template (present) PDUSessionResourceListCxtRelReq p_pDUSessionResourceListCxtRelReq := ?
                                                                                           template  PDUSessionResourceListCxtRelReq p_pDUSessionResourceListCxtRelReq := *,
                                                                                           template (present) Cause p_cause := ?
                                                                                           ) := {
                            procedureCode := id_UEContextReleaseRequest,
                            criticality   := reject,
@@ -1419,6 +1431,11 @@ module LibNGAP_Templates {
                                                                                              id := id_PDUSessionResourceListCxtRelReq,
                                                                                              criticality := reject,
                                                                                              value_ := { PDUSessionResourceListCxtRelReq := p_pDUSessionResourceListCxtRelReq }
                                                                                          },
                                                                                          {
                                                                                              id := id_Cause,
                                                                                              criticality := ignore,
                                                                                              value_ := { Cause := p_cause }
                                                                                          }
                                                                                         }
                                                                           }