Merge from trunk (933e04ad) · Commits · TTCN-3 Libraries / LibIts

FNTP/LibItsFntp_Templates.ttcn3

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -91,10 +91,16 @@ module LibItsFntp_Templates {
	} // End of template m_fntpImPrimitiveReq		} // End of template m_fntpImPrimitiveReq

	/**		/**
	* @desc The IN-SAP address for FNTP		* @desc Send template for IN-SAP address
	* @see ISO/CD 21218 - Table 5 — Addresses for the Link Service Access Point (IN-SAP)		* @see ISO/CD 21218 - Table 5 — Addresses for the Link Service Access Point (IN-SAP)
	*/		*/
	template (value) IN_SAPaddress mw_fntpInSapAddress_src_command := 186; //oct2int('BA'O);		template (value) IN_SAPaddress m_fntpInSapAddress_src_command := 186; //oct2int('BA'O);

			/**
			* @desc Receive template for IN-SAP address
			* @see ISO/CD 21218 - Table 5 — Addresses for the Link Service Access Point (IN-SAP)
			*/
			template (value) IN_SAPaddress mw_fntpInSapAddress_src_command := m_fntpInSapAddress_src_command;

	/**		/**
	* @desc Receive template for IN-UNITDATA.request SAP primitive		* @desc Receive template for IN-UNITDATA.request SAP primitive

FSAP/LibItsFsap_Functions.ttcn3

+88 −11

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,9 @@ module LibItsFsap_Functions {
	};		};

	// LibIts		// LibIts
			import from CITSapplMgmtApplReg language "ASN.1:1997" {
			type ITSaid
			};
	import from CALMllsap language "ASN.1:1997" {		import from CALMllsap language "ASN.1:1997" {
	type EUI64		type EUI64
	};		};
	@@ -27,7 +30,7 @@ module LibItsFsap_Functions {
	};		};
	import from CALMfsap language "ASN.1:1997" {		import from CALMfsap language "ASN.1:1997" {
	type		type
	GCschedule, ServiceDataReg		GCschedule, ServiceDataReg, ServiceList
	};		};
	import from CALMmsap language "ASN.1:1997" {		import from CALMmsap language "ASN.1:1997" {
	type CommandRef		type CommandRef
	@@ -248,7 +251,7 @@ module LibItsFsap_Functions {
	}		}

	/**		/**
	* @desc Get the ITS application object ID (ITS-AID)		* @desc Get the ITS application object ID (ITS-AID) for GCregServer MF-REQUEST
	* @return The ITS application object ID (ITS-AID)		* @return The ITS application object ID (ITS-AID)
	* @see PX_APPLICATION_ID		* @see PX_APPLICATION_ID
	*/		*/
	@@ -257,8 +260,35 @@ module LibItsFsap_Functions {
	}		}

	/**		/**
	* @desc Get the client identifier value		* @desc Get the ITS application object ID (ITS-AID) for GCregClient MF-REQUEST
			* @return The ITS application object ID (ITS-AID)
			* @see PX_CLIENT_APPLICATION_ID
			*/
			function f_getIutClientApplicationID() return ApplicationID {
			return PX_CLIENT_APPLICATION_ID;
			}

			/**
			* @desc Get the globally unique ITS-AID of the ITS-S application
			* @return The globally unique ITS-AID of the ITS-S application
			* @see PX_ITS_AID
			*/
			function f_getIutServiceID() return ITSaid {
			return PX_ITS_AID;
			}

			/**
			* @desc Get the server identifier value
	* @return The client identifier value		* @return The client identifier value
			* @see PX_SERVER_ID
			*/
			function f_getIutServerID() return StationID {
			return PX_SERVER_ID;
			}

			/**
			* @desc Get the service client ITS station value
			* @return The service client ITS station value
	* @see PX_CLIENT_ID		* @see PX_CLIENT_ID
	*/		*/
	function f_getIutClientID() return StationID {		function f_getIutClientID() return StationID {
	@@ -294,30 +324,77 @@ module LibItsFsap_Functions {
	}		}

	/**		/**
	* @desc TODO and without request to change communication channel for session phase and without request to change communication channel for session phase		* @desc Get advertisement details with no session phase
	* @return TODO		* @return The advertisement details
			* @see PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE
	*/		*/
	function f_getIutServiceDataRegWithNoSession() return ServiceDataReg {		function f_getIutServiceDataRegWithNoSession() return ServiceDataReg {
	return PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE;		return PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE;
	}		}

	/**		/**
	* @desc TODO and with a specific access technology and with request to change communication channel for session phase		* @desc Get advertisement details with a specific access technology and with request to change communication channel for session phase
	* @return TODO		* @return The advertisement details
	* @see PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANGE_CHANNEL		* @see PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANNEL_CHANGE
	*/		*/
	function f_getIutServiceDataRegWithNoSessionAndChannelChange() return ServiceDataReg {		function f_getIutServiceDataRegWithNoSessionAndChannelChange() return ServiceDataReg {
	return PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANGE_CHANNEL;		return PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANNEL_CHANGE;
	}		}

	/**		/**
	* @desc TODO and without request to change communication channel for session phase and without request to change communication channel for session phase		* @desc Get advertisement details without request to change communication channel for session phase and without request to change communication channel for session phase
	* @return TODO		* @return The advertisement details
			* @see PX_SERVICE_DATA_REG_WITH_SESSION_PHASE
	*/		*/
	function f_getIutServiceDataRegWithSession() return ServiceDataReg {		function f_getIutServiceDataRegWithSession() return ServiceDataReg {
	return PX_SERVICE_DATA_REG_WITH_SESSION_PHASE;		return PX_SERVICE_DATA_REG_WITH_SESSION_PHASE;
	}		}

			/**
			* @desc Get non-IP information on services offered, with no session phase and no channel change requested
			* @return The non-IP information on services offered
			* @see PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL
			*/
			function f_getIutServicelistWithNoSessionAndNoChannelChange() return ServiceList {
			return { PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL };
			}

			/**
			* @desc Get non-IP information on services offered, with session phase and no channel change requested
			* @return The non-IP information on services offered
			* @see PX_NO_IP_SERVICE_WITH_SESSION_AND_NO_CHANGE_CHANNEL
			*/
			function f_getIutServicelistWithSessionAndNoChangeChannel() return ServiceList {
			return { PX_NO_IP_SERVICE_WITH_SESSION_AND_NO_CHANGE_CHANNEL };
			}

			/**
			* @desc Get non-IP information on services offered, with no session phase and channel change requested
			* @return The non-IP information on services offered
			* @see PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE
			*/
			function f_getIutServicelistWithSessionAndChangeChannel() return ServiceList {
			return { PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE };
			}

			/**
			* @desc Get non-IP information on an unknown services offered, with session phase and no channel change requested
			* @return The non-IP information on services offered
			* @see PX_NO_IP_SERVICE_WITH_UNKNOWN_SERVICE_ID
			*/
			function f_getIutServicelistWithUnknownServiceID() return ServiceList {
			return { PX_NO_IP_SERVICE_WITH_UNKNOWN_SERVICE_ID };
			}

			/**
			* @desc Get non-IP information on services offered, with session phase and channel change requested on an unknown channel
			* @return The non-IP information on services offered
			* @see PX_NO_IP_SERVICE_WITH_UNKNOWN_CHANNEL
			*/
			function f_getIutServicelistWithUnknownChannel() return ServiceList {
			return { PX_NO_IP_SERVICE_WITH_UNKNOWN_CHANNEL };
			}

	} // End of group iutFunctions		} // End of group iutFunctions

	group fsapAltsteps {		group fsapAltsteps {

FSAP/LibItsFsap_Pics.ttcn3

+10 −11

Original line number	Original line	Diff line number	Diff line
	@@ -10,31 +10,31 @@ module LibItsFsap_Pics {

	/**		/**
	* @desc Is FSAP Service Provider role ?		* @desc Is FSAP Service Provider role ?
	* @see ETSI TS 102 797-1 v0.0.0 C.1/1		* @see ETSI TS 102 797-1 v0.0.8 C.1/1
	*/		*/
	modulepar boolean PICS_FSAP_ROLE_SP := false;		modulepar boolean PICS_FSAP_ROLE_SP := false;

	/**		/**
	* @desc Is FSAP Service User role ?		* @desc Is FSAP Service User role ?
	* @see ETSI TS 102 797-1 v0.0.0 C.1/2		* @see ETSI TS 102 797-1 v0.0.8 C.1/2
	*/		*/
	modulepar boolean PICS_FSAP_ROLE_SU := false;		modulepar boolean PICS_FSAP_ROLE_SU := false;

	/**		/**
	* @desc Is FSAP Service operation phase ?		* @desc Is FSAP Service operation phase ?
	* @see ETSI TS 102 797-1 v0.0.0 C.2/1		* @see ETSI TS 102 797-1 v0.0.8 C.2/1
	*/		*/
	modulepar boolean PICS_SOP := false;		modulepar boolean PICS_SOP := false;

	/**		/**
	* @desc Is supported SIP with support of CTX message mode ?		* @desc Is supported SIP with support of CTX message mode ?
	* @see ETSI TS 102 797-1 v0.0.0 C.3/1		* @see ETSI TS 102 797-1 v0.0.8 C.3/1
	*/		*/
	modulepar boolean PICS_SIP_W_CTX := false;		modulepar boolean PICS_SIP_W_CTX := false;

	/**		/**
	* @desc Is supported SIP without support of CTX message mode ?		* @desc Is supported SIP without support of CTX message mode ?
	* @see ETSI TS 102 797-1 v0.0.0 C.3/2		* @see ETSI TS 102 797-1 v0.0.8 C.3/2
	*/		*/
	modulepar boolean PICS_SIP_N_CTX := false;		modulepar boolean PICS_SIP_N_CTX := false;

	@@ -42,25 +42,25 @@ module LibItsFsap_Pics {

	/**		/**
	* @desc Is IUT an host only?		* @desc Is IUT an host only?
	* @see ETSI TS 102 797-1 v0.0.0 C.5/1		* @see ETSI TS 102 797-1 v0.0.8 C.5/1
	*/		*/
	modulepar boolean PICS_ROLE_RONLY := false;		modulepar boolean PICS_ROLE_RONLY := false;

	/**		/**
	* @desc Is IUT a router only?		* @desc Is IUT a router only?
	* @see ETSI TS 102 797-1 v0.0.0 C.5/2		* @see ETSI TS 102 797-1 v0.0.8 C.5/2
	*/		*/
	modulepar boolean PICS_ROLE_HONLY := false;		modulepar boolean PICS_ROLE_HONLY := false;

	/**		/**
	* @desc Is IUT both host and router?		* @desc Is IUT both host and router?
	* @see ETSI TS 102 797-1 v0.0.0 C.5/3		* @see ETSI TS 102 797-1 v0.0.8 C.5/3
	*/		*/
	modulepar boolean PICS_ROLE_RH := false;		modulepar boolean PICS_ROLE_RH := false;

	/**		/**
	* @desc Does the architecture implement ITS station-internal network?		* @desc Does the architecture implement ITS station-internal network?
	* @see ETSI TS 102 797-1 v0.0.0 C.6/1		* @see ETSI TS 102 797-1 v0.0.8 C.6/1
	*/		*/
	modulepar boolean PICS_ITS_S_INW := false;		modulepar boolean PICS_ITS_S_INW := false;

	@@ -70,10 +70,9 @@ module LibItsFsap_Pics {
	*/		*/
	modulepar integer PICS_SAM_RETRANSMIT_TIMER := 3000;		modulepar integer PICS_SAM_RETRANSMIT_TIMER := 3000;

	// 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 24102-4
	*/		*/
	modulepar boolean PICS_IICP_MGM := true;		modulepar boolean PICS_IICP_MGM := true;

FSAP/LibItsFsap_Pixits.ttcn3

+123 −14

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,7 @@ module LibItsFsap_Pixits {
	type		type
	FmtID, VersionFSAP,		FmtID, VersionFSAP,
	ApplicationID,		ApplicationID,
	GCsched, ServiceDataReg		GCsched, NonipService, ServiceDataReg
	};		};
	import from CALMfntp language "ASN.1:1997" {		import from CALMfntp language "ASN.1:1997" {
	type		type
	@@ -49,31 +49,69 @@ module LibItsFsap_Pixits {
	modulepar EUI64 PX_SRC_REMOTE_CIID := '0000000000000000'O;		modulepar EUI64 PX_SRC_REMOTE_CIID := '0000000000000000'O;

	/**		/**
	* @desc TODO		* @desc Priority of the ITS-S application
	*/		*/
	modulepar UserPriority PX_USER_PRIORITY := 0; // TODO Check if it is used somewhere		modulepar UserPriority PX_USER_PRIORITY := 0;

	} // End of group local		} // End of group local

	group CRegServer {		group cRegServer {

			/**
			* @desc The service provider ITS station,
			*/
			modulepar StationID PX_SERVER_ID := '00000000'O;

			/**
			* @desc The service client ITS station,
			*/
	modulepar StationID PX_CLIENT_ID := '00000000'O;		modulepar StationID PX_CLIENT_ID := '00000000'O;

			/**
			* @desc The globally unique ITS-AID of the ITS-S application
			*/
	modulepar ITSaid PX_ITS_AID := { content := 0 }		modulepar ITSaid PX_ITS_AID := { content := 0 }

			/**
			* @desc An unknown ITS-AID of the ITS-S application
			*/
			modulepar ITSaid PX_UNKNOWN_ITS_AID := { content := 126 }

			/**
			* @desc A session port value
			*/
	modulepar PortNumber PX_SESSION_PORT := { portLong := 1234 }		modulepar PortNumber PX_SESSION_PORT := { portLong := 1234 }

			/**
			* @desc An unspecified session port value
			*/
	modulepar PortNumber PX_NO_SESSION_PORT := { portLong := c_portNon }		modulepar PortNumber PX_NO_SESSION_PORT := { portLong := c_portNon }

	/**		/**
	* @desc ITS application object ID (ITS-AID)		* @desc An unnknown session port value
			*/
			modulepar PortNumber PX_UNKNOWN_SESSION_PORT := { portLong := 1234 }

			/**
			* @desc ITS application object ID (ITS-AID) for GCregServer MF-REQUEST
	* @see ISO EN 17419		* @see ISO EN 17419
			* @see ISO 24102-5 Clause 8.3.1 Groupcast registration
	*/		*/
	modulepar ApplicationID PX_APPLICATION_ID := {		modulepar ApplicationID PX_APPLICATION_ID := {
	hostITS_scuId := 1,		hostITS_scuId := 1,
	seqNumber := 1		seqNumber := 1
	}		}

			/**
			* @desc ITS application object ID (ITS-AID) for GCregClient MF-REQUEST
			* @see ISO EN 17419
			* @see ISO 24102-5 Clause 8.3.1 Groupcast registration
			*/
			modulepar ApplicationID PX_CLIENT_APPLICATION_ID := {
			hostITS_scuId := 2,
			seqNumber := 2
			}

	/**		/**
	* @desc Scheduling information for registration / registration request in order to select the proper VCI in the ITS-station for communication		* @desc Scheduling information for registration / registration request in order to select the proper VCI in the ITS-station for communication
	* 'medium' field indicates a request of specific access technology		* 'medium' field indicates a request of specific access technology
	@@ -123,7 +161,7 @@ module LibItsFsap_Pixits {
	} // End of modulepar PX_GSCHED_NONIP		} // End of modulepar PX_GSCHED_NONIP

	/**		/**
	* @desc TODO		* @desc Receive template for advertisement details with no session phase
	*/		*/
	modulepar ServiceDataReg PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE := {		modulepar ServiceDataReg PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE := {
	fill := '0000000'B,		fill := '0000000'B,
	@@ -138,7 +176,7 @@ module LibItsFsap_Pixits {
	} // End of modulepar PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE		} // End of modulepar PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE

	/**		/**
	* @desc TODO		* @desc Receive template for advertisement details with session phase
	*/		*/
	modulepar ServiceDataReg PX_SERVICE_DATA_REG_WITH_SESSION_PHASE := {		modulepar ServiceDataReg PX_SERVICE_DATA_REG_WITH_SESSION_PHASE := {
	fill := '0000000'B,		fill := '0000000'B,
	@@ -153,9 +191,9 @@ module LibItsFsap_Pixits {
	} // End of modulepar PX_SERVICE_DATA_REG_WITH_SESSION_PHASE		} // End of modulepar PX_SERVICE_DATA_REG_WITH_SESSION_PHASE

	/**		/**
	* @desc TODO		* @desc Receive template for advertisement details with session phase and channel change requested
	*/		*/
	modulepar ServiceDataReg PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANGE_CHANNEL := {		modulepar ServiceDataReg PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANNEL_CHANGE := {
	fill := '0000000'B,		fill := '0000000'B,
	datareg := {		datareg := {
	nonipData := {		nonipData := {
	@@ -165,19 +203,90 @@ module LibItsFsap_Pixits {
	providerPort := PX_SESSION_PORT		providerPort := PX_SESSION_PORT
	} // End of field 'nonipData'		} // End of field 'nonipData'
	} // End of field 'datareg'		} // End of field 'datareg'
	} // End of modulepar PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANGE_CHANNEL		} // End of modulepar PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANNEL_CHANGE

			} // End of group cRegServer

			group sam_ {

			/**
			* @desc Non-IP information on services offered, with no session phase and no channel change requested
			* @see ISO 24102-5 Figure 9 — serviceList
			*/
			modulepar NonipService PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL := {
			serviceID := PX_ITS_AID,
			serviceData := ''O,
			serverPort := PX_NO_SESSION_PORT,
			sessionChannel := 0
			} // End of modulepar PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL

			/**
			* @desc Non-IP information on services offered, with session phase and no channel change requested
			* @see ISO 24102-5 Figure 9 — serviceList
			*/
			modulepar NonipService PX_NO_IP_SERVICE_WITH_SESSION_AND_NO_CHANGE_CHANNEL := {
			serviceID := PX_ITS_AID,
			serviceData := ''O,
			serverPort := PX_SESSION_PORT,
			sessionChannel := 0
			} // End of modulepar PX_NO_IP_SERVICE_WITH_SESSION_AND_NO_CHANGE_CHANNEL

	} // End of group CRegServer		/**
			* @desc Non-IP information on services offered, with no session phase and channel change requested
			* @see ISO 24102-5 Figure 9 — serviceList
			*/
			modulepar NonipService PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE := {
			serviceID := PX_ITS_AID,
			serviceData := ''O,
			serverPort := PX_SESSION_PORT,
			sessionChannel := 1
			} // End of modulepar PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE

			/**
			* @desc Non-IP information on an unknown services offered, with session phase and no channel change requested
			* @see ISO 24102-5 Figure 9 — serviceList
			*/
			modulepar NonipService PX_NO_IP_SERVICE_WITH_UNKNOWN_SERVICE_ID := {
			serviceID := PX_UNKNOWN_ITS_AID,
			serviceData := ''O,
			serverPort := PX_SESSION_PORT,
			sessionChannel := 1
			} // End of modulepar PX_NO_IP_SERVICE_WITH_UNKNOWN_SERVICE_ID

			/**
			* @desc Non-IP information on services offered, with session phase and channel change requested on an unknown channel
			* @see ISO 24102-5 Figure 9 — serviceList
			*/
			modulepar NonipService PX_NO_IP_SERVICE_WITH_UNKNOWN_CHANNEL := {
			serviceID := PX_ITS_AID,
			serviceData := ''O,
			serverPort := PX_UNKNOWN_SESSION_PORT,
			sessionChannel := 1
			} // End of modulepar PX_NO_IP_SERVICE_WITH_UNKNOWN_CHANNEL

			} // End of group sam_

	/**		/**
	* Wait until the IUT is in a stable situation (beaconing...)		* Wait until the IUT is in a stable situation (beaconing...)
	*/		*/
	modulepar float PX_WAIT_FOR_IUT_READY := 1.0;		modulepar float PX_WAIT_FOR_IUT_READY := 1.0;

	modulepar FmtID PX_FMTID_SAM := 0; // TODO Use CLAMfsap.FmtID_sam_		/**
			* @desc SAM tag identifier
			* @see ISO 24102-5 Clause 7.2.1 Overview
			*/
			modulepar FmtID PX_FMTID_SAM := 0; // FIXME Check why TTWB raises an error using CLAMfsap.FmtID_sam_

	modulepar FmtID PX_FMTID_CTX := 1; // TODO Use CLAMfsap.FmtID_ctx_		/**
			* @desc CTX tag identifier
			* @see ISO 24102-5 Clause 7.2.1 Overview
			*/
			modulepar FmtID PX_FMTID_CTX := 1; // FIXME Check why TTWB raises an error using CLAMfsap.FmtID_ctx_

			/**
			* @desc FSAP version number
			* @see ISO 24102-5 Clause 7.2.2 Service advertisement message
			*/
	modulepar VersionFSAP PX_VERSION_FSAP := 0;		modulepar VersionFSAP PX_VERSION_FSAP := 0;

	} // End of module LibItsFsap_Pixits		} // End of module LibItsFsap_Pixits
			No newline at end of file

FSAP/LibItsFsap_Templates.ttcn3

+338 −216

File changed.

Preview size limit exceeded, changes collapsed.

Admin message