Commit ca34ed07 authored by juvancic's avatar juvancic
Browse files

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

parents bd304ace cf55dbb9
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -89,6 +89,15 @@ NGAP_TestCases.TC_NGAP_gNB_or_aMF_testcaseName_01
# Verify that the NG-RAN node successfully sends a UPLINK RAN EARLY STATUS TRANSFER message to the AMF.
#NGAP_TestCases.TC_NGAP_GNB_MMP_11

# Verify that the IUT can send an INITIAL UE MESSAGE to indicate the initiation of a NAS Transport procedure.
#NGAP_TestCases.TC_NGAP_GNB_NAS_01
# Verify that the IUT can send an UPLINK NAS TRANSPORT message to the AMF.
#NGAP_TestCases.TC_NGAP_GNB_NAS_02
# Verify that the IUT can send a NAS NON DELIVERY INDICATION message to t.he AMF
#NGAP_TestCases.TC_NGAP_GNB_NAS_03



# Verify that the GNB node successfully sends a NG SETUP REQEST message to the AMF.
#NGAP_TestCases.TC_NGAP_GNB_IMP_01
# Verify that the IUT can send a RAN CONFIGURATION UPDATE message to the AMF.
+155 −33
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,46 @@ 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{
@@ -1604,7 +1645,7 @@ module NGAP_TCFunctions {
                                                                                                         bit2oct(
                                                                                                                 encvalue(
                                                                                                                          m_pDUSessionResourceSetupRequestTransfer(
                                                                                                                     m_pDUSessionResourceSetupRequestTransfer_mandatories(
                                                                                                                            m_pDUSessionResourceSetupRequestTransfer_handover(
                                                                                                                              m_pDUSessionType(ipv4),
                                                                                                                              {
                                                                                                                                m_qosFlowSetupRequestItem(
@@ -1626,6 +1667,12 @@ module NGAP_TCFunctions {
                                                                                                                              },
                                                                                                                              m_uPTransportLayerInformation_gTPTunnel(
                                                                                                                                                                      m_gTPTunnel
                                                                                                                                                                      ),
                                                                                                                              m_dataForwardingNotPossible,
                                                                                                                              m_securityIndication(
                                                                                                                                                   m_integrityProtectionIndication,
                                                                                                                                                   m_confidentialityProtectionIndication,
                                                                                                                                                   m_maximumIntegrityProtectedDataRate          
                                                                                                         ))))))
                                                                    },
                                                                    { 
@@ -1638,9 +1685,17 @@ module NGAP_TCFunctions {
                                )));

                f_recv_NGAP_PDU(
                                mw_ngap_unsuccMsg(
                                                  mw_n2_HandoverFailure(
                                                                        PX_AMF_UE_NGAP_ID
                                mw_ngap_succMsg(
                                                mw_n2_HandoverRequestAcknowledge(
                                                                                 PX_AMF_UE_NGAP_ID,
                                                                                 PX_RAN_UE_NGAP_ID,
                                                                                 {
                                                                                     *,
                                                                                     mw_pDUSessionResourceAdmittedItem( // TODO FSCOM Make the template more restrictive
                                                                                                                       PX_PDU_SESSION_ID
                                                                                                                       ),
                                                                                     *
                                                                                 }
                                 )));


@@ -1680,7 +1735,7 @@ module NGAP_TCFunctions {
                                                                                                         bit2oct(
                                                                                                                 encvalue(
                                                                                                                   m_pDUSessionResourceSetupRequestTransfer(
                                                                                                                     m_pDUSessionResourceSetupRequestTransfer_mandatories(
                                                                                                                     m_pDUSessionResourceSetupRequestTransfer_handover_1(
                                                                                                                       m_pDUSessionType(ipv4),
                                                                                                                       {
                                                                                                                         m_qosFlowSetupRequestItem(
@@ -1701,8 +1756,9 @@ module NGAP_TCFunctions {
                                                                                                                             )))
                                                                                                                       },
                                                                                                                       m_uPTransportLayerInformation_gTPTunnel(
                                                                                                                         m_gTPTunnel
                                                                                                         ))))))
                                                                                                                         m_gTPTunnel),
                                                                                                                       m_directForwardingPathAvailability
                                                                                                         )))))
                                                                    },
                                                                    { 
                                                                      m_allowedNSSAI_Item(
@@ -1818,15 +1874,81 @@ module NGAP_TCFunctions {
        group Transport_of_NAS_Messages_Procedures{
            //8.6.1
            group Initial_UE_Message{

              function f_TC_NGAP_GNB_NAS_01() runs on aMFNGAPComponent {
                // Local variables

                // Preamble
                f_NGAP_amf_init();
                f_NGAP_amf_UE_Register();
                f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                // Body

                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_NAS_01

            } // End of group Initial_UE_Message
            //8.6.2
            group Downlink_NAS_Transport{
            } // End of group Downlink_NAS_Transport
            //8.6.3
            group Uplink_NAS_Transport{

              function f_TC_NGAP_GNB_NAS_02() runs on aMFNGAPComponent {
                // Local variables

                // Preamble
                f_NGAP_amf_init();
                f_NGAP_amf_UE_Register();
                f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                // Body

                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_NAS_02

            } // End of group Uplink_NAS_Transport
            //8.6.4
            group NAS_Non_Delivery_Indication{

              function f_TC_NGAP_GNB_NAS_03() runs on aMFNGAPComponent {
                // Local variables

                // Preamble
                f_NGAP_amf_init();
                f_NGAP_amf_UE_Register();
                f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                // Body

                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_NAS_03

            } // End of group NAS_Non_Delivery_Indication
            //8.6.5
            group Rerout_NAS_Request{
+112 −59

File changed.

Preview size limit exceeded, changes collapsed.

+160 −35

File changed.

Preview size limit exceeded, changes collapsed.