merged from stf484_validation branch (a48f0f61) · Commits · TTCN-3 Libraries / LibIts

ttcn/Common/LibItsCommon_Functions.ttcn

+7 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,13 @@ module LibItsCommon_Functions {

		} // end f_getTsStationId

		function f_getTsStationType()
		return StationType {

		return PX_TESTER_STATION_TYPE;

		} // end f_getTsStationType

		/**
		* @desc Gets the current latitude of test system
		* @return Test system's latitude

ttcn/Common/LibItsCommon_Pixits.ttcn

+6 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,12 @@ module LibItsCommon_Pixits {
		*/
		modulepar integer PX_TESTER_STATION_ID := 111111;

		/**
		* @desc Tester Station Type
		* Station Type used in CAM/DENM messages sent by the tester
		*/
		modulepar integer PX_TESTER_STATION_TYPE := 3;

		/**
		* @desc The Latitude of the tester.
		*/

ttcn/DENM/LibItsDenm_Pics.ttcn

+50 −2

Original line number	Diff line number	Diff line
		@@ -11,9 +11,57 @@ module LibItsDenm_Pics {

		/**
		* @desc Default expiry time of DENM generations
		* @see ETSI TS 102 869-1 v1.1.1 A.66/1
		* @see ETSI TS 102 869-2 Table 3
		*/
		modulepar integer PICS_DEFAULT_EXPIRY_TIME := 60000;
		modulepar integer PICS_DENM_DEFAULT_EXPIRY_TIME := 60000;

		/**
		* @desc Support for DENM generation
		* @see ETSI TS 102 869-2 Table 3
		*/
		modulepar boolean PICS_DENM_GENERATION := true;

		/**
		* @desc Support for DENM update
		* @see ETSI TS 102 869-2 Table 3
		*/
		modulepar boolean PICS_DENM_UPDATE := true;

		/**
		* @desc Support for DENM repetition
		* @see ETSI TS 102 869-2 Table 3
		*/
		modulepar boolean PICS_DENM_REPETITION := true;

		/**
		* @desc Support for DENM cancellation
		* @see ETSI TS 102 869-2 Table 3
		*/
		modulepar boolean PICS_DENM_CANCELLATION := true;

		/**
		* @desc Support for DENM NEGATION
		* @see ETSI TS 102 869-2 Table 3
		*/
		modulepar boolean PICS_DENM_NEGATION := true;

		/**
		* @desc Support for DENM RECEPTION
		* @see ETSI TS 102 869-2 Table 3
		*/
		modulepar boolean PICS_DENM_RECEPTION := true;

		/**
		* @desc Support for Keep-Alive Forwarding
		* @see ETSI TS 102 869-2 Table 3
		*/
		modulepar boolean PICS_DENM_KAF := true;

		/**
		* @desc Support for impact recuction
		* @see ETSI TS 102 869-2 Table 3
		*/
		modulepar boolean PICS_IMPACT_REDUCTION := true;

		} // end denmPics

ttcn/DENM/LibItsDenm_Templates.ttcn

+3 −5

Original line number	Diff line number	Diff line
		@@ -393,7 +393,6 @@ module LibItsDenm_Templates {
		* @desc Send template for Management Container
		* @param p_actionID The action id
		* @param p_isNegation The negation flag (Default: false)
		* @param p_isCancellation The cancellation flag (Default: false)
		* @param p_validityDuration The validity duration (Default: omit)
		* @param p_transmissionInterval The transmission interval (Default: omit)
		* @param p_detectionTime The detection time (Default: current time)
		@@ -401,7 +400,7 @@ module LibItsDenm_Templates {
		*/
		template (value) ManagementContainer m_denmMgmtCon(
		template (value) ActionID p_actionID,
		template (value) StationType p_stationType := f_getTsStationId(),
		template (value) StationType p_stationType := f_getTsStationType(),
		template (value) ValidityDuration p_validityDuration := c_defaultValidity,
		template (omit) TransmissionInterval p_transmissionInterval := omit,
		template (value) TimestampIts p_detectionTime := f_getCurrentTime(),
		@@ -431,7 +430,7 @@ module LibItsDenm_Templates {
		*/
		template (value) ManagementContainer m_denmMgmtConTermination (
		template (value) ActionID p_actionID,
		template (value) StationType p_stationType := f_getTsStationId(),
		template (value) StationType p_stationType := f_getTsStationType(),
		template (value) ValidityDuration p_validityDuration := c_defaultValidity,
		template (omit) TransmissionInterval p_transmissionInterval := omit,
		template (value) TimestampIts p_detectionTime := f_getCurrentTime(),
		@@ -446,13 +445,12 @@ module LibItsDenm_Templates {
		* @param p_actionID The expected action id
		* @param p_referenceTime The reference time (Default: any)
		* @param p_isNegation The expected negation flag (Default: false)
		* @param p_isCancellation The expected cancellation flag (Default: false)
		* @param p_validityDuration The expected validity duration (Default: any or omit)
		* @param p_transmissionInterval The expected transmission interval (Default: any or omit)
		*/
		template (present) ManagementContainer mw_denmMgmtCon(
		template (present) ActionID p_actionID,
		template (present) StationType p_stationType := f_getTsStationId(),
		template (present) StationType p_stationType := f_getTsStationType(),
		template (present) TimestampIts p_referenceTime := ?,
		template ValidityDuration p_validityDuration := ?,
		template TransmissionInterval p_transmissionInterval := *,

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+6 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ module LibItsGeoNetworking_Functions {
		import from LibItsCommon_Functions all;
		import from LibItsCommon_TestSystem all;
		import from LibItsCommon_TypesAndValues all;
		import from LibItsExternal_TypesAndValues {type MacAddress};
		import from LibItsExternal_TypesAndValues all;

		// LibItsSecurity
		import from LibItsSecurity_TypesAndValues all;
		@@ -716,6 +716,9 @@ module LibItsGeoNetworking_Functions {
		vc_areaTable := p_areaTable;
		vc_componentName := p_componentName;

		vc_localSeqNumber := f_getInitialSequenceNumber();
		vc_multipleMessagesCount := f_getMessageCount();

		f_setGenerationLocation(
		f_getTsLatitude(),
		f_getTsLongitude()
		@@ -1928,10 +1931,10 @@ module LibItsGeoNetworking_Functions {

		/**
		* @desc Gets the IUT GN local address configuration method
		* @return TypeOfAddress - IUT's GN local address configuration method
		* @return GnAddressConfigurationMethod - IUT's GN local address configuration method
		* @see PICS_GN_LOCAL_ADDR_CONF_METHOD
		*/
		function f_getIutGnLocalAddressConfigurationMethod() return TypeOfAddress {
		function f_getIutGnLocalAddressConfigurationMethod() return GnAddressConfigurationMethod {
		return PICS_GN_LOCAL_ADDR_CONF_METHOD;
		}