Commit 915826ef authored by kretzschmann's avatar kretzschmann
Browse files

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

parents f106a957 d75a6311
Loading
Loading
Loading
Loading
+7 −0
Original line number Original line Diff line number Diff line
@@ -252,6 +252,13 @@ module NGAP_Steps {
        //FIXME: Implementation of UE registration
        //FIXME: Implementation of UE registration
        } // End of function f_NGAP_gnb_UE_Register
        } // End of function f_NGAP_gnb_UE_Register


        /**
         * @desc
         */
        function f_NGAP_gnb_UE_Not_Available() runs on NGAPComponent {
        //FIXME: Implementation of UE registration
        } // End of function f_NGAP_gnb_UE_Not_Available

        /**
        /**
         * @desc
         * @desc
         */
         */
+158 −19
Original line number Original line Diff line number Diff line
@@ -1419,38 +1419,35 @@ module NGAP_TCFunctions {
                   
                   
                   
                   
                   // Body
                   // Body
           /*        f_send_NGAP_PDU(
                   f_send_NGAP_PDU(
                   	m_ngap_initMsg(
                   	m_ngap_initMsg(
                   		m_n2_UEContextModificationRequest_optional2 
                   		m_n2_UEContextModificationRequest_optional2 
                   		(	 
                   		(	 
                   			-, // AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID,
                   			-, // AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID,
                   			-, // RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID,                           
                   			-, // RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID,                           
                            
                            -, // RANPagingPriority p_rANPagingPriority, // RAN_Paging_Priority
                            // RANPagingPriority p_rANPagingPriority, // RAN_Paging_Priority
                            -, // IndexToRFSP p_indexToRFSP, // Index_to_RAT_Frequency_Selection_Priority,
                            // IndexToRFSP p_indexToRFSP, // Index_to_RAT_Frequency_Selection_Priority,
                            m_uEAggregateMaximumBitRate, // UEAggregateMaximumBitRate p_uEAggregateMaximumBitRate, // UE_Aggregate_Maximum_Bit_Rate containing
                            m_uEAggregateMaximumBitRate, // UEAggregateMaximumBitRate p_uEAggregateMaximumBitRate, // UE_Aggregate_Maximum_Bit_Rate containing
                            m_uESecurityCapabilities, // UESecurityCapabilities p_uESecurityCapabilities, //  UE_Security_Capabilities containing
                            m_uESecurityCapabilities, // UESecurityCapabilities p_uESecurityCapabilities, //  UE_Security_Capabilities containing
                            // EmergencyFallbackIndicator p_emergencyFallbackIndicator, // Emergency_Fallback_Indicator,
                            m_emergencyFallbackIndicator(emergency_fallback_requested), // EmergencyFallbackIndicator p_emergencyFallbackIndicator, // Emergency_Fallback_Indicator,
                            m_gUAMI, // GUAMI p_gUAMI, // New_GUAMI containing
                            m_gUAMI, // GUAMI p_gUAMI, // New_GUAMI containing
                            // IAB_Authorized p_iAB_Authorized, // IAB_Authorized,
                            m_iAB_Authorized, // IAB_Authorized p_iAB_Authorized, // IAB_Authorized,
                            m_pC5QoSParameters(
                            m_pC5QoSParameters(
                            	{ m_pC5QoSFlowItem }
                            	{ m_pC5QoSFlowItem }
                            ),// PC5QoSParameters p_pC5QoSParameters, // PC5_QoS_Parameters containing                        		
                            ),// PC5QoSParameters p_pC5QoSParameters, // PC5_QoS_Parameters containing                        		
                            -, // UERadioCapabilityID p_uERadioCapabilityID := PX_U_E_RADIO_CAPABILITY_ID, // UE_Radio_Capability_ID,  
                            -, // UERadioCapabilityID p_uERadioCapabilityID := PX_U_E_RADIO_CAPABILITY_ID, // UE_Radio_Capability_ID,  
                            // RGLevelWirelineAccessCharacteristics p_rGLevelWirelineAccessCharacteristics // RG_Level_Wireline_Access_Characteristics
                            - // RGLevelWirelineAccessCharacteristics p_rGLevelWirelineAccessCharacteristics // RG_Level_Wireline_Access_Characteristics
                   			
                   		))); 
                   			(
                   				-
                   			),
                   			-
                   		))); */
                		
                		
                /*   		
                   f_recv_NGAP_PDU(
                   f_recv_NGAP_PDU(
                     mw_ngap_succMsg(
                     mw_ngap_succMsg(
                     	mw_n2_UEContextReleaseComplete
                     	mw_n2_UEContextReleaseComplete
                     	(
                     		PX_AMF_UE_NGAP_ID,
                     		PX_RAN_UE_NGAP_ID
                     	) 
                     ));
                     ));
                    */
                    
                   f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                   f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                   log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");
                   log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");


@@ -1465,6 +1462,46 @@ module NGAP_TCFunctions {
            } // End of group UE_Context_Modification
            } // End of group UE_Context_Modification
            //8.3.5
            //8.3.5
            group RRC_Inactive_Transition_Report{
            group RRC_Inactive_Transition_Report{
              
              /**
               * @desc Testcase function for f_TC_NGAP_GNB_CMP_14
               */
               function f_TC_NGAP_GNB_CMP_14() runs on aMFNGAPComponent {
                 
                   // Preamble
                   f_NGAP_amf_init();
                   f_NGAP_amf_UE_Register();
                   
                   // TODO: isTransitioningTo the RRC_INACTIVE
                   
                   f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
                   log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                   
                   
                   // Body
          		   action("Trigger a RRC inactive transition report");
                		
                   f_recv_NGAP_PDU(
                     mw_ngap_initMsg(
                     	mw_n2_RRCInactiveTransitionReport
                     	(
                     		PX_AMF_UE_NGAP_ID,
                     		PX_RAN_UE_NGAP_ID,
                     		m_rRCState,
                     		?
                     	) 
                     ));
                    
                   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_14
              
            } // End of group RRC_Inactive_Transition_Report
            } // End of group RRC_Inactive_Transition_Report
            //8.3.6
            //8.3.6
            group Connection_Establishment_Indication{
            group Connection_Establishment_Indication{
@@ -1474,6 +1511,47 @@ module NGAP_TCFunctions {
            } // End of group AMF_CP_Relocation_Indication
            } // End of group AMF_CP_Relocation_Indication
            //8.3.8
            //8.3.8
            group RAN_CP_Relocation_Indication{
            group RAN_CP_Relocation_Indication{
              
              /**
               * @desc Testcase function for f_TC_NGAP_GNB_CMP_15
               */
               function f_TC_NGAP_GNB_CMP_15() runs on aMFNGAPComponent {
                 
                   // Preamble
                   f_NGAP_amf_init();
                   f_NGAP_amf_UE_Register();
                   
                   // TODO: hasEstablishedInitialContext
                   
                   f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
                   log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                   
                   
                   // Body
          		   action("Trigger a RAN CP relocation indication procedure");
                		
                   f_recv_NGAP_PDU(
                     mw_ngap_initMsg(
                     	mw_n2_RANCPRelocationIndication
                     	(
                     		PX_RAN_UE_NGAP_ID,
                     		?,
                     		?,
                     		?,
                     		?
                     	) 
                     ));
                    
                   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_15
              
            } // End of group RAN_CP_Relocation_Indication
            } // End of group RAN_CP_Relocation_Indication
            //8.3.9
            //8.3.9
            group Retrieve_UE_Information{
            group Retrieve_UE_Information{
@@ -3468,6 +3546,39 @@ module NGAP_TCFunctions {
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");


                // Body
                // Body
                f_send_NGAP_PDU(
                                m_ngap_initMsg(
                                               m_n2_HandoverRequired(
                                                                     -, -, -, -,
                                                                     m_targetID_targetRANNodeID(
                                                                                                m_targetRANNodeID(
                                                                                                                  m_globalRANNodeID_globalGNB_ID(
                                                                                                                                                 m_ie_globalGnbId(
                                                                                                                                                                  -, 
                                                                                                                                                                  PX_GNB_ID
                                                                                                                  )), 
                                                                                                                  m_tAI
                                                                                                )),
                                                                     {
                                                                       m_pDUSessionResourceItemHORqd(
                                                                                                     -,
                                                                                                     ''O // FIXME FSCOM Shall be bit2oct(encvalue(???))
                                                                                                     )
                                                                      },
                                                                      ''O // FIXME FSCOM Shall be bit2oct(encvalue(???))
                                )));

                f_recv_NGAP_PDU(
                                mw_ngap_succMsg(
                                                mw_n2_HandoverCommand(
                                                                      PX_AMF_UE_NGAP_ID,
                                                                      PX_RAN_UE_NGAP_ID,
                                                                      -,
                                                                      ?/* FIXME FSCOM {
                                                                        m_pDUSessionResourceHandoverItem(
                                                                                                         bit2oct(encvalue(m_handoverCommandTransfer(???))))
                                                                      }*/
                                )));


                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");
@@ -3493,6 +3604,34 @@ module NGAP_TCFunctions {
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");


                // Body
                // Body
                f_NGAP_gnb_UE_Not_Available();
                f_send_NGAP_PDU(
                                m_ngap_initMsg(
                                               m_n2_HandoverRequired(
                                                                     -, -, -, -,
                                                                     m_targetID_targetRANNodeID(
                                                                                                m_targetRANNodeID(
                                                                                                                  m_globalRANNodeID_globalGNB_ID(
                                                                                                                                                 m_ie_globalGnbId(
                                                                                                                                                                  -, 
                                                                                                                                                                  PX_GNB_ID
                                                                                                                  )), 
                                                                                                                  m_tAI
                                                                                                )),
                                                                     {
                                                                       m_pDUSessionResourceItemHORqd(
                                                                                                     -,
                                                                                                     ''O // FIXME FSCOM Shall be bit2oct(encvalue(???))
                                                                                                     )
                                                                      },
                                                                      ''O // FIXME FSCOM Shall be bit2oct(encvalue(???))
                                )));

                f_recv_NGAP_PDU(
                                mw_ngap_unsuccMsg(
                                                  mw_n2_HandoverFailure(
                                                                        PX_AMF_UE_NGAP_ID
                                )));


                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");
+56 −0
Original line number Original line Diff line number Diff line
@@ -629,6 +629,34 @@ module NGAP_TestCases {
            } // End of group UE_Context_Modification
            } // End of group UE_Context_Modification
            //8.3.5
            //8.3.5
            group RRC_Inactive_Transition_Report{
            group RRC_Inactive_Transition_Report{
              
              /**
                 * @desc Test objective "Verify that the IUT can send a RRC INACTIVE TRANSITION REPORT   that contains mandatory IEs"
                 */
                testcase TC_NGAP_GNB_CMP_14() 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_5)){
                        log("*** " & __SCOPE__ & ": ERROR: 'PICS_NGAP_GNB_IUT and PICS_A3_2_5' 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_14());

                    // 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_14
              
            } // End of group RRC_Inactive_Transition_Report
            } // End of group RRC_Inactive_Transition_Report
            //8.3.6
            //8.3.6
            group Connection_Establishment_Indication{
            group Connection_Establishment_Indication{
@@ -638,6 +666,34 @@ module NGAP_TestCases {
            } // End of group AMF_CP_Relocation_Indication
            } // End of group AMF_CP_Relocation_Indication
            //8.3.8
            //8.3.8
            group RAN_CP_Relocation_Indication{
            group RAN_CP_Relocation_Indication{
              
              /**
                 * @desc Test objective "Verify that the IUT can send a RAN CP Relocation Indication that contains mandatory IEs"
                 */
                testcase TC_NGAP_GNB_CMP_15() 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_8)){
                        log("*** " & __SCOPE__ & ": ERROR: 'PICS_NGAP_GNB_IUT and PICS_A3_2_8' 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_15());

                    // 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_15
              
            } // End of group RAN_CP_Relocation_Indication
            } // End of group RAN_CP_Relocation_Indication
            //8.3.9
            //8.3.9
            group Retrieve_UE_Information{
            group Retrieve_UE_Information{
+2 −0
Original line number Original line Diff line number Diff line
@@ -430,6 +430,8 @@ module LibNGAP_Pixits {


    modulepar FiveQI PX_FIVE_QI;
    modulepar FiveQI PX_FIVE_QI;


    modulepar bitstring PX_GNB_ID;

    /** 
    /** 
     * @desc eNB Identity.
     * @desc eNB Identity.
     * @see ETSI TS 136 413 Clause 9.2.1.37 Global eNB ID
     * @see ETSI TS 136 413 Clause 9.2.1.37 Global eNB ID
+307 −32

File changed.

Preview size limit exceeded, changes collapsed.