Almost all changes made after review. Left are the UT configuration, and some minor issues. (ed65b8fe) · Commits · DMR / dPMR

ttcn/dPMR_Defaults.ttcn

+20 −12

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ module dPMR_Defaults {
		}
		}

		altstep a_dftMse()
		altstep a_dftMse(ColourCode p_cc, CommunicationsMode p_commsMode)
		runs on Mse{
		[] syncPort.receive(m_syncServerStop){
		log("** a_dftSimu: Test component received STOP signal from MTC - going to IDLE state. ** ");
		@@ -53,17 +53,25 @@ module dPMR_Defaults {
		stop;
		}
		// receive connection request and send an ack
		//TODO use CoonectionReq template
		/* [] dp1Port.receive(m_headerFrame(mw_headerInformationTx(
		vc_mse.testerId, vc_mse.iutId, p_commMode, e_p2p),
		p_cc)) {

		dp1Port.send( m_sendAck(m_headerInformation(e_ack,
		[] dp1Port.receive(m_callSetUpOrServiceRequest(
		m_headerFrame(
		mw_headerInformationTx(
		vc_mse.testerId,
		vc_mse.iutId,
		p_commsMode,
		e_p2p),
		p_cc),
		m_endFrame(mw_endInformation(e_AckReq))))
		{
		dp1Port.send( m_acknowledgement(
		m_headerInformation(
		e_ack,
		vc_mse.testerId,
		vc_mse.iutId,
		p_commMode,
		e_p2p), p_cc));
		} */
		p_commsMode,
		e_p2p),
		p_cc));
		}
		[] dp1Port.receive{
		setverdict(inconc);
		log("* a_dftSimu: Unexpected message received on dp1Port. *");

ttcn/dPMR_Messages.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -134,7 +134,7 @@ module dPMR_Messages {



		type record CallOrSrvReq {
		type record CallSetUpOrServiceRequest {
		ExtendedHdrFrameList extHdrFrameList optional,
		HeaderFrame headerFrame,
		EndFrame endFrame

ttcn/dPMR_Templates.ttcn

+295 −271

Original line number	Diff line number	Diff line
		@@ -25,6 +25,18 @@


		group MessageTemplates {
		group AcknowledegmentTemplates {
		// only one template needed for ack
		template AckFrame m_acknowledgement( in template HeaderInformation p_headerInformation,
		ColourCode p_cc) := {
		preamble := c_preamble,
		frameSync1 := c_fs1,
		headerInformation0 := p_headerInformation,
		colourCode := p_cc,
		headerInformation1 := p_headerInformation
		} // end template mw_acknowledgementAckOnConnectReq
		} // end group AcknowledegmentTemplates


		template PayloadTransmission m_payloadTransmission ( template HeaderFrame p_headerFrame ,
		template SuperFrameList p_superFrameList ,
		@@ -36,6 +48,9 @@
		} // end template m_payloadTransmission



		group SuperFrameGroup {

		template SuperFrameList m_superFrameList_1Elem ( template SuperFrame p_superFrame) := {
		p_superFrame
		}
		@@ -44,17 +59,26 @@
		p_superFrame,p_superFrame,p_superFrame,p_superFrame
		}


		template SuperFrame m_superFrame ( template Frame1 m_frame1,
		template Frame2 m_frame2,
		template Frame3 m_frame3,
		template Frame4 m_frame4 ) := {
		frame1 := m_frame1,
		frame2 := m_frame2,
		frame3 := m_frame3,
		frame4 := m_frame4
		// TODO JP Mantis: question if HE is allowed as voice burst
		template SuperFrameList mw_superFrameList_OneOrManyElem ( template SuperFrame p_superFrame) := superset (
		p_superFrame
		);

		template SuperFrame m_superFrame ( template Frame1 p_frame1,
		template Frame2 p_frame2,
		template Frame3 p_frame3,
		template Frame4 p_frame4 ) := {
		frame1 := p_frame1,
		frame2 := p_frame2,
		frame3 := p_frame3,
		frame4 := p_frame4
		} // end template m_superFrame

		} // end group SuperFrameGroup

		group VoiceFrameGroup {

		group TestToneGroup {

		template Frame1 m_frame1AudibleTestTone ( CalledIdUP p_calledIdUP,
		Payload p_payload) := {
		@@ -94,7 +118,6 @@
		payload := p_payload
		} // end template m_frame3AudibleTestTone


		template Frame4 m_frame4AudibleTestTone ( OwnIdLP p_ownIdLP,
		Payload p_payload, ColourCode p_cc) := {
		colourCode := p_cc,
		@@ -107,6 +130,65 @@
		payload := p_payload
		} // end tamplate m_frame4AudibleTestTone

		} // end group TestToneGroup

		group VoiceGroup {

		template Frame1 mw_frame1Voice ( CalledIdUP p_calledIdUP ) := {
		frameSync := c_fs2,
		frameNumber := e_frame1,
		calledIdUP := p_calledIdUP,
		communicationsMode := e_voice,
		commsFormat := ?,
		reserved2bit := c_reserved2bits,
		slowData := c_slowDataInVoiceEmpty,
		payload := ?
		} // end template mw_frame1Voice


		template Frame2 mw_frame2Voice ( CalledIdLP p_calledIdLP, ColourCode p_cc) := {
		colourCode := p_cc,
		frameNumber := e_frame2,
		calledIdLP := p_calledIdLP,
		communicationsMode := e_voice,
		commsFormat := ?,
		reserved2bit := c_reserved2bits,
		slowData := c_slowDataInVoiceEmpty,
		payload := ?
		} // end template mw_frame2Voice


		template Frame3 mw_frame3Voice ( OwnIdUP p_ownIdUP ) := {
		frameSync := c_fs2,
		frameNumber := e_frame3,
		ownIdUP := p_ownIdUP,
		communicationsMode := e_voice,
		commsFormat := ?,
		reserved2bit := c_reserved2bits,
		slowData := c_slowDataInVoiceEmpty,
		payload := ?
		} // end template mw_frame3Voice


		template Frame4 mw_frame4Voice ( OwnIdLP p_ownIdLP, ColourCode p_cc) := {
		colourCode := p_cc,
		frameNumber := e_frame4,
		ownIdLP := p_ownIdLP,
		communicationsMode := e_voice,
		commsFormat := ?,
		reserved2bit := c_reserved2bits,
		slowData := c_slowDataInVoiceEmpty,
		payload := ?
		} // end template mw_frame4Voice

		} // end VoiceGroup

		} // end group VoiceFrameGroup



		group T1T2DataFrameGroup {

		template SlowData m_slowDataT1Data (DataPosition p_dataPos,
		DataFormat p_dataFormat,
		ContFlag p_contFlag,
		@@ -119,9 +201,15 @@
		dataLength := p_dataLength
		}
		}
		template Payload m_T1Payload(Payload p_framePayLoad) := {
		payLoad1 :=p_framePayLoad.payLoad1,
		payLoad2 :=p_framePayLoad.payLoad2,
		payLoad3 :=p_framePayLoad.payLoad3,
		payLoad4 :=p_framePayLoad.payLoad4
		}

		template Frame1 m_frame1T1Data (CalledIdUP p_calledIdUP,
		Payload p_payload,
		template Payload p_framePayload,
		in template SlowData p_slowData) := {
		frameSync := c_fs2,
		frameNumber := e_frame1,
		@@ -130,13 +218,13 @@
		commsFormat := e_p2p,
		reserved2bit := c_reserved2bits,
		slowData := p_slowData,
		payload := p_payload
		payload := p_framePayload
		} // end template m_frame1T1Data



		template Frame2 m_frame2T1Data (CalledIdLP p_calledIdLP,
		Payload p_payload, ColourCode p_cc,
		template Payload p_payload, ColourCode p_cc,
		in template SlowData p_slowData) := {
		colourCode := p_cc,
		frameNumber := e_frame2,
		@@ -150,7 +238,7 @@


		template Frame3 m_frame3T1Data (OwnIdUP p_ownIdUP,
		Payload p_payload,
		template Payload p_payload,
		in template SlowData p_slowData) := {
		frameSync := c_fs2,
		frameNumber := e_frame3,
		@@ -164,7 +252,7 @@


		template Frame4 m_frame4T1Data (OwnIdLP p_ownIdLP,
		Payload p_payload, ColourCode p_cc,
		template Payload p_payload, ColourCode p_cc,
		in template SlowData p_slowData) := {
		colourCode := p_cc,
		frameNumber := e_frame4,
		@@ -176,54 +264,6 @@
		payload := p_payload
		} // end tamplate m_frame4T1Data

		template Frame1 mw_frame1Voice ( CalledIdUP p_calledIdUP ) := {
		frameSync := c_fs2,
		frameNumber := e_frame1,
		calledIdUP := p_calledIdUP,
		communicationsMode := e_voice,
		commsFormat := ?,
		reserved2bit := c_reserved2bits,
		slowData := c_slowDataInVoiceEmpty,
		payload := ?
		} // end template mw_frame1Voice


		template Frame2 mw_frame2Voice ( CalledIdLP p_calledIdLP, ColourCode p_cc) := {
		colourCode := p_cc,
		frameNumber := e_frame2,
		calledIdLP := p_calledIdLP,
		communicationsMode := e_voice,
		commsFormat := ?,
		reserved2bit := c_reserved2bits,
		slowData := c_slowDataInVoiceEmpty,
		payload := ?
		} // end template mw_frame2Voice


		template Frame3 mw_frame3Voice ( OwnIdUP p_ownIdUP ) := {
		frameSync := c_fs2,
		frameNumber := e_frame3,
		ownIdUP := p_ownIdUP,
		communicationsMode := e_voice,
		commsFormat := ?,
		reserved2bit := c_reserved2bits,
		slowData := c_slowDataInVoiceEmpty,
		payload := ?
		} // end template mw_frame3Voice


		template Frame4 mw_frame4Voice ( OwnIdLP p_ownIdLP, ColourCode p_cc) := {
		colourCode := p_cc,
		frameNumber := e_frame4,
		ownIdLP := p_ownIdLP,
		communicationsMode := e_voice,
		commsFormat := ?,
		reserved2bit := c_reserved2bits,
		slowData := c_slowDataInVoiceEmpty,
		payload := ?
		} // end template mw_frame4Voice


		template Frame1 mw_frame1dataT1 ( CalledIdUP p_calledIdUP ) := {
		frameSync := c_fs2,
		frameNumber := e_frame1,
		@@ -270,33 +310,36 @@
		payload := ?
		} // end template mw_frame4Voice

		template CallOrSrvReq m_callOrSrvReq( template HeaderFrame p_headerFrame ,
		template EndFrame p_endFrame ) := {
		} // end Group T1T2DataFrameGroup



		group ConnectionRequestTemplates {
		// Connection requests are HE i.e. HeaderFrame and EndFrame
		template CallSetUpOrServiceRequest m_callSetUpOrServiceRequest( in template HeaderFrame p_headerFrame ,
		in template EndFrame p_endFrame ) := {
		extHdrFrameList := omit ,
		headerFrame := p_headerFrame ,
		endFrame := p_endFrame
		} // end template m_callOrSrvReq
		} // end template m_callSetUpOrServiceRequest

		//template T1Data
		} // end group ConnectionRequestTemplates

		group DisconnectionRequestTemplates {
		template Disconnect m_disconnectRequest( in template HeaderFrame p_headerFrame, in template EndFrame p_endFrame) := {
		headerFrame1 := p_headerFrame,
		endFrame1 := p_endFrame,
		headerFrame2 := p_headerFrame,
		endFrame2 := p_endFrame
		}

		} // end group DiconnectionRequestTemplates

		} // end group MessageTemplates


		group FrameTemplates {

		// TODO JP This template should be deleted and replaced by the general template m_headerFrame
		template HeaderFrame m_headerFrameConnectReq (in template HeaderInformation p_headerInformation,
		ColourCode p_cc) := {
		preamble := c_preamble,
		frameSync1 := c_fs1,
		headerInformation0 := p_headerInformation,
		colourCode := p_cc,
		headerInformation1 := p_headerInformation
		} // end template m_headerFrameConnectReq


		template HeaderFrame m_headerFrame (in template HeaderInformation p_headerInformation,
		ColourCode p_cc) := {
		preamble := c_preamble,
		@@ -345,32 +388,13 @@
		endInformation1 := m_endInformationNoAck
		} // end template m_endFrameNoAck


		template AckFrame mw_acknowledgementAckOnConnectReq( in template HeaderInformation p_headerInformation,
		ColourCode p_cc) := {
		preamble := c_preamble,
		frameSync1 := c_fs1,
		headerInformation0 := p_headerInformation,
		colourCode := p_cc,
		headerInformation1 := p_headerInformation
		} // end template mw_acknowledgementAckOnConnectReq

		template EndFrame m_endFrame ( in template EndInformation p_endInfo ) := {
		frameSync3 := c_fs3,
		endInformation0 := p_endInfo,
		endInformation1 := p_endInfo
		} // end template m_EndFrame
		}// end group FrameTemplates {

		template AckFrame m_sendAck ( in template HeaderInformation p_ackInfo,
		ColourCode p_cc) := {
		preamble := c_preamble,
		frameSync1 := c_fs1,
		headerInformation0 := p_ackInfo,
		colourCode := p_cc,
		headerInformation1 := p_ackInfo
		} // end template m_EndFrame

		} // end group FrameTemplates

		group InformationElementTemplates {
		template HeaderInformation m_headerInformation( HeaderType p_hdrTp,
		@@ -421,7 +445,7 @@

		template HeaderInformation mw_headerInformationTx ( MsAddress p_calledId ,
		MsAddress p_ownId,
		CommunicationsMode p_commMode,
		template CommunicationsMode p_commMode,
		CommsFormat p_commFormat
		) := {
		headerType := e_commStartHeader,
		@@ -484,7 +508,7 @@
		UtActParams p_utActParameter ) := {
		channelNr := p_channelNumber,
		politeLvl := omit ,
		callType := omit ,
		// callType := omit ,
		dialString := omit ,
		isfCidAddr := p_commonId,
		utActParams := p_utActParameter
		@@ -494,7 +518,7 @@
		UtActParams p_utActParameter ) := {
		channelNr := p_channelNumber,
		politeLvl := omit ,
		callType := omit ,
		// callType := omit ,
		dialString := omit ,
		isfCidAddr := omit,
		utActParams := p_utActParameter
		@@ -506,7 +530,7 @@
		in template Common_ID p_commonId ) := {
		channelNr := p_channelNumber,
		politeLvl := omit ,
		callType := omit ,
		// callType := omit ,
		dialString := p_dialString,
		isfCidAddr := p_commonId,
		utActParams := omit
		@@ -518,7 +542,7 @@
		UtActParams p_utActParameter) := {
		channelNr := p_channelNumber,
		politeLvl := omit ,
		callType := omit ,
		// callType := omit ,
		dialString := p_dialstr,
		isfCidAddr := p_commonId ,
		utActParams := p_utActParameter
		@@ -529,7 +553,7 @@
		UtActParams p_utActParameter) := {
		channelNr := p_channelNumber,
		politeLvl := omit ,
		callType := omit ,
		// callType := omit ,
		dialString := p_dialstr,
		isfCidAddr := omit ,
		utActParams := p_utActParameter

ttcn/dPMR_TestCases.ttcn

+115 −292

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/dPMR_TestSystem.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ group portDefs {
		inout PacketDataHeader ;
		inout AckFrame ;
		inout PayloadTransmission ;
		inout CallOrSrvReq ;
		inout CallSetUpOrServiceRequest ;
		inout Acknowledgement ;
		inout StatusReqAck ;
		inout Disconnect ;