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

ttcn/CALM/FSAP/LibItsFsap_Pixits.ttcn3

+5 −5

ttcn/CALM/FSAP/LibItsFsap_Templates.ttcn3

+24 −30

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@ module LibItsFsap_Templates {
	};		};
	import from CALMmsap language "ASN.1:1997" {		import from CALMmsap language "ASN.1:1997" {
	type		type
	MF_Command, MF_Command_confirm,		MF_Command_request, MF_Command_confirm, MF_Command,
	MF_Request_request, MF_Request		MF_Request_request, MF_Request
	};		};
	import from CALMllsap language "ASN.1:1997" {		import from CALMllsap language "ASN.1:1997" {
	@@ -81,6 +81,27 @@ module LibItsFsap_Templates {

	} // End of group taPrimitives		} // End of group taPrimitives

			/**
			* @desc Receive template for MF-SAP service primitives
			* @param p_mfCommandRequestIn MF-COMMAND.request service primitive to receive
			*/
			template (present) FsapReq mw_fsapReq_mfCommandRequest(
			in template (present) MF_Command_request p_mfCommandRequestIn
			) := {
			mfCommandRequestIn := p_mfCommandRequestIn
			} // End of template mw_fsapReq_mfCommandRequest

			/**
			* @desc Receive template for MF-SAP service primitives
			* @param p_mfCommandConfirmIn MF-COMMAND.confirm service primitive to receive
			*/
			template (present) FsapReq mw_fsapReq_mfCommandConfirm(
			in template (present) MF_Command_confirm p_mfCommandConfirmIn
			) := {
			mfCommandConfirmIn := p_mfCommandConfirmIn
			} // End of template mw_fsapReq_mfCommandConfirm


	group cregServerMessage {		group cregServerMessage {

	group cregServerMessageSend {		group cregServerMessageSend {
	@@ -375,7 +396,7 @@ module LibItsFsap_Templates {
	* @param p_ctx CTX information		* @param p_ctx CTX information
	* @see ISO 24102-5 Clause 8.3.4 Reception of SAM and transmission of CTX		* @see ISO 24102-5 Clause 8.3.4 Reception of SAM and transmission of CTX
	*/		*/
	template (present) MF_Command mw_mfCommand_gCctxTxCmd(		template (present) MF_Command mw_mfCommand_gcCtxTxCmd(
	in template (present) CALMllsap.LLserviceAddr p_link,		in template (present) CALMllsap.LLserviceAddr p_link,
	in template (present) CTX p_ctx		in template (present) CTX p_ctx
	) modifies mw_mfCommand_any := {		) modifies mw_mfCommand_any := {
	@@ -385,7 +406,7 @@ module LibItsFsap_Templates {
	ctx := p_ctx		ctx := p_ctx
	} // End of header 'gCctxTxCmd'		} // End of header 'gCctxTxCmd'
	} // End of header 'mfCmd'		} // End of header 'mfCmd'
	} // End of template mw_mfCommand_gCctxTxCmd		} // End of template mw_mfCommand_gcCtxTxCmd

	/**		/**
	* @desc Generic receive template for CTX.		* @desc Generic receive template for CTX.
	@@ -461,33 +482,6 @@ module LibItsFsap_Templates {
	} // End of field 'servData'		} // End of field 'servData'
	} // End of template mdw_ctxServiceDataNonIP		} // End of template mdw_ctxServiceDataNonIP

	// TODO To be removed
	// /**
	// * @desc Confirmation of Service context message transmission
	// * @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 GCctxTxCmd mw_gCctxTxCmd(
	// in template (present) IN_SAPaddress p_csap,
	// in template (present) Link_ID p_linkId,
	// in template (present) 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 mw_gCctxTxCmd

	} // End of group ctxMessageRecv		} // End of group ctxMessageRecv

	} // End of group ctxMessage		} // End of group ctxMessage

ttcn/CALM/IICP/LibItsIicp_Pixits.ttcn3

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,7 @@ module LibItsIicp_Pixits {
	/**		/**
	* @desc ITS-SCU-ID of the source ITS-SCU which produces the request		* @desc ITS-SCU-ID of the source ITS-SCU which produces the request
	*/		*/
	modulepar ITS_scuId PX_SRC_ITS_SCU_ID := 0;		modulepar ITS_scuId PX_SRC_ITS_SCU_ID := 5;

	/**		/**
	* @desc ITS_SCUtype of the source ITS-SCU which produces the request		* @desc ITS_SCUtype of the source ITS-SCU which produces the request
	@@ -250,8 +250,7 @@ module LibItsIicp_Pixits {
	}		}

	/**		/**
	* @desc Send template for MF-Request.confirm service primitive		* @desc Error status in response of MF-REQUEST.request service primitive
	* @param p_errorStatus Error status in response of MF-REQUEST.request service primitive
	*/		*/
	modulepar MF_Request_confirm PX_IIC_RESPONSE := {		modulepar MF_Request_confirm PX_IIC_RESPONSE := {
	commandRef := 1,		commandRef := 1,
	@@ -262,6 +261,6 @@ module LibItsIicp_Pixits {
	} // End of field 'mfReqConf'		} // End of field 'mfReqConf'
	}, // End of field 'reqConfirm'		}, // End of field 'reqConfirm'
	errStatus := 0		errStatus := 0
	} // End of template m_mfRequestConfirm		} // End of modulepar PX_IIC_RESPONSE

	} // End of module LibItsIicp_Pixits		} // End of module LibItsIicp_Pixits

ttcn/CALM/IICP/LibItsIicp_Templates.ttcn3

+24 −24

Original line number	Original line	Diff line number	Diff line
	@@ -108,7 +108,7 @@ module LibItsIicp_Templates {
	* @param p_iICrequestTX IICrequestTX description		* @param p_iICrequestTX IICrequestTX description
	* @see ISO 24102-4 Clause 8.2.1 IIC-Request PDU		* @see ISO 24102-4 Clause 8.2.1 IIC-Request PDU
	*/		*/
	template MF_Command_request mw_mfCommandRequest_iICrequestTX(		template (present) MF_Command_request mw_mfCommandRequest_iICrequestTX(
	in template (present) IICrequestTX p_iICrequestTX		in template (present) IICrequestTX p_iICrequestTX
	) modifies mw_mfCommandRequest_any := {		) modifies mw_mfCommandRequest_any := {
	command_param := {		command_param := {
	@@ -1330,7 +1330,7 @@ module LibItsIicp_Templates {
	* @param p_mf_rcmd The MF-COMMAND.request message		* @param p_mf_rcmd The MF-COMMAND.request message
	* @see ISO 24102-4 Clause 8.2.1 IIC-Request PDU		* @see ISO 24102-4 Clause 8.2.1 IIC-Request PDU
	*/		*/
	template IICrequestTX mdw_iicRequestTx_mfCommandRequest(		template (present) IICrequestTX mdw_iicRequestTx_mfCommandRequest(
	in template (present) ITS_scuId p_sourceITS_scuId,		in template (present) ITS_scuId p_sourceITS_scuId,
	in template (present) ITS_scuId p_destinationITS_scuId,		in template (present) ITS_scuId p_destinationITS_scuId,
	in template (present) MF_Command_request p_mf_rcmd		in template (present) MF_Command_request p_mf_rcmd
	@@ -1344,27 +1344,6 @@ module LibItsIicp_Templates {
	} // End of 'pduRequest' field		} // End of 'pduRequest' field
	} // End of template mdw_iicRequestTx_mfCommandRequest		} // End of template mdw_iicRequestTx_mfCommandRequest

	/**
	* @desc Receive template for IICrequestTX/remote message
	* @param p_sourceITS_scuId The source ITS-SCU-ID
	* @param p_destinationITS_scuId The destination ITS-SCU-ID
	* @param p_mf_rreq The MF-REQUEST.request message
	* @see ISO 24102-4 Clause 8.2.1 IIC-Request PDU
	*/
	template IICrequestTX mdw_iicRequestTx_mfRequestRequest(
	in template (present) ITS_scuId p_sourceITS_scuId,
	in template (present) ITS_scuId p_destinationITS_scuId,
	in template (present) MF_Request_request p_mf_rreq
	) modifies mw_iicRequestTx_any := {
	sourceITS_scuId := p_sourceITS_scuId,
	destinationITS_scuId := p_destinationITS_scuId,
	pduRequest := {
	requests := {
	mf_rreq := p_mf_rreq
	} // End of 'requests' field
	} // End of 'pduRequest' field
	} // End of template mdw_iicRequestTx_mfRequestRequest

	/**		/**
	* @desc Receive template for IICresponseTX message with success status		* @desc Receive template for IICresponseTX message with success status
	* @param p_sourceITS_scuId The source ITS-SCU-ID		* @param p_sourceITS_scuId The source ITS-SCU-ID
	@@ -1372,7 +1351,7 @@ module LibItsIicp_Templates {
	* @param p_mf_rcmd The MF-COMMAND.confirm message		* @param p_mf_rcmd The MF-COMMAND.confirm message
	* @see ISO 24102-4 Clause 8.2.2 IIC-Response PDU		* @see ISO 24102-4 Clause 8.2.2 IIC-Response PDU
	*/		*/
	template IICresponseTX mdw_iicResponseTx_mfCommandRequest(		template IICresponseTX mdw_iicResponseTx_mfCommandRequest( // FIXME Rename into mdw_iicResponseTx_mfCommandConfirm
	in template (present) ITS_scuId p_sourceITS_scuId,		in template (present) ITS_scuId p_sourceITS_scuId,
	in template (present) ITS_scuId p_destinationITS_scuId,		in template (present) ITS_scuId p_destinationITS_scuId,
	in template (present) MF_Command_confirm p_mf_rcmd		in template (present) MF_Command_confirm p_mf_rcmd
	@@ -1420,6 +1399,27 @@ module LibItsIicp_Templates {

	group mfRequestRecv {		group mfRequestRecv {

			/**
			* @desc Receive template for IICrequestTX/remote message
			* @param p_sourceITS_scuId The source ITS-SCU-ID
			* @param p_destinationITS_scuId The destination ITS-SCU-ID
			* @param p_mf_rreq The MF-REQUEST.request message
			* @see ISO 24102-4 Clause 8.2.1 IIC-Request PDU
			*/
			template IICrequestTX mdw_iicRequestTx_mfRequestRequest(
			in template (present) ITS_scuId p_sourceITS_scuId,
			in template (present) ITS_scuId p_destinationITS_scuId,
			in template (present) MF_Request_request p_mf_rreq
			) modifies mw_iicRequestTx_any := {
			sourceITS_scuId := p_sourceITS_scuId,
			destinationITS_scuId := p_destinationITS_scuId,
			pduRequest := {
			requests := {
			mf_rreq := p_mf_rreq
			} // End of 'requests' field
			} // End of 'pduRequest' field
			} // End of template mdw_iicRequestTx_mfRequestRequest

	/**		/**
	* @desc Receive template for IICresponseTX message with success status		* @desc Receive template for IICresponseTX message with success status
	* @param p_sourceITS_scuId The source ITS-SCU-ID		* @param p_sourceITS_scuId The source ITS-SCU-ID

ttcn/CALM/LibItsCalm_Interface.ttcn

+34 −9

Original line number	Original line	Diff line number	Diff line
	@@ -58,8 +58,6 @@ module LibItsCalm_Interface {

	group interfaceComponents {		group interfaceComponents {



	/**		/**
	* @desc Test component for ITS Management layer		* @desc Test component for ITS Management layer
	*/		*/
	@@ -69,8 +67,9 @@ module LibItsCalm_Interface {
	port AdapterControlPort acPort;		port AdapterControlPort acPort;

	// MGT1 ports - Used to send remote command to/from		// MGT1 ports - Used to send remote command to/from
	port IicpPort iicpPort;		port IicpPort iicpPort; // ITS station-internal management communications protocol
	// MGT2 ports - Used to send command to/from through SAP interfaces		// MGT2 ports - Used to send command to/from through SAP interfaces
			port FsapPort fsapPort; // Fast Service Advertisement Protocol
	port MgtMfSapPort mgtMfSapPort;		port MgtMfSapPort mgtMfSapPort;
	port MgtMnSapPort mgtMnSapPort;		port MgtMnSapPort mgtMnSapPort;

	@@ -90,8 +89,8 @@ module LibItsCalm_Interface {


	// NT3 ports		// NT3 ports
	port FntpPort fntpPort;		port FntpPort fntpPort; // Fast Network & Transport layer Protocol
	port MgtMnSapPort cfPort;		port MgtMnSapPort cfPort; // FNTP configuration port

	// timers		// timers

	@@ -126,6 +125,16 @@ module LibItsCalm_Interface {

	group mgt2Ports {		group mgt2Ports {

			/**
			* @desc MGT2 Fsap Port
			*/
			type port FsapPort message {
			in
			FsapReq;
			out
			FsapResp;
			} // End of port FsapPort

	/**		/**
	* @desc MGT2 Management Port - MF-SAP service primitives		* @desc MGT2 Management Port - MF-SAP service primitives
	*/		*/
	@@ -202,6 +211,22 @@ module LibItsCalm_Interface {
	*/		*/
	group mgt2Primitives {		group mgt2Primitives {

			/**
			* @desc TODO
			*/
			type union FsapReq {
			MF_Command_request mfCommandRequestIn,
			MF_Command_confirm mfCommandConfirmIn
			}

			/**
			* @desc TODO
			*/
			type union FsapResp {
			MF_Request_request mfRequestRequestOut,
			MF_Command_confirm mfCommandConfirmOut
			}

	/**		/**
	* @desc MF-SAP service primitives		* @desc MF-SAP service primitives
	* @see ISO/CD 24102-3 Clause 8.1		* @see ISO/CD 24102-3 Clause 8.1

Admin message