Added support for GN and BTP lower infos in CAM and DENM indications (TTCN-3) (97c6be61) · Commits · TTCN-3 Libraries / LibIts

ttcn/CAM/LibItsCam_Templates.ttcn

+3 −3

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ module LibItsCam_Templates {

		/**
		* @desc Receive template for CAM Message (CamPort Primitive)
		* @param p_camMsg CAM Message to be sent
		* @param p_camMsg Expected CAM Message
		*/
		template CamInd mw_camInd (
		in template (present) CAM p_camMsg
		@@ -44,7 +44,7 @@ module LibItsCam_Templates {

		/**
		* @desc Receive template for CAM Message (CamPort Primitive)
		* @param p_camMsg CAM Message to be sent
		* @param p_camMsg Expected CAM Message
		* @param p_gnNextHeader GN next header value
		* @param p_gnHeaderType GN header type value
		* @param p_gnHeaderSubtype GN header subtype value
		@@ -68,7 +68,7 @@ module LibItsCam_Templates {

		/**
		* @desc Receive template for CAM Message (CamPort Primitive)
		* @param p_camMsg CAM Message to be sent
		* @param p_camMsg Expected CAM Message
		* @param p_btpDestinationPort BTP destination port value
		* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
		*/

ttcn/DENM/LibItsDenm_Templates.ttcn

+50 −2

Original line number	Diff line number	Diff line
		@@ -7,6 +7,9 @@
		*/
		module LibItsDenm_Templates {

		// LibCommon
		import from LibCommon_BasicTypesAndValues all;

		// LibIts
		import from ITS_Container language "ASN.1:1997" all;
		import from DENM_PDU_Descriptions language "ASN.1:1997" all;
		@@ -55,9 +58,54 @@ module LibItsDenm_Templates {
		template (present) DENM p_denMsg
		) := {
		msgIn := p_denMsg,
		receptionTime := *
		gnNextHeader := *,
		gnHeaderType := *,
		gnHeaderSubtype := *,
		gnLifetime := *,
		gnTrafficClass := *,
		btpDestinationPort := *,
		btpInfo := *
		}

		/**
		* @desc Receive template for DEN Message (DenmPort Primitive)
		* @param p_denMsg The expected DEN Message
		* @param p_gnNextHeader GN next header value
		* @param p_gnHeaderType GN header type value
		* @param p_gnHeaderSubtype GN header subtype value
		* @param p_gnLifetime GN packet lifetime value (ms)
		* @param p_gnTrafficClass GN traffic class value
		*/
		template DenmInd mw_denmIndWithGnParameters (
		template (present) DENM p_denMsg,
		in template UInt8 p_gnNextHeader := *,
		in template UInt8 p_gnHeaderType := *,
		in template UInt8 p_gnHeaderSubtype := *,
		in template UInt32 p_gnLifetime := *,
		in template UInt8 p_gnTrafficClass := *
		) modifies mw_denmInd := {
		gnNextHeader := p_gnNextHeader,
		gnHeaderType := p_gnHeaderType,
		gnHeaderSubtype := p_gnHeaderSubtype,
		gnLifetime := p_gnLifetime,
		gnTrafficClass := p_gnTrafficClass
		};

		/**
		* @desc Receive template for DEN Message (DenmPort Primitive)
		* @param p_denMsg The expected DEN Message
		* @param p_btpDestinationPort BTP destination port value
		* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
		*/
		template DenmInd mw_denmIndWithBtpParameters (
		template (present) DENM p_denMsg,
		in template UInt8 p_btpDestinationPort := *,
		in template UInt8 p_btpInfo := *
		) modifies mw_denmInd := {
		btpDestinationPort := p_btpDestinationPort,
		btpInfo := p_btpInfo
		};

		group utPrimitives {

		/**

ttcn/DENM/LibItsDenm_TestSystem.ttcn

+9 −2

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ module LibItsDenm_TestSystem {
		// LibCommon
		import from LibCommon_Time {modulepar all};
		import from LibCommon_Sync all;
		import from LibCommon_BasicTypesAndValues all;

		// LibIts
		import from DENM_PDU_Descriptions language "ASN.1:1997" all;
		@@ -110,7 +111,13 @@ module LibItsDenm_TestSystem {
		*/
		type record DenmInd {
		DENM msgIn,
		TimestampIts receptionTime optional
		UInt8 gnNextHeader optional,
		UInt8 gnHeaderType optional,
		UInt8 gnHeaderSubtype optional,
		UInt32 gnLifetime optional,
		UInt8 gnTrafficClass optional,
		UInt16 btpDestinationPort optional,
		UInt16 btpInfo optional
		}
		with {
		encode (msgIn) "LibItsDenm_asn1"