Commit 01102595 authored by Pau Espin Pedrol's avatar Pau Espin Pedrol
Browse files

NGAP_Templates: Improve InitialContextSetupRequest template 

That message has tons of optional fields. Better have 1 big generic
template than dozens of different templates.
parent be03c0a7

ttcn/AtsNGAP/NGAP_TCFunctions.ttcn

+60 −69
Original line number Diff line number Diff line
@@ -958,12 +958,12 @@ module NGAP_TCFunctions { 
                   // Body

                   f_send_NGAP_PDU(

                   	m_ngap_initMsg(

                   		m_n2_InitialContextSetupRequest

                   		f_m_n2_InitialContextSetupRequest

                   		(

                   		-,

                   		-,

                   		m_gUAMI,

                   		{

                   		p_gUAMI := m_gUAMI,

                   		p_pDUSessionResourceSetupListCxtReq := {

                   		  {

                   		  	PX_PDU_SESSION_ID,

                   		  	omit,
@@ -999,13 +999,12 @@ module NGAP_TCFunctions { 
                   		  }



                   		},

                   		{

                   		p_allowedNSSAI := {

                        m_allowedNSSAI_Item(

                        	m_s_NSSAI('00'O, '000000'O)

                            )

                        },

                   		m_uESecurityCapabilities,

                   		-

                   		p_uESecurityCapabilities := m_uESecurityCapabilities

                   		)

                   		));
@@ -1051,18 +1050,17 @@ module NGAP_TCFunctions { 
                   // Body

                   f_send_NGAP_PDU(

                   	m_ngap_initMsg(

                   		m_n2_InitialContextSetupRequest_noPDUSessionResourceSetupListCxtReq

                   		f_m_n2_InitialContextSetupRequest

                   		(

                   		-,

                   		-,

                   		m_gUAMI,

                   		{

                   		p_gUAMI := m_gUAMI,

                   		p_allowedNSSAI := {

                        m_allowedNSSAI_Item(

                        	m_s_NSSAI('00'O, '000000'O)

                            )

                        },

                   		m_uESecurityCapabilities,

                   		-

                   		p_uESecurityCapabilities := m_uESecurityCapabilities

                   		)));
@@ -1100,12 +1098,12 @@ module NGAP_TCFunctions { 
                   // Body

                   f_send_NGAP_PDU(

                   	m_ngap_initMsg(

                   		m_n2_InitialContextSetupRequest_optional_TraceActivation

                   		f_m_n2_InitialContextSetupRequest

                   		(

                   		-,

                   		-,

                   		m_gUAMI,

                   		{

                   		p_gUAMI := m_gUAMI,

                   		p_pDUSessionResourceSetupListCxtReq := {

                   		  {

                   		  	PX_PDU_SESSION_ID,

                   		  	omit,
@@ -1141,14 +1139,13 @@ module NGAP_TCFunctions { 
                   		  }



                   		},

                   		{

                   		p_allowedNSSAI := {

                        m_allowedNSSAI_Item(

                        	m_s_NSSAI('00'O, '000000'O)

                            )

                        },

                   		m_uESecurityCapabilities,

                   		-,

                   		m_traceActivation(

                   		p_uESecurityCapabilities := m_uESecurityCapabilities,

                   		p_traceActivation := m_traceActivation(

                   			'0000000000000001'O,//in template (value) NGRANTraceID p_nGRANTraceID,

                          	'00000000'B,//in template (value) InterfacesToTrace p_interfacesToTrace,

                          	m_traceDepth(minimum),
@@ -1199,12 +1196,12 @@ module NGAP_TCFunctions { 
                   // Body

                   f_send_NGAP_PDU(

                   	m_ngap_initMsg(

                   		m_n2_InitialContextSetupRequest_optional_MobilityRestriction

                   		f_m_n2_InitialContextSetupRequest

                   		(

                   		-,

                   		-,

                   		m_gUAMI,

                   		{

                   		p_gUAMI := m_gUAMI,

                   		p_pDUSessionResourceSetupListCxtReq := {

                   		  {

                   		  	PX_PDU_SESSION_ID,

                   		  	omit,
@@ -1240,14 +1237,13 @@ module NGAP_TCFunctions { 
                   		  }



                   		},

                   		{

                   		p_allowedNSSAI := {

                        m_allowedNSSAI_Item(

                        	m_s_NSSAI('00'O, '000000'O)

                            )

                        },

                   		m_uESecurityCapabilities,

                   		-,

                   		m_mobilityRestrictionList(

                   		p_uESecurityCapabilities := m_uESecurityCapabilities,

                   		p_mobilityRestrictionList := m_mobilityRestrictionList(

                   			PX_PLMN_IDENTITY

                   		)

                   		)));
@@ -1294,12 +1290,12 @@ module NGAP_TCFunctions { 
                   // Body

                   f_send_NGAP_PDU(

                   	m_ngap_initMsg(

                   		m_n2_InitialContextSetupRequest_differentOptionals

                   		f_m_n2_InitialContextSetupRequest

                   		(

                   		-,

                   		-,

                   		m_gUAMI,

                   		{

                   		p_gUAMI := m_gUAMI,

                   		p_pDUSessionResourceSetupListCxtReq := {

                   		  {

                   		  	PX_PDU_SESSION_ID,

                   		  	omit,
@@ -1335,22 +1331,21 @@ module NGAP_TCFunctions { 
                   		  }



                   		},

                   		{

                   		p_allowedNSSAI := {

                        m_allowedNSSAI_Item(

                        	m_s_NSSAI('00'O, '000000'O)

                            )

                        },

                   		m_uESecurityCapabilities,

                   		-,

                   		''O,	// UERadioCapability p_uERadioCapability,

                        -,     // IndexToRFSP p_indexToRFSP := 1,

                        -,

                        ''O, // FIXME FSCOM NAS_PDU field shall be bit2oct(enc(???))    ,



                        m_emergencyFallbackIndicator(emergency_fallback_requested),    // EmergencyFallbackIndicator p_emergencyFallbackIndicator,

                        m_rRCInactiveTransitionReportRequest,            // RRCInactiveTransitionReportRequest p_rRCInactiveTransitionReportRequest,

                        m_redirectionVoiceFallback,            // RedirectionVoiceFallback p_redirectionVoiceFallback,

                        m_locationReportingRequestType(

                   		p_uESecurityCapabilities := m_uESecurityCapabilities,

                   		p_uERadioCapability := ''O,	// UERadioCapability p_uERadioCapability,

                      p_indexToRFSP := -,     // IndexToRFSP p_indexToRFSP := 1,

                      p_maskedIMEISV := -,

                      p_nasPdu := ''O, // FIXME FSCOM NAS_PDU field shall be bit2oct(enc(???))    ,



                      p_emergencyFallbackIndicator := m_emergencyFallbackIndicator(emergency_fallback_requested),    // EmergencyFallbackIndicator p_emergencyFallbackIndicator,

                      p_rRCInactiveTransitionReportRequest := m_rRCInactiveTransitionReportRequest,            // RRCInactiveTransitionReportRequest p_rRCInactiveTransitionReportRequest,

                      p_redirectionVoiceFallback := m_redirectionVoiceFallback,            // RedirectionVoiceFallback p_redirectionVoiceFallback,

                      p_locationReportingRequestType := m_locationReportingRequestType(

                       		direct,

                       		cell,

                       		{
@@ -1368,16 +1363,14 @@ module NGAP_TCFunctions { 
                       		-,

                     		-

                       	),            // LocationReportingRequestType p_locationReportingRequestType,

                        m_sRVCCOperationPossible,            // SRVCCOperationPossible p_sRVCCOperationPossible,

                        m_iAB_Authorized,            // IAB_Authorized p_iAB_Authorized,

                        m_enhanced_CoverageRestriction,            // Enhanced_CoverageRestriction p_enhanced_CoverageRestriction,

                        -,            // Extended_ConnectedTime p_extended_ConnectedTime := PX_EXTENDED_CONNECTED_TIME,

                        m_uE_DifferentiationInfo,            // UE_DifferentiationInfo p_uE_DifferentiationInfo,

                        m_nRUESidelinkAggregateMaximumBitrate, // NRUESidelinkAggregateMaximumBitrate p_nRUESidelinkAggregateMaximumBitrate,

                        m_lTEUESidelinkAggregateMaximumBitrate,       // LTEUESidelinkAggregateMaximumBitrate p_lTEUESidelinkAggregateMaximumBitrate,

                        PX_U_E_RADIO_CAPABILITY_ID





                        p_sRVCCOperationPossible := m_sRVCCOperationPossible,            // SRVCCOperationPossible p_sRVCCOperationPossible,

                        p_iAB_Authorized := m_iAB_Authorized,            // IAB_Authorized p_iAB_Authorized,

                        p_enhanced_CoverageRestriction := m_enhanced_CoverageRestriction,            // Enhanced_CoverageRestriction p_enhanced_CoverageRestriction,

                        p_extended_ConnectedTime := -,            // Extended_ConnectedTime p_extended_ConnectedTime := PX_EXTENDED_CONNECTED_TIME,

                        p_uE_DifferentiationInfo := m_uE_DifferentiationInfo,            // UE_DifferentiationInfo p_uE_DifferentiationInfo,

                        p_nRUESidelinkAggregateMaximumBitrate := m_nRUESidelinkAggregateMaximumBitrate, // NRUESidelinkAggregateMaximumBitrate p_nRUESidelinkAggregateMaximumBitrate,

                        LTEUESidelinkAggregateMaximumBitrate := m_lTEUESidelinkAggregateMaximumBitrate,       // LTEUESidelinkAggregateMaximumBitrate p_lTEUESidelinkAggregateMaximumBitrate,

                        p_uERadioCapabilityID := PX_U_E_RADIO_CAPABILITY_ID

                   		)));
@@ -1424,12 +1417,12 @@ module NGAP_TCFunctions { 
                   // Body

                   f_send_NGAP_PDU(

                   	m_ngap_initMsg(

                   		m_n2_InitialContextSetupRequest

                   		f_m_n2_InitialContextSetupRequest

                   		(

                   		-,

                   		-,

                   		m_gUAMI,

                   		{

                   		p_gUAMI := m_gUAMI,

                   		p_pDUSessionResourceSetupListCxtReq := {

                   		  {

                   		  	PX_PDU_SESSION_ID,

                   		  	omit,
@@ -1465,13 +1458,12 @@ module NGAP_TCFunctions { 
                   		  }



                   		},

                   		{

                   		p_allowedNSSAI := {

                        m_allowedNSSAI_Item(

                        	m_s_NSSAI('00'O, '000000'O)

                            )

                        },

                   		m_uESecurityCapabilities,

                   		-

                   		p_uESecurityCapabilities := m_uESecurityCapabilities

                   		)

                   		));
@@ -4379,10 +4371,10 @@ module NGAP_TCFunctions { 


                   f_recv_NGAP_PDU(

                     mw_ngap_initMsg(

                     	mw_n2_InitialContextSetupRequest_withPDUSessionList(

                       f_mw_n2_InitialContextSetupRequest(

                            PX_AMF_UE_NGAP_ID,

                            PX_RAN_UE_NGAP_ID,

                            mw_gUAMI

                            p_gUAMI := mw_gUAMI

                            (

                            	PX_PLMN_IDENTITY,

                            	PX_AMF_REGION_ID,
@@ -4390,7 +4382,7 @@ module NGAP_TCFunctions { 
                            	PX_AMF_POINTER,

                            	*

                            ),

                            {

                            p_pDUSessionResourceSetupListCxtReq := {

                              mw_pDUSessionResourceSetupItemCxtReq

                              (

                              	PX_PDU_SESSION_ID,
@@ -4403,9 +4395,9 @@ module NGAP_TCFunctions { 
                                *

                              )

                            },

                            ?,

                            ?,

                            ?

                            p_allowedNSSAI := ?,

                            p_uESecurityCapabilities := ?,

                            p_nextHopNH := ?

                     )));
@@ -6098,11 +6090,11 @@ module NGAP_TCFunctions { 
                   // Body

                   f_send_NGAP_PDU(

                   	 m_ngap_initMsg(

                   		 m_n2_InitialContextSetupRequest(

                   		 f_m_n2_InitialContextSetupRequest(

                   		   -,

                   		   -,

                   		   m_gUAMI,

                   		   {

                   		   p_gUAMI := m_gUAMI,

                   		   p_pDUSessionResourceSetupListCxtReq := {

                   		    {

                   		  	  PX_PDU_SESSION_ID,

                   		  	  omit,
@@ -6137,13 +6129,12 @@ module NGAP_TCFunctions { 
							              omit

                   		    }

                   		   },

                   		   {

                   		   p_allowedNSSAI := {

                           m_allowedNSSAI_Item(

                         	  m_s_NSSAI('00'O, '000000'O)

                           )

                         },

                   		   m_uESecurityCapabilities,

                   		   -

                   		   p_uESecurityCapabilities := m_uESecurityCapabilities

                   		 )

                   	 )

                   );

ttcn/LibNGAP/lib/LibNGAP_Templates.ttcn

+535 −274

File changed.

Preview size limit exceeded, changes collapsed.