Aligning code with ETSI TS 102 797-2v0.0.8 FSAP TSS&TP (COM/BI not done yet) (6eacc7fa) · Commits · TTCN-3 Libraries / LibIts

ttcn/CALM/FNTP/LibItsFntp_Templates.ttcn3

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -47,7 +47,7 @@ module LibItsFntp_Templates {

	/**		/**
	* @desc Send template for IN-SAP source and destination address		* @desc Send template for IN-SAP source and destination address
	* @param p_linkId Link ID		* @param p_linkId Link identifier of the CI
	* @see ISO/CD 21218 - Clause 8.2.2		* @see ISO/CD 21218 - Clause 8.2.2
	*/		*/
	template (value) LLserviceAddr m_llServiceAddr(		template (value) LLserviceAddr m_llServiceAddr(
	@@ -172,7 +172,7 @@ module LibItsFntp_Templates {

	/**		/**
	* @desc Receive template for IN-SAP source and destination address		* @desc Receive template for IN-SAP source and destination address
	* @param p_linkId Link Id		* @param p_linkId Link identifier of the CI
	* @see ISO/CD 21218 - Clause 8.2.2		* @see ISO/CD 21218 - Clause 8.2.2
	*/		*/
	template LLserviceAddr mw_llServiceAddr(		template LLserviceAddr mw_llServiceAddr(

ttcn/CALM/FSAP/LibItsFsap_Pics.ttcn3

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -38,8 +38,6 @@ module LibItsFsap_Pics {
	*/		*/
	modulepar boolean PICS_SIP_N_CTX := false;		modulepar boolean PICS_SIP_N_CTX := false;

	// TODO To be continued

	/**		/**
	* @desc Is IUT an host only?		* @desc Is IUT an host only?
	* @see ETSI TS 102 797-1 v0.0.8 C.5/1		* @see ETSI TS 102 797-1 v0.0.8 C.5/1
	@@ -66,7 +64,6 @@ module LibItsFsap_Pics {

	/**		/**
	* @desc Duration of SAM retransmit timer [ms]		* @desc Duration of SAM retransmit timer [ms]
	* @see TODO
	*/		*/
	modulepar integer PICS_SAM_RETRANSMIT_TIMER := 3000;		modulepar integer PICS_SAM_RETRANSMIT_TIMER := 3000;

ttcn/CALM/IICP/LibItsIicp_Functions.ttcn3

+42 −14

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,8 @@ module LibItsIicp_Functions {
	};		};
	import from CALMmsap language "ASN.1:1997" {		import from CALMmsap language "ASN.1:1997" {
	type		type
	MF_Command, MN_Command, MI_Command		MF_Command, MN_Command, MI_Command,
			MF_Request, MN_Request, MI_Request
	};		};
	import from CALMmanagement language "ASN.1:1997" {		import from CALMmanagement language "ASN.1:1997" {
	type		type
	@@ -306,7 +307,7 @@ module LibItsIicp_Functions {
	* @return The active VCI link identifier		* @return The active VCI link identifier
	* @see PX_ACTIVE_VCI_LINK_ID		* @see PX_ACTIVE_VCI_LINK_ID
	*/		*/
	function f_getIutCIlinkId() return Link_ID {		function f_getIutCiLinkId() return Link_ID {
	return PX_ACTIVE_VCI_LINK_ID;		return PX_ACTIVE_VCI_LINK_ID;
	}		}

	@@ -350,8 +351,8 @@ module LibItsIicp_Functions {
	}		}

	/**		/**
	* @desc TODO		* @desc Get the MI-Command value used for remote command
	* @return TODO		* @return The MI-Command value used for remote command
	* @see PX_MI_RCMD_STATECINOTIFY		* @see PX_MI_RCMD_STATECINOTIFY
	*/		*/
	function f_getIutRCmdForMiCommand() return MI_Command {		function f_getIutRCmdForMiCommand() return MI_Command {
	@@ -359,8 +360,17 @@ module LibItsIicp_Functions {
	}		}

	/**		/**
	* @desc TODO		* @desc Get the MI-Request value used for remote command
	* @return TODO		* @return The MI-Request value used for remote command
			* @see PX_MI_RCMD_REGTYPE
			*/
			function f_getIutRCmdForMiRequest() return MI_Request {
			return PX_MI_RCMD_REGTYPE;
			}

			/**
			* @desc Get the MM-Command value used for remote command
			* @return The MM-Command value used for remote command
	* @see PX_MN_RCMD_STATECINOTIFY		* @see PX_MN_RCMD_STATECINOTIFY
	*/		*/
	function f_getIutRCmdForMnCommand() return MN_Command {		function f_getIutRCmdForMnCommand() return MN_Command {
	@@ -368,8 +378,17 @@ module LibItsIicp_Functions {
	}		}

	/**		/**
	* @desc TODO		* @desc Get the MM-Request value used for remote command
	* @return TODO		* @return The MN-Request value used for remote command
			* @see PX_MN_RCMD_FWYSETNOTIFY
			*/
			function f_getIutRCmdForMnRequest() return MN_Request {
			return PX_MN_RCMD_FWYSETNOTIFY;
			}

			/**
			* @desc Get the MF-Command value used for remote command
			* @return The MF-Command value used for remote command
	* @see PX_MF_RCMD_STATECINOTIFY		* @see PX_MF_RCMD_STATECINOTIFY
	*/		*/
	function f_getIutRCmdForMfCommand() return MF_Command {		function f_getIutRCmdForMfCommand() return MF_Command {
	@@ -377,8 +396,17 @@ module LibItsIicp_Functions {
	}		}

	/**		/**
	* @desc TODO		* @desc Get the MF-Request value used for remote command
	* @return TODO		* @return The MF-Request value used for remote command
			* @see PX_MF_RCMD_LDM_REGISTER
			*/
			function f_getIutRCmdForMfRequest() return MF_Request {
			return PX_MF_RCMD_LDM_REGISTER;
			}

			/**
			* @desc Get the List of reference number of parameter to be monitored
			* @return The List of reference number of parameter to be monitored
	* @see PX_MI_IPARAMNOLIST		* @see PX_MI_IPARAMNOLIST
	*/		*/
	function f_getIutIParamNoList() return IParamNoList {		function f_getIutIParamNoList() return IParamNoList {
	@@ -386,8 +414,8 @@ module LibItsIicp_Functions {
	}		}

	/**		/**
	* @desc TODO		* @desc Get the list of error status for each parameter to be monitored
	* @return TODO		* @return The list of error status for each parameter to be monitored
	* @see PX_MI_IPARAMNOLIST		* @see PX_MI_IPARAMNOLIST
	*/		*/
	function f_getIutIParamList() return IParamList {		function f_getIutIParamList() return IParamList {
	@@ -395,8 +423,8 @@ module LibItsIicp_Functions {
	}		}

	/**		/**
	* @desc TODO		* @desc Get the list of error status for each parameter to be monitored
	* @return TODO		* @return The list of error status for each parameter to be monitored
	* @see PX_MI_ERRORSLIST		* @see PX_MI_ERRORSLIST
	*/		*/
	function f_getIutErrorsList() return ErrorsList {		function f_getIutErrorsList() return ErrorsList {

ttcn/CALM/IICP/LibItsIicp_Pics.ttcn3

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,6 @@ module LibItsIicp_Pics {
	*/		*/
	modulepar boolean PICS_ITS_S_INW := false;		modulepar boolean PICS_ITS_S_INW := false;

	// FIXME Upgrade Draft ETSI TS 102 797-1 V<0.0.7> (2011-12) documents
	/**		/**
	* @desc Is IISC available?		* @desc Is IISC available?
	* @see ISO/WD 24102-4		* @see ISO/WD 24102-4

ttcn/CALM/IICP/LibItsIicp_Pixits.ttcn3

+69 −3

Original line number	Original line	Diff line number	Diff line
	@@ -14,11 +14,12 @@ module LibItsIicp_Pixits {
	// LibIts		// LibIts
	import from CALMllsap language "ASN.1:1997" {		import from CALMllsap language "ASN.1:1997" {
	type		type
	Link_ID, CIstatus		Link_ID, CIstatus, MedType
	};		};
	import from CALMmsap language "ASN.1:1997" {		import from CALMmsap language "ASN.1:1997" {
	type		type
	MF_Command, MN_Command, MI_Command		MF_Command, MN_Command, MI_Command,
			MF_Request, MN_Request, MI_Request
	};		};
	import from CALMmanagement language "ASN.1:1997" {		import from CALMmanagement language "ASN.1:1997" {
	type		type
	@@ -119,6 +120,57 @@ module LibItsIicp_Pixits {
	}		}
	}		}

			/**
			* @desc MN-Request value used for IICP/COM/xx TPs
			* NOTE that this PIXIT is used just for compiling purposes. The real PIXIT shall be written according to the IUT capabilities
			*/
			modulepar MN_Request PX_MN_RCMD_FWYSETNOTIFY := {
			fill := '00000'B,
			mnReq := {
			fWTsetNot := {
			fill := '0000000'B,
			setNot := {
			fast := {
			reference := 0,
			remotePort := {
			portShort := 0
			},
			linkID := {
			remoteCIID := '0000000000000000'O,
			localCIID := '0000000000000000'O
			},
			ciStatus := 0,
			linkPort := {
			portShort := 0
			},
			serviceInfo := {
			servicePort := {
			portShort := 0
			},
			hostITSscu := 0,
			servicePriority := 0
			},
			priority := 0,
			timeout_ := 0
			}
			}
			}
			}
			}

			/**
			* @desc MI-Request value used for IICP/COM/xx TPs
			* NOTE that this PIXIT is used just for compiling purposes. The real PIXIT shall be written according to the IUT capabilities
			*/
			modulepar MI_Request PX_MI_RCMD_REGTYPE := {
			fill := '0000'B,
			miReq := {
			regReq := {
			medType := 10 // FIXME Check why TTWB does not accespt MedType_iso17515_
			}
			}
			}

	/**		/**
	* @desc MF-Command value used for IICP/COM/xx TPs		* @desc MF-Command value used for IICP/COM/xx TPs
	* NOTE that this PIXIT is used just for compiling purposes. The real PIXIT shall be written according to the IUT capabilities		* NOTE that this PIXIT is used just for compiling purposes. The real PIXIT shall be written according to the IUT capabilities
	@@ -136,6 +188,20 @@ module LibItsIicp_Pixits {
	}		}
	}		}

			/**
			* @desc MF-Command value used for IICP/COM/xx TPs
			* NOTE that this PIXIT is used just for compiling purposes. The real PIXIT shall be written according to the IUT capabilities
			*/
			modulepar MF_Request PX_MF_RCMD_LDM_REGISTER := {
			fill := PX_PDU_REQUEST_FILL_FIELD_VALUE,
			mfReq := {
			lDMregister := {
			iTS_scuId := 0,
			reference := ''O
			}
			}
			}

	/**		/**
	* @desc List of reference number of parameter to be monitored		* @desc List of reference number of parameter to be monitored
	* NOTE that this PIXIT is used just for compiling purposes. The real PIXIT shall be written according to the IUT capabilities		* NOTE that this PIXIT is used just for compiling purposes. The real PIXIT shall be written according to the IUT capabilities
	@@ -147,7 +213,7 @@ module LibItsIicp_Pixits {
	}		}

	/**		/**
	* @desc List of reference parameter to be monitored		* @desc List of error status for each parameter to be monitored
	* NOTE that this PIXIT is used just for compiling purposes. The real PIXIT shall be written according to the IUT capabilities		* NOTE that this PIXIT is used just for compiling purposes. The real PIXIT shall be written according to the IUT capabilities
	* @see ISO 21218 Table A.1 — I parameters		* @see ISO 21218 Table A.1 — I parameters
	*/		*/

Admin message