Implemented most of PICS, many comments on the document (57b259f3) · Commits · DMR / dPMR

ttcn/dPMR_Pics.ttcn

+404 −5

Original line number	Diff line number	Diff line
		@@ -16,15 +16,414 @@ module dPMR_Pics {
		import from dPMR_Values all;
		import from dPMR_TestConfiguration all;

		group Entitygroup { // PICS Clause A.5

		/**
		* @desc Is the IUT an ISF or CSF entity?
		* @remark see PICS, Table A.1/1.
		* @remark see PICS, Table A.1/1. xor value, only one supported
		*/
		modulepar {Entity PIC_ISF_OR_CSF := e_isf}

		} // end groupe Entity

		group ISF { // PICS Clause A.6

		/**
		* @desc Is the ISF IUT supporting Voice?
		* @remark see PICS, Table A.2/1.
		*/
		modulepar {boolean PIC_ISF_VOICE_SUPPORT := true}

		/**
		* @desc Is the ISF IUT supporting Type 1 data?
		* @remark see PICS, Table A.2/3.
		*/
		modulepar {boolean PIC_ISF_TYPE_1_DATA_SUPPORT := true}

		/**
		* @desc Is the ISF IUT supporting Type 2 data?
		* @remark see PICS, Table A.2/2.
		*/
		modulepar {boolean PIC_ISF_TYPE_2_DATA_SUPPORT := true}

		/**
		* @desc Is the ISF IUT supporting Late Entry?
		* @remark see PICS, Table A.3/1.
		*/
		modulepar {boolean PIC_ISF_LATE_ENTRY := true}

		/**
		* @desc Is the ISF IUT supporting All Call?
		* @remark see PICS, Table A.3/2.
		*/
		modulepar {boolean PIC_ISF_ALL_CALL := true}

		/**
		* @desc Is the ISF IUT supporting Ptt Call?
		* @remark see PICS, Table A.3/3.
		*/
		modulepar {boolean PIC_ISF_PTT_CALL := true}

		/**
		* @desc Is the ISF IUT supporting Talking Party Identification?
		* @remark see PICS, Table A.3/4.
		*/
		modulepar {boolean PIC_ISF_TALKING_PARTY_IDENTIFICATION := true}

		/**
		* @desc Is the ISF Type 2 Data IUT is supporting IP over dPMR?
		* @remark see PICS, Table A.4/1.
		*/
		modulepar {boolean PIC_ISF_T2Data_IP := true}

		/**
		* @desc Is the ISF Type 2 Data IUT is supporting Group Short Data Message?
		* @remark see PICS, Table A.4/2.
		*/
		modulepar {boolean PIC_ISF_T2Data_GRP_DATA_MESSAGE := true}

		/**
		* @desc Is the ISF Type 2 Data Supplementary Service IUT is supporting Status Message?
		* @remark see PICS, Table A.5/1.
		*/
		modulepar {boolean PIC_ISF_T2Data_SS_STATUS_MESSAGE := true}

		/**
		* @desc Is the ISF Type 2 Data Supplementary Service IUT is supporting Precoded Message?
		* @remark see PICS, Table A.5/2.
		*/
		modulepar {boolean PIC_ISF_T2Data_SS_PRECODED_MESSAGE := true}

		/**
		* @desc Is the ISF Type 2 Data Supplementary Service IUT is supporting FreeText Message?
		* @remark see PICS, Table A.5/3.
		*/
		modulepar {boolean PIC_ISF_T2Data_SS_FREETEXT_MESSAGE := true}

		/**
		* @desc Is the ISF Type 2 Data Supplementary Service IUT is supporting short file transfer?
		* @remark see PICS, Table A.5/3.
		*/
		modulepar {boolean PIC_ISF_T2Data_SS_SHORTFILE_TRANSFER := true}

		/**
		* @desc Is the ISF Type 2 Data IUT is supporting IP over dPMR?
		* @remark see PICS, Table A.4/1.
		*/
		modulepar {boolean PIC_ISF_T1Data_IP := true}

		/**
		* @desc Is the ISF Type 1 Data IUT is supporting Group Short Data Message?
		* @remark see PICS, Table A.4/2.
		*/
		modulepar {boolean PIC_ISF_T1Data_GRP_DATA_MESSAGE := true}

		/**
		* @desc Is the ISF Type 1 Data Supplementary Service IUT is supporting Status Message?
		* @remark see PICS, Table A.5/1.
		*/
		modulepar {boolean PIC_ISF_T1Data_SS_STATUS_MESSAGE := true}

		/**
		* @desc Is the ISF Type 1 Data Supplementary Service IUT is supporting Precoded Message?
		* @remark see PICS, Table A.5/2.
		*/
		modulepar {boolean PIC_ISF_T1Data_SS_PRECODED_MESSAGE := true}

		/**
		* @desc Is the ISF Type 1 Data Supplementary Service IUT is supporting FreeText Message?
		* @remark see PICS, Table A.5/3.
		*/
		modulepar {boolean PIC_ISF_T1Data_SS_FREETEXT_MESSAGE := true}

		/**
		* @desc Is the ISF Type 1 Data Supplementary Service IUT is supporting short file transfer?
		* @remark see PICS, Table A.5/3.
		*/
		modulepar {boolean PIC_ISF_T1Data_SS_SHORTFILE_TRANSFER := true}

		} // end group ISF

		group CSF { // PICS Clause A.7

		/**
		* @desc Is the CSF IUT supporting Voice?
		* @remark see PICS, Table A.8/1.
		*/
		modulepar {boolean PIC_CSF_VOICE_SUPPORT := true}

		/**
		* @desc Is the CSF IUT supporting Type 1 data?
		* @remark see PICS, Table A.8/4.
		*/
		modulepar {boolean PIC_CSF_TYPE_1_DATA_SUPPORT := true}

		/**
		* @desc Is the CSF IUT supporting Type 2 data?
		* @remark see PICS, Table A.8/3.
		*/
		modulepar {boolean PIC_CSF_TYPE_2_DATA_SUPPORT := true}

		/**
		* @desc Is the CSF IUT supporting Type 3 data?
		* @remark see PICS, Table A.8/2.
		*/
		modulepar {boolean PIC_CSF_TYPE_3_DATA_SUPPORT := true}

		/**
		* @desc Is the CSF IUT supporting Numbering and Dialing?
		* @remark see PICS, Table A.8/5.
		*/
		modulepar {boolean PIC_CSF_NUMBER_AND_DIALING_SUPPORT := true}

		/**
		* @desc Is the CSF IUT supporting Individual Call?
		* @remark see PICS, Table A.9/1.
		*/
		modulepar {boolean PIC_CSF_INDIVIDUAL_CALL := true}

		/**
		* @desc Is the CSF IUT supporting Group Call?
		* @remark see PICS, Table A.9/2.
		*/
		modulepar {boolean PIC_CSF_GROUP_CALL := true}

		/**
		* @desc Is the CSF Voice Individual Supp Services Late Entry?
		* @remark see PICS, Table A.10/1.
		*/

		modulepar {boolean PIC_CSF_VOICE_SS_LATE_ENTRY := true}

		/**
		* @desc Is the CSF Voice Individual Supp Services OACSU?
		* @remark see PICS, Table A.10/2.
		*/
		modulepar {boolean PIC_CSF_VOICE_SS_OACSU := true}

		/**
		* @desc Is the CSF Voice Individual Supp Services Cancel Call Setup?
		* @remark see PICS, Table A.10/3.
		*/
		modulepar {boolean PIC_CSF_VOICE_SS_CANCEL_CALL_SETUP := true}

		/**
		* @desc Is the CSF Voice Individual Supp Services Ptt Call?
		* @remark see PICS, Table A.10/4.
		*/
		modulepar {boolean PIC_CSF_VOICE_SS_PTT_CALL := true}

		/**
		* @desc Is the CSF Voice Individual Supp Services SLD?
		* @remark see PICS, Table A.10/5.
		*/
		modulepar {boolean PIC_CSF_VOICE_SS_SLD := true}

		/**
		* @desc Is the CSF Voice Individual Supp Services Short App data?
		* @remark see PICS, Table A.10/6.
		*/
		modulepar {boolean PIC_CSF_VOICE_SS_SHORT_APP_DATA := true}

		/**
		* @desc Is the CSF Voice Individual Supp Services supporting Talking Party Identification?
		* @remark see PICS, Table A.10/7.
		*/
		modulepar {boolean PIC_CSF_VOICE_SS_TALKING_PARTY_IDENTIFICATION := true}

		/**
		* @desc Is the CSF Group Voice Supp Services Late Entry?
		* @remark see PICS, Table A.11/1.
		*/

		modulepar {boolean PIC_CSF_GROUP_VOICE_SS_LATE_ENTRY := true}

		/**
		* @desc Is the CSF Group Voice Supp Services OACSU?
		* @remark see PICS, Table A.11/2.
		*/
		modulepar {boolean PIC_CSF_GROUP_VOICE_SS_OACSU := true}

		/**
		* @desc Is the CSF Group Voice Supp Services Cancel Call Setup?
		* @remark see PICS, Table A.11/3.
		*/
		modulepar {boolean PIC_CSF_GROUP_VOICE_SS_CANCEL_CALL_SETUP := true}

		/**
		* @desc Is the CSF Group Voice Supp Services Ptt Call?
		* @remark see PICS, Table A.11/4.
		*/
		modulepar {boolean PIC_CSF_GROUP_VOICE_SS_PTT_CALL := true}

		/**
		* @desc Is the CSF Group Voice Supp Services SLD?
		* @remark see PICS, Table A.11/5.
		*/
		modulepar {boolean PIC_CSF_GROUP_VOICE_SS_SLD := true}

		/**
		* @desc Is the CSF Group Voice Supp Services Short App data?
		* @remark see PICS, Table A.11/6.
		*/
		modulepar {boolean PIC_CSF_GROUP_VOICE_SS_SHORT_APP_DATA := true}


		/**
		* @desc Is the CSF Group Voice Supp Services supporting Talking Party Identification?
		* @remark see PICS, Table A.11/7.
		*/
		modulepar {boolean PIC_CSF_GROUP_VOICE_SS_TALKING_PARTY_IDENTIFICATION := true}

		/**
		* @desc Is the CSF Type 3 Data IUT is supporting IP over dPMR?
		* @remark see PICS, Table A.12/1.
		*/
		modulepar {boolean PIC_CSF_T3Data_IP := true}

		/**
		* @desc Is the CSF Type 3 Data IUT is supporting Individual Short Data Message?
		* @remark see PICS, Table A.12/2.
		*/
		modulepar {boolean PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE := true}

		// TODO Table A.13 not needed!


		/**
		* @desc Is the CSF Type 2 Data IUT is supporting IP over dPMR?
		* @remark see PICS, Table A.14/1.
		*/
		modulepar {boolean PIC_CSF_T2Data_IP := true}

		/**
		* @desc Is the CSF Type 2 Data IUT is supporting Individual Short Data Message?
		* @remark see PICS, Table A.14/2.
		*/
		modulepar {boolean PIC_CSF_T2Data_INDIVIDUAL_DATA_MESSAGE := true}

		/**
		* @desc Is the CSF Type 1 Data IUT is supporting Group Short Data Message?
		* @remark see PICS, Table A.14/3.
		*/
		modulepar {boolean PIC_CSF_T2Data_GRP_DATA_MESSAGE := true}


		/**
		* @desc Is the CSF Type 2 Data Supplementary Service Individual IUT is supporting Status Message?
		* @remark see PICS, Table A.15/1.
		*/
		modulepar {boolean PIC_CSF_T2Data_SS_INDIVIDUAL_STATUS_MESSAGE := true}

		/**
		* @desc Is the CSF Type 2 Data Supplementary Service Individual IUT is supporting Precoded Message?
		* @remark see PICS, Table A.15/2.
		*/
		modulepar {boolean PIC_CSF_T2Data_SS_INDIVIDUAL_PRECODED_MESSAGE := true}

		/**
		* @desc Is the CSF Type 2 Data Supplementary Service Individual IUT is supporting FreeText Message?
		* @remark see PICS, Table A.15/3.
		*/
		modulepar {boolean PIC_CSF_T2Data_SS_INDIVIDUAL_FREETEXT_MESSAGE := true}

		/**
		* @desc Is the CSF Type 2 Data Supplementary Service Individual IUT is supporting short file transfer?
		* @remark see PICS, Table A.15/4.
		*/
		modulepar {boolean PIC_CSF_T2Data_SS_INDIVIDUAL_SHORTFILE_TRANSFER := true}

		/**
		* @desc Is the CSF Type 2 Data Supplementary Service group IUT is supporting Status Message?
		* @remark see PICS, Table A.16/1.
		*/
		modulepar {boolean PIC_CSF_T2Data_SS_GROUP_STATUS_MESSAGE := true}

		/**
		* @desc Is the CSF Type 2 Data Supplementary Service group IUT is supporting Precoded Message?
		* @remark see PICS, Table A.16/2.
		*/
		modulepar {boolean PIC_CSF_T2Data_SS_GROUP_PRECODED_MESSAGE := true}

		/**
		* @desc Is the CSF Type 2 Data Supplementary Service group IUT is supporting FreeText Message?
		* @remark see PICS, Table A.16/3.
		*/
		modulepar {boolean PIC_CSF_T2Data_SS_GROUP_FREETEXT_MESSAGE := true}

		/**
		* @desc Is the CSF Type 2 Data Supplementary Service group IUT is supporting short file transfer?
		* @remark see PICS, Table A.16/4.
		*/
		modulepar {boolean PIC_CSF_T2Data_SS_GROUP_SHORTFILE_TRANSFER := true}

		/**
		* @desc Is the CSF Type 1 Data IUT is supporting IP over dPMR?
		* @remark see PICS, Table A.17/1.
		*/
		modulepar {boolean PIC_CSF_T1Data_IP := true}

		/**
		* @desc Is the CSF Type 1 Data IUT is supporting Individual Short Data Message?
		* @remark see PICS, Table A.17/2.
		*/
		modulepar {boolean PIC_CSF_T1Data_INDIVIDUAL_DATA_MESSAGE := true}

		/**
		* @desc Is the CSF Type 1 Data IUT is supporting Group Short Data Message?
		* @remark see PICS, Table A.17/3.
		*/
		modulepar {boolean PIC_CSF_T1Data_GRP_DATA_MESSAGE := true}


		/**
		* @desc Is the CSF Type 1 Data Supplementary Service Individual IUT is supporting Status Message?
		* @remark see PICS, Table A.18/1.
		*/
		modulepar {boolean PIC_CSF_T1Data_SS_INDIVIDUAL_STATUS_MESSAGE := true}

		/**
		* @desc Is the CSF Type 1 Data Supplementary Service Individual IUT is supporting Precoded Message?
		* @remark see PICS, Table A.18/2.
		*/
		modulepar {boolean PIC_CSF_T1Data_SS_INDIVIDUAL_PRECODED_MESSAGE := true}

		/**
		* @desc Is the CSF Type 1 Data Supplementary Service Individual IUT is supporting FreeText Message?
		* @remark see PICS, Table A.18/3.
		*/
		modulepar {boolean PIC_CSF_T1Data_SS_INDIVIDUAL_FREETEXT_MESSAGE := true}

		/**
		* @desc Is the CSF Type 1 Data Supplementary Service Individual IUT is supporting short file transfer?
		* @remark see PICS, Table A.18/4.
		*/
		modulepar {boolean PIC_CSF_T1Data_SS_INDIVIDUAL_SHORTFILE_TRANSFER := true}

		/**
		* @desc Is the CSF Type 1 Data Supplementary Service group IUT is supporting Status Message?
		* @remark see PICS, Table A.19/1.
		*/
		modulepar {boolean PIC_CSF_T1Data_SS_GROUP_STATUS_MESSAGE := true}

		/**
		* @desc Is the CSF Type 1 Data Supplementary Service group IUT is supporting Precoded Message?
		* @remark see PICS, Table A.19/2.
		*/
		modulepar {boolean PIC_CSF_T1Data_SS_GROUP_PRECODED_MESSAGE := true}

		/**
		* @desc Is the CSF Type 1 Data Supplementary Service group IUT is supporting FreeText Message?
		* @remark see PICS, Table A.19/3.
		*/
		modulepar {boolean PIC_CSF_T1Data_SS_GROUP_FREETEXT_MESSAGE := true}

		/**
		* @desc Is the CSF Type 1 Data Supplementary Service group IUT is supporting short file transfer?
		* @remark see PICS, Table A.19/4.
		*/
		modulepar {boolean PIC_CSF_T1Data_SS_GROUP_SHORTFILE_TRANSFER := true}
		} // end group CSF


		/**

ttcn/dPMR_Templates.ttcn

+11 −15

Original line number	Diff line number	Diff line
		@@ -527,20 +527,18 @@

		group ConfigurationTemplates {

		template UtRequest m_sendSomeT3Data_utRequest( ChannelNumber p_channelNumber,
		in template DialString p_dialString,
		template UtRequest m_sendSomeT3Data_utRequest( in template DialString p_dialString,
		UtActParams p_utActParameter ) := {
		channelNr := p_channelNumber,
		channelNr := omit,
		politeLvl := omit ,
		dialString := p_dialString ,
		isfCidAddr := omit,
		utActParams := p_utActParameter
		}

		template UtRequest m_testToneDetected_utRequest( ChannelNumber p_channelNumber,
		Common_ID p_commonId,
		template UtRequest m_testToneDetected_utRequest( Common_ID p_commonId,
		UtActParams p_utActParameter ) := {
		channelNr := p_channelNumber,
		channelNr := omit,
		politeLvl := omit ,
		dialString := omit ,
		isfCidAddr := p_commonId,
		@@ -590,21 +588,19 @@
		utActParams := omit
		}

		template UtRequest m_commandISFCSF_utRequest( ChannelNumber p_channelNumber,
		in template DialString p_dialstr ,
		template UtRequest m_commandISFCSF_utRequest( in template DialString p_dialstr ,
		in template Common_ID p_commonId,
		UtActParams p_utActParameter) := {
		channelNr := p_channelNumber,
		channelNr := omit,
		politeLvl := omit ,
		dialString := p_dialstr,
		isfCidAddr := p_commonId ,
		utActParams := p_utActParameter
		}

		template UtRequest m_commandCSF_utRequest( ChannelNumber p_channelNumber,
		in template DialString p_dialstr ,
		template UtRequest m_commandCSF_utRequest( in template DialString p_dialstr ,
		UtActParams p_utActParameter) := {
		channelNr := p_channelNumber,
		channelNr := omit,
		politeLvl := omit ,
		dialString := p_dialstr,
		isfCidAddr := omit ,

ttcn/dPMR_TestCases.ttcn

+124 −155

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/dPMR_TestExecution.ttcn

+4 −4

Original line number	Diff line number	Diff line
		@@ -19,14 +19,14 @@ module dPMR_TestExecution {
		control{

		// Group: TODO grouping with comments-way
		if (PIC_ISF_OR_CSF == e_isf) {execute(TC_PMR_0824_01( f_getColourCode() ) );}
		if (PIC_ISF_OR_CSF == e_csf) {execute( TC_PMR_0406_01(f_getColourCode()) );}
		if (PIC_ISF_OR_CSF == e_isf) {execute(TC_PMR_0824_01( ) );}
		if (PIC_ISF_OR_CSF == e_csf) {execute( TC_PMR_0406_01() );}
		// Group:
		execute(TC_PMR_0801_01( f_getColourCode() ) );
		execute(TC_PMR_0801_01( ) );


		if (PIC_ISF_OR_CSF == e_csf
		and PIC_OACSU_MODE != e_noOacsuSupport) {execute(TC_PMR_0405_02( f_getColourCode() ) );}
		and PIC_OACSU_MODE != e_noOacsuSupport) {execute(TC_PMR_0405_02( ) );}


		// TODO TO BE DONE

ttcn/dPMR_Types.ttcn

+1 −2

Original line number	Diff line number	Diff line
		@@ -506,9 +506,8 @@ module dPMR_Types {
		group AtsRelatedTypes {

		type record UtRequest {
		ChannelNumber channelNr, // ChannelNr used
		ChannelNumber channelNr optional, // ChannelNr used
		PoliteLvl politeLvl optional, // Only needed for transmission
		// CallType callType optional, // Only needed for transmission JP Not used
		DialString dialString optional, // Dial string to identify the TE CSF address (CSF only)
		Common_ID isfCidAddr optional, // Common part (1-255) of ISF address (ISF only)
		UtActParams utActParams optional // Instruction for the test operator