Aligning code with ETSI TS 102 797-2v0.0.9 FSAP TSS&TP (be8f64b6) · Commits · TTCN-3 Libraries / LibIts

ttcn/CALM/FNTP/LibItsFntp_Functions.ttcn3

+24 −27

Original line number	Original line	Diff line number	Diff line
	@@ -40,10 +40,6 @@ module LibItsFntp_Functions {
	import from LibItsFntp_Pics {		import from LibItsFntp_Pics {
	modulepar PICS_ITS_S_INW, PICS_ROLE_RH;		modulepar PICS_ITS_S_INW, PICS_ROLE_RH;
	};		};
	// FIXME To be removed
	// import from LibItsCommon_TypesAndValues {
	// type UtCommandConfirm
	// };
	import from LibItsCalm_Interface all;		import from LibItsCalm_Interface all;

	group fntpConfigurationFunctions {		group fntpConfigurationFunctions {
	@@ -294,8 +290,8 @@ module LibItsFntp_Functions {

	/**		/**
	* @desc Triggers test adapter to send FNTP NDPU		* @desc Triggers test adapter to send FNTP NDPU
	* @param p_sourcePort TODO		* @param p_sourcePort Source port number
	* @param p_destinationPort TODO		* @param p_destinationPort Destination port number
	* @param p_sourcePort IN-SAP source port		* @param p_sourcePort IN-SAP source port
	* @param p_destinationPort IN-SAP destination port		* @param p_destinationPort IN-SAP destination port
	* @param p_hops N-hops value		* @param p_hops N-hops value
	@@ -366,8 +362,8 @@ module LibItsFntp_Functions {
	function f_acGenerateFntpNpduInvalidBitSet(		function f_acGenerateFntpNpduInvalidBitSet(
	in template (value) PortNumber p_sourcePort,		in template (value) PortNumber p_sourcePort,
	in template (value) PortNumber p_destinationPort,		in template (value) PortNumber p_destinationPort,
	in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress		in template (value) LLserviceAddr p_insapSourceAddress,
	in template (value) LLserviceAddr p_insapDestAddress // TODO Rename in p_insapDestAddress		in template (value) LLserviceAddr p_insapDestAddress
	) runs on ItsCalm {		) runs on ItsCalm {
	f_acTriggerEvent(		f_acTriggerEvent(
	m_generateFntpNpdu(		m_generateFntpNpdu(
	@@ -400,8 +396,8 @@ module LibItsFntp_Functions {
	function f_acGenerateFntpNpduCip(		function f_acGenerateFntpNpduCip(
	in template (value) PortNumber p_sourcePort,		in template (value) PortNumber p_sourcePort,
	in template (value) PortNumber p_destinationPort,		in template (value) PortNumber p_destinationPort,
	in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress		in template (value) LLserviceAddr p_insapSourceAddress,
	in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress		in template (value) LLserviceAddr p_insapDestAddress,
	in template (value) FNTPhopCount p_hops,		in template (value) FNTPhopCount p_hops,
	in template (value) RXcip p_rxCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough		in template (value) RXcip p_rxCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
	in template (value) TXcip p_txCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough		in template (value) TXcip p_txCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
	@@ -527,8 +523,8 @@ module LibItsFntp_Functions {
	in template (value) PortNumber p_destinationPort,		in template (value) PortNumber p_destinationPort,
	in template (value) PortNumber p_fromPort,		in template (value) PortNumber p_fromPort,
	in template (value) PortNumber p_toPort,		in template (value) PortNumber p_toPort,
	in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress		in template (value) LLserviceAddr p_insapSourceAddress,
	in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress		in template (value) LLserviceAddr p_insapDestAddress,
	in template (value) FNTPpacketCounter p_counter,		in template (value) FNTPpacketCounter p_counter,
	in template (value) FNTPhopCount p_hops,		in template (value) FNTPhopCount p_hops,
	in template (value) RXcip p_rxCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough		in template (value) RXcip p_rxCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
	@@ -635,8 +631,9 @@ module LibItsFntp_Functions {
	}		}

	/**		/**
	* @desc TODO		* @desc Get an unknown VCI to be used to transmit the packet, i.e. the peer station, for Unicast
	* @return TODO		* @return An unknown VCI to be used to transmit the packet
			* @see PX_WL_LINK_ID_UNKWNON_UC
	* @verdict Unchanged		* @verdict Unchanged
	*/		*/
	function f_getIutWlLinkIdUnknownUc() return Link_ID {		function f_getIutWlLinkIdUnknownUc() return Link_ID {

ttcn/CALM/FNTP/LibItsFntp_Templates.ttcn3

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -825,7 +825,7 @@ module LibItsFntp_Templates {
	fntpCommConfirm := {		fntpCommConfirm := {
	commRef := ?,		commRef := ?,
	servicePort := ?,		servicePort := ?,
	errStatus := 0 // FIXME Pb with TTWB to access to FNTPerrorStatus values		errStatus := 0 // FIXME Check why TTwb raises an error using FNTPerrorStatus values
	} // End of field 'fntpCommConfirm'		} // End of field 'fntpCommConfirm'
	} // End of field 'primitivesUp'		} // End of field 'primitivesUp'
	} // End of field 'nfSapPrimitives'		} // End of field 'nfSapPrimitives'
	@@ -842,7 +842,7 @@ module LibItsFntp_Templates {
	nfSapPrimitives := {		nfSapPrimitives := {
	primitivesUp := {		primitivesUp := {
	fntpCommConfirm := {		fntpCommConfirm := {
	errStatus := 1 // FIXME Pb with TTWB to access to FNTPerrorStatus values		errStatus := 1 // FIXME Check why TTwb raises an error using FNTPerrorStatus values
	} // End of field 'fntpCommConfirm'		} // End of field 'fntpCommConfirm'
	} // End of field 'primitivesUp'		} // End of field 'primitivesUp'
	} // End of field 'nfSapPrimitives'		} // End of field 'nfSapPrimitives'

ttcn/CALM/FSAP/LibItsFsap_Pixits.ttcn3

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -118,9 +118,9 @@ module LibItsFsap_Pixits {
	* @see ISO/CD 24102-5 Clause 8.2.4 Groupcast communication management		* @see ISO/CD 24102-5 Clause 8.2.4 Groupcast communication management
	*/		*/
	modulepar GCsched PX_GSCHED_ACCESS_TECH_NONIP := {		modulepar GCsched PX_GSCHED_ACCESS_TECH_NONIP := {
	medium := 128, // FIXME TTwb does not generate MedType_iso15628_		medium := 128, // FIXME Check why TTwb raises an error using MedType_iso15628_
	directivity := {		directivity := {
	mode := 0, // FIXME TTwb does not generate DirMode.fixed label		mode := 0, // FIXME Check why TTwb raises an error using DirMode_fixed_
	dirPredef := 0,		dirPredef := 0,
	fill := '0000000'B,		fill := '0000000'B,
	dirVar := { }		dirVar := { }
	@@ -134,9 +134,9 @@ module LibItsFsap_Pixits {
	* @see ISO/CD 24102-5 Clause 8.2.4 Groupcast communication management		* @see ISO/CD 24102-5 Clause 8.2.4 Groupcast communication management
	*/		*/
	modulepar GCsched PX_GSCHED_ACCESS_UNKNOWN_TECH_NONIP := {		modulepar GCsched PX_GSCHED_ACCESS_UNKNOWN_TECH_NONIP := {
	medium := 254, // FIXME TTwb does not generate MedType_can_		medium := 254, // FIXME Check why TTwb raises an error using MedType_can_
	directivity := {		directivity := {
	mode := 0, // FIXME TTwb does not generate DirMode.fixed label		mode := 0, // FIXME Check why TTwb raises an error using DirMode.fixed_
	dirPredef := 0,		dirPredef := 0,
	fill := '0000000'B,		fill := '0000000'B,
	dirVar := { }		dirVar := { }
	@@ -150,9 +150,9 @@ module LibItsFsap_Pixits {
	* @see ISO/CD 24102-5 Clause 8.2.4 Groupcast communication management		* @see ISO/CD 24102-5 Clause 8.2.4 Groupcast communication management
	*/		*/
	modulepar GCsched PX_GSCHED_NONIP := {		modulepar GCsched PX_GSCHED_NONIP := {
	medium := 1, // FIXME TTwb does not generate MedType_any_		medium := 1, // FIXME Check why TTwb raises an error using MedType_any_
	directivity := {		directivity := {
	mode := 0, // FIXME TTwb does not generate DirMode.fixed label		mode := 0, // FIXME Check why TTwb raises an error using DirMode_fixed_
	dirPredef := 0,		dirPredef := 0,
	fill := '0000000'B,		fill := '0000000'B,
	dirVar := { }		dirVar := { }

ttcn/CALM/FSAP/LibItsFsap_Templates.ttcn3

+15 −146

Original line number	Original line	Diff line number	Diff line
	@@ -188,86 +188,8 @@ module LibItsFsap_Templates {

	} // End of group cregClientMessageSend		} // End of group cregClientMessageSend

	// TODO To be removed
	// group cregClientMessageRecv {
	//
	// /**
	// * @desc Send template for GCregClient
	// * @param p_hostITS_scuId The ITS-SCU-ID of the ITS-S host where the service provider ITS-S application resides
	// * @param p_serviceId The globally unique ITS-AID of the ITS-S application
	// * @see ISO/CD 24102-5 Clause 8.3.1 Groupcast registration
	// */
	// template (value) GCregClient m_gCregClient(
	// in template (value) ITS_scuId p_hostITS_scuId,
	// in template (value) ITSaid p_serviceId
	// ) := {
	// applicationID := {
	// hostITS_scuId := p_hostITS_scuId,
	// seqNumber := 0
	// }, // End of 'applicationID' field
	// priority := 0,
	// serviceID := p_serviceId,
	// contextData := ''O
	// } // End of template m_gCregClient
	//
	// /**
	// * @desc Confirmation of the ITS-S application shall deregistration
	// * @param p_hostITS_scuId The ITS-SCU-ID of the ITS-S host where the service provider ITS-S application resides together with an ITS-S application reference number being unique at this ITS-SCU
	// * @param p_serviceId The globally unique ITS-AID of the ITS-S application
	// * @see ISO 24102-5 Clause 8.3.1
	// */
	// template (present) GCregClient mw_gCregClient(
	// in template (present) ITS_scuId p_hostITS_scuId,
	// in template (present) ITSaid p_serviceId
	// ) := {
	// applicationID := {
	// hostITS_scuId := p_hostITS_scuId,
	// seqNumber := ?
	// }, // End of 'applicationID' field
	// priority := ?,
	// serviceID := p_serviceId,
	// contextData := ?
	// } // End of template mw_gCregClient
	//
	// } // End of group cregClientMessageRecv

	} // End of group cregClientMessage		} // End of group cregClientMessage

	// TODO To be removed
	// group cderegClientMessage {
	//
	// /**
	// * @desc ITS-S application shall deregister its supported service at the groupcasting manager using the services of the groupcasting registration handler
	// * @param p_hostITS_scuId The ITS-SCU-ID of the ITS-S host where the service provider ITS-S application resides together with an ITS-S application reference number being unique at this ITS-SCU
	// * @see ISO 24102-5 Clause 8.3.3
	// */
	// template (value) GCderegClient m_gCderegClient(
	// in template (value) ITS_scuId p_hostITS_scuId
	// ) := {
	// applicationID := {
	// hostITS_scuId := p_hostITS_scuId,
	// seqNumber := 0
	// }
	// } // End of template m_gCderegClient
	//
	// /**
	// * @desc Confirmation of the ITS-S application shall deregistration
	// * @param p_hostITS_scuId The ITS-SCU-ID of the ITS-S host where the service provider ITS-S application resides together with an ITS-S application reference number being unique at this ITS-SCU
	// *
	// @see ISO 29281-2 Clause 8.1
	// @see ISO 24102-5 Clause 8.3.3
	// */
	// template GCderegClient mw_gCderegClient(
	// in template (present) ITS_scuId p_hostITS_scuId
	// ) := {
	// applicationID := {
	// hostITS_scuId := p_hostITS_scuId,
	// seqNumber := ?
	// }
	// } // End of template mw_gCderegClient
	//
	// } // End of group cderegClientMessage

	group samMessage {		group samMessage {

	group samMessageSend {		group samMessageSend {
	@@ -422,59 +344,6 @@ module LibItsFsap_Templates {
	ipContextList := { }		ipContextList := { }
	} // End of template m_ctx		} // End of template m_ctx

	// TODO To be removed
	// /**
	// * @desc Send "Service Table Context" (STC) to FAST networking protocol for the purpose of unicast delivery to the selected peer station
	// * @param p_csap Source address - see ISO 21218 Clause 5.4.2.1 & 5.4.2.2
	// * @param p_linkID Destination link ID - see ISO 21218 Clause 5.4.2.2
	// * @param p_clientID Station ID of the client ITS station
	// *
	// @see ISO 24102-5 Clause 7.2.3
	// */
	// template (value) GCctxTxCmd m_gCctxTxCmd(
	// in template (value) IN_SAPaddress p_csap,
	// in template (value) Link_ID p_linkId,
	// in template (value) StationID p_clientID
	// ) := {
	// link := {
	// csap := p_csap,
	// linkID := p_linkID
	// },
	// ctx := {
	// fmtID := 0, // FIXME Use PIXIT PX_FMTID_CTX
	// version := 0, // FIXME Use PIXIT PX_VERSIONFSAP
	// clientID := p_clientID,
	// servContextList := { },
	// ipContextList := { }
	// }
	// } // End of template m_gCctxTxCmd
	//
	// /**
	// * @desc Send "CTX" in reply to SAM
	// * @param p_csap Source address - see ISO 21218 Clause 5.4.2.1 & 5.4.2.2
	// * @param p_linkID Destination link ID - see ISO 21218 Clause 5.4.2.2
	// * @param p_clientID Station ID of the client ITS station
	// *
	// @see ISO 24102-5 Clause 7.2.3
	// */
	// template (value) CTXrxNot m_cTXrxNot(
	// in template (value) IN_SAPaddress p_csap,
	// in template (value) Link_ID p_linkId,
	// in template (value) StationID p_clientID
	// ) := {
	// link := {
	// csap := p_csap,
	// linkID := p_linkID
	// },
	// ctx := {
	// fmtID := 0, // FIXME Use PIXIT PX_FMTID_CTX
	// version := 0, // FIXME Use PIXIT PX_VERSIONFSAP
	// clientID := p_clientID,
	// servContextList := { },
	// ipContextList := { }
	// }
	// } // End of template m_cTXrxNot

	} // End of group ctxMessageSend		} // End of group ctxMessageSend

	group ctxMessageRecv {		group ctxMessageRecv {

ttcn/CALM/FSAP/LibItsFsap_TypesAndValues.ttcn3

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -43,7 +43,7 @@ module LibItsFsap_TypesAndValues {
	* @desc TA primitives for FSAP		* @desc TA primitives for FSAP
	*/		*/
	type union AcFsapPrimitive {		type union AcFsapPrimitive {
	anytype noField // FIXME To be enhanced		anytype noField // FIXME To be removed
	}		}

	/**		/**

Admin message