Resolve conflict (fd269dcc) · Commits · INT - Core Network and Interoperability Testing / 5G Core / NGAP

ttcn/LibNGAP/lib/LibNGAP_Templates.ttcn

+134 −22

Original line number	Diff line number	Diff line
		@@ -1555,6 +1555,7 @@ module LibNGAP_Templates {
		) := {
		choice_Extensions := p_choice_Extensions
		} // End of template m_areaScopeOfMDT_EUTRA_ext
		} // End of template m_areaScopeOfQMC_ext

		template (omit) AvailableRANVisibleQoEMetrics m_availableRANVisibleQoEMetrics(
		in template (omit) AvailableRANVisibleQoEMetrics.applicationLayerBufferLevelList p_applicationLayerBufferLevelList := omit,
		@@ -1943,7 +1944,7 @@ module LibNGAP_Templates {
		iE_Extensions := p_iE_Extensions
		} // End of template m_completedCellsInEAI_EUTRA_Item

		#template (omit) CompletedCellsInEAI_NR_Item m_completedCellsInEAI_NR_Item(
		template (omit) CompletedCellsInEAI_NR_Item m_completedCellsInEAI_NR_Item(
		in template (value) NR_CGI p_nR_CGI,
		in template (omit) CompletedCellsInEAI_NR_Item.iE_Extensions p_iE_Extensions := omit
		) := {
		@@ -2019,14 +2020,71 @@ module LibNGAP_Templates {
		// TODO To be enhanced
		} // End of template m_coreNetworkAssistanceInformationForInactive_paging

		// type record COUNTValueForPDCP_SN12 {
		// type NGAP_Containers.NGAP_PROTOCOL_EXTENSION COUNTValueForPDCP_SN12_ExtIEs (?);
		// type record COUNTValueForPDCP_SN18 {
		// type NGAP_Containers.NGAP_PROTOCOL_EXTENSION COUNTValueForPDCP_SN18_ExtIEs (?);
		// type octetstring CoverageEnhancementLevel;
		// type union CPTransportLayerInformation {
		// type NGAP_Containers.NGAP_PROTOCOL_IES CPTransportLayerInformation_ExtIEs (
		// type record CriticalityDiagnostics {
		template (omit) COUNTValueForPDCP_SN12 m_cOUNTValueForPDCP_SN12(
		in template (value) COUNTValueForPDCP_SN12.pDCP_SN12 p_pDCP_SN12,
		in template (value) COUNTValueForPDCP_SN12.hFN_PDCP_SN12 p_hFN_PDCP_SN12,
		in template (omit) COUNTValueForPDCP_SN12.iE_Extensions p_iE_Extensions := omit
		) := {
		pDCP_SN12 := p_pDCP_SN12,
		hFN_PDCP_SN12 := p_hFN_PDCP_SN12,
		iE_Extensions := p_iE_Extensions
		} // End of template m_cOUNTValueForPDCP_SN12

		template (omit) COUNTValueForPDCP_SN18 m_cOUNTValueForPDCP_SN18(
		in template (value) COUNTValueForPDCP_SN18.pDCP_SN18 p_pDCP_SN18,
		in template (value) COUNTValueForPDCP_SN18.hFN_PDCP_SN18 p_hFN_PDCP_SN18,
		in template (omit) COUNTValueForPDCP_SN18.iE_Extensions p_iE_Extensions := omit
		) := {
		pDCP_SN18 := p_pDCP_SN18,
		hFN_PDCP_SN18 := p_hFN_PDCP_SN18,
		iE_Extensions := p_iE_Extensions
		} // End of template m_cOUNTValueForPDCP_SN18

		template (value) CPTransportLayerInformation m_cPTransportLayerInformation_endpointIPAddress(
		in template (value) TransportLayerAddress p_endpointIPAddress
		) := {
		endpointIPAddress := p_endpointIPAddress
		} // End of template m_cPTransportLayerInformation_endpointIPAddress

		template (value) CPTransportLayerInformation m_cPTransportLayerInformation_choice_Extensions(
		in template (value) CPTransportLayerInformation.choice_Extensions p_choice_Extensions
		) := {
		choice_Extensions := p_choice_Extensions
		} // End of template m_cPTransportLayerInformation_choice_Extensions

		template (value) CPTransportLayerInformation.choice_Extensions m_cPTransportLayerInformation_ext(
		in template (value) EndpointIPAddressAndPort p_EndpointIPAddressAndPort
		) := {
		id := id_EndpointIPAddressAndPort,
		criticality := reject,
		value_ := { EndpointIPAddressAndPort := p_EndpointIPAddressAndPort }
		} // End of template m_cPTransportLayerInformation_ext

		template (omit) CriticalityDiagnostics m_criticalityDiagnostics(
		in template (omit) ProcedureCode p_procedureCode := omit,
		in template (omit) TriggeringMessage p_triggeringMessage := omit,
		in template (omit) Criticality p_procedureCriticality := omit,
		in template (omit) CriticalityDiagnostics.iEsCriticalityDiagnostics p_criticalityDiagnostics_IE_List := omit,
		in template (omit) CriticalityDiagnostics.iE_Extensions p_iE_Extensions := omit
		) := {
		procedureCode := p_procedureCode,
		triggeringMessage := p_triggeringMessage,
		procedureCriticality := p_procedureCriticality,
		iEsCriticalityDiagnostics := p_criticalityDiagnostics_IE_List,
		iE_Extensions := p_iE_Extensions
		} // End of template m_criticalityDiagnostics

		template (omit) CriticalityDiagnostics_IE_Item m_criticalityDiagnostics_IE_Item(
		in template (value) Criticality p_iECriticality,
		in template (value) ProtocolIE_ID p_iE_ID,
		in template (value) TypeOfError p_typeOfError,
		in template (omit) CriticalityDiagnostics_IE_Item.iE_Extensions p_iE_Extensions := omit
		) := {
		iECriticality := p_iECriticality,
		iE_ID := p_iE_ID,
		typeOfError := p_typeOfError,
		iE_Extensions := p_iE_Extensions
		} // End of template m_criticalityDiagnostics_IE_Item
		// type NGAP_Containers.NGAP_PROTOCOL_EXTENSION CriticalityDiagnostics_ExtIEs (?);
		// type record length (1 .. NGAP_Constants.maxnoofErrors) of CriticalityDiagnostics_IE_Item CriticalityDiagnostics_IE_List;
		// type record CriticalityDiagnostics_IE_Item {
		@@ -4311,18 +4369,72 @@ module LibNGAP_Templates {
		// TODO To be enhanced
		} // End of template mw_coreNetworkAssistanceInformationForInactive_paging

		// type record COUNTValueForPDCP_SN12 {
		// type NGAP_Containers.NGAP_PROTOCOL_EXTENSION COUNTValueForPDCP_SN12_ExtIEs (?);
		// type record COUNTValueForPDCP_SN18 {
		// type NGAP_Containers.NGAP_PROTOCOL_EXTENSION COUNTValueForPDCP_SN18_ExtIEs (?);
		// type octetstring CoverageEnhancementLevel;
		// type union CPTransportLayerInformation {
		// type NGAP_Containers.NGAP_PROTOCOL_IES CPTransportLayerInformation_ExtIEs (
		// type record CriticalityDiagnostics {
		// type NGAP_Containers.NGAP_PROTOCOL_EXTENSION CriticalityDiagnostics_ExtIEs (?);
		// type record length (1 .. NGAP_Constants.maxnoofErrors) of CriticalityDiagnostics_IE_Item CriticalityDiagnostics_IE_List;
		// type record CriticalityDiagnostics_IE_Item {
		// type NGAP_Containers.NGAP_PROTOCOL_EXTENSION CriticalityDiagnostics_IE_Item_ExtIEs (?);
		template (present) COUNTValueForPDCP_SN12 mw_cOUNTValueForPDCP_SN12(
		template (present) COUNTValueForPDCP_SN12.pDCP_SN12 p_pDCP_SN12 := ?,
		template (present) COUNTValueForPDCP_SN12.hFN_PDCP_SN12 p_hFN_PDCP_SN12 := ?,
		template COUNTValueForPDCP_SN12.iE_Extensions p_iE_Extensions := *
		) := {
		pDCP_SN12 := p_pDCP_SN12,
		hFN_PDCP_SN12 := p_hFN_PDCP_SN12,
		iE_Extensions := p_iE_Extensions
		} // End of template mw_cOUNTValueForPDCP_SN12

		template (present) COUNTValueForPDCP_SN18 mw_cOUNTValueForPDCP_SN18(
		template (present) COUNTValueForPDCP_SN18.pDCP_SN18 p_pDCP_SN18 := ?,
		template (present) COUNTValueForPDCP_SN18.hFN_PDCP_SN18 p_hFN_PDCP_SN18 := ?,
		template COUNTValueForPDCP_SN18.iE_Extensions p_iE_Extensions := *
		) := {
		pDCP_SN18 := p_pDCP_SN18,
		hFN_PDCP_SN18 := p_hFN_PDCP_SN18,
		iE_Extensions := p_iE_Extensions
		} // End of template mw_cOUNTValueForPDCP_SN18

		template (present) CPTransportLayerInformation mw_cPTransportLayerInformation_endpointIPAddress(
		template (present) TransportLayerAddress p_endpointIPAddress := ?
		) := {
		endpointIPAddress := p_endpointIPAddress
		} // End of template mw_cPTransportLayerInformation_endpointIPAddress

		template (present) CPTransportLayerInformation mw_cPTransportLayerInformation_choice_Extensions(
		template (present) CPTransportLayerInformation.choice_Extensions p_choice_Extensions := ?
		) := {
		choice_Extensions := p_choice_Extensions
		} // End of template mw_cPTransportLayerInformation_choice_Extensions

		template (present) CPTransportLayerInformation.choice_Extensions mw_cPTransportLayerInformation_ext(
		template (present) EndpointIPAddressAndPort p_EndpointIPAddressAndPort := ?
		) := {
		id := id_EndpointIPAddressAndPort,
		criticality := reject,
		value_ := { EndpointIPAddressAndPort := p_EndpointIPAddressAndPort }
		} // End of template mw_cPTransportLayerInformation_ext

		template CriticalityDiagnostics mw_criticalityDiagnostics(
		template ProcedureCode p_procedureCode := *,
		template TriggeringMessage p_triggeringMessage := *,
		template Criticality p_procedureCriticality := *,
		template CriticalityDiagnostics.iEsCriticalityDiagnostics p_criticalityDiagnostics_IE_List := *,
		template CriticalityDiagnostics.iE_Extensions p_iE_Extensions := *
		) := {
		procedureCode := p_procedureCode,
		triggeringMessage := p_triggeringMessage,
		procedureCriticality := p_procedureCriticality,
		iEsCriticalityDiagnostics := p_criticalityDiagnostics_IE_List,
		iE_Extensions := p_iE_Extensions
		} // End of template mw_criticalityDiagnostics

		template (present) CriticalityDiagnostics_IE_Item mw_criticalityDiagnostics_IE_Item(
		template (present) Criticality p_iECriticality := ?,
		template (present) ProtocolIE_ID p_iE_ID := ?,
		template (present) TypeOfError p_typeOfError := ?,
		template CriticalityDiagnostics_IE_Item.iE_Extensions p_iE_Extensions := *
		) := {
		iECriticality := p_iECriticality,
		iE_ID := p_iE_ID,
		typeOfError := p_typeOfError,
		iE_Extensions := p_iE_Extensions
		} // End of template mw_criticalityDiagnostics_IE_Item

		// type record CellBasedMDT_NR {
		// type NGAP_Containers.NGAP_PROTOCOL_EXTENSION CellBasedMDT_NR_ExtIEs (?);
		// type record length (1 .. NGAP_Constants.maxnoofCellIDforMDT) of NR_CGI CellIdListforMDT_NR;
		@@ -5546,7 +5658,7 @@ module LibNGAP_Templates {

		} // End of group receive

		} // End of group Information_elements
		//} // End of group Information_elements

		} // End of group g_NGAP