Align TTCN-3 code on draft ETSI TS 102 797-2 v0.0.8 (93fc875b) · Commits · TTCN-3 Libraries / LibIts

ttcn/FSAP/LibItsFsap_Functions.ttcn3

+2 −2

Original line number	Diff line number	Diff line
		@@ -189,7 +189,7 @@ module LibItsFsap_Functions {
		*/
		function f_getIutSAMRetransmitTimer() return float {
		return int2float(
		(PICS_SAM_RETRANSMIT_TIMER / 1000.0)); // FIXME Check if PIXIT would not be better than PICS
		PICS_SAM_RETRANSMIT_TIMER) / 1000.0;
		}

		/**
		@@ -198,7 +198,7 @@ module LibItsFsap_Functions {
		*/
		function f_getIutSAMMaxJitter() return float {
		return int2float(
		PICS_SAM_RETRANSMIT_TIMER) / 1000.0; // FIXME Check if PIXIT would not be better than PICS
		PICS_SAM_RETRANSMIT_TIMER) / 1000.0;
		}

		/**

ttcn/FSAP/LibItsFsap_Pixits.ttcn3

+18 −19

Original line number	Diff line number	Diff line
		@@ -10,6 +10,9 @@ module LibItsFsap_Pixits {

		// LibIts
		import from CALMllsap language "ASN.1:1997" all;
		import from CITSapplMgmtApplReg language "ASN.1:1997" {
		type ITSaid
		};
		import from CALMmanagement language "ASN.1:1997" {
		type
		ITS_scuId, Talive
		@@ -23,6 +26,10 @@ module LibItsFsap_Pixits {
		ApplicationID,
		GCsched, ServiceDataReg
		};
		import from CALMfntp language "ASN.1:1997" {
		type
		PortNumber
		};

		/**
		* @desc Local settings
		@@ -55,6 +62,10 @@ module LibItsFsap_Pixits {

		group CRegServer {

		modulepar ITSaid PX_ITS_AID := { content := 0 }

		modulepar PortNumber PX_PORT_NUMBER := { portLong := 1234 }

		modulepar ApplicationID PX_APPLICATION_ID := {
		hostITS_scuId := 1,
		seqNumber := 1
		@@ -67,33 +78,21 @@ module LibItsFsap_Pixits {
		dirPredef := 0,
		fill := '0000000'B,
		dirVar := { }
		},
		}, // End of field 'directivity'
		gcInterval := 1
		}
		} // End of modulepar PX_GSCHED_ACCESS_TECH_NONIP

		// modulepar GCsched PX_GSCHED_1_1 := {
		// medium := 255, // FIXME TTwb does not generate MedType.ethernet label
		// directivity := {
		// mode := 0, // FIXME TTwb does not generate DirMode.fixed label
		// dirPredef := 1,
		// dirVar := omit
		// },
		// gcInterval := 1
		// }
		//
		modulepar ServiceDataReg PX_SERVICE_DATA_REG := {
		fill := '0000000'B,
		datareg := {
		nonipData := {
		serviceID := {
		content := 1
		},
		serviceID := PX_ITS_AID,
		timeout_ := 100,
		serviceData := ''O,
		providerPort := 1234
		}
		}
		}
		providerPort := PX_PORT_NUMBER
		} // End of field 'nonipData'
		} // End of field 'datareg'
		} // End of modulepar PX_SERVICE_DATA_REG

		} // End of group CRegServer

ttcn/FSAP/LibItsFsap_Templates.ttcn3

+86 −55

Original line number	Diff line number	Diff line
		@@ -25,11 +25,15 @@ module LibItsFsap_Templates {
		IN_SAPaddress, Link_ID,
		UserPriority
		};
		import from CALMfntp language "ASN.1:1997" {
		type
		PortNumber
		};
		import from CALMfsap language "ASN.1:1997" {
		type
		ApplicationID,
		CTX, CTXrxNot, GCctxTxCmd, GCregServer, GCregClient, GCderegClient, GCschedule,
		ServiceDataReg, SAMserviceData,
		ServiceDataReg, SAMserviceData, ServiceData,
		SAM, SAMrxNot
		};
		import from LibItsFsap_Pixits {
		@@ -244,6 +248,8 @@ module LibItsFsap_Templates {

		group samMessagePDU {

		group send_ {

		template (value) SAMrxNot m_sAMrxNot(
		in template (value) IN_SAPaddress p_csap,
		in template (value) Link_ID p_linkID,
		@@ -263,6 +269,10 @@ module LibItsFsap_Templates {
		}
		} // End of template m_sAMrxNot

		} // End of group send_

		group recv_ {

		/**
		* @desc
		*/
		@@ -281,6 +291,25 @@ module LibItsFsap_Templates {
		} // End of header 'mfCmd'
		} // End of template mw_mfCommad_gCSAM

		template SAMserviceData mw_samDataServercice_any := {
		fill := ?,
		servData := ?
		} // End of template mw_samDataServercice_any

		template SAMserviceData mw_samDataServerciceWithAccessTechAndNonIP(
		in template (present) ITSaid p_serviceID,
		in template (present) ServiceData p_serviceData,
		in template (present) PortNumber p_providerPort
		) modifies mw_samDataServercice_any := {
		servData := {
		nonipService := {
		serviceID := p_serviceID,
		serviceData := p_serviceData,
		providerPort := p_providerPort
		} // End of field 'nonipService'
		} // End of field 'servData'
		} // End of template mw_samDataServerciceWithAccessTechAndNonIP

		template SAMrxNot mw_sAMrxNot(
		in template (present) IN_SAPaddress p_csap,
		in template (present) Link_ID p_linkID,
		@@ -300,6 +329,8 @@ module LibItsFsap_Templates {
		}
		} // End of template m_sAMrxNot

		} // End of group recv_

		} // End of group samMessagePDU

		group ctxMessagePDU {

ttcn/MGT/LibItsMgt_Functions.ttcn3

+16 −4

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ module LibItsMgt_Functions {
		/**
		* @desc Wait for MN_COMMAND/FWTupdate message
		* @verdict Unchanged
		* @see ISO/WD 24102-4 - Clause 7.2.2
		* @see ISO/WD 24102-3 - Clause D.2.4 FWTupdate
		*/
		altstep a_mgtSapAwaitFWTupdate() runs on ItsMgt {
		var MgtMNSapCommandReq v_fWTupdate;
		@@ -163,15 +163,27 @@ module LibItsMgt_Functions {

		/**
		* @desc Wait for a notification of creation of an entry in a forwarding table.
		* @see ISO/WD 24102-4 Clause E.2.2 FWTsetNot
		* @see ISO/WD 24102-3 Clause E.2.2 FWTsetNot
		* @verdict Unchanged
		*/
		altstep a_mgtAwaitFWTsetNot() runs on ItsMgt {

		[] mgtMNSapPort.receive(mw_mgtMNSapRequestReq(mdw_fWTSetNotRequestReq)) {
		log("* a_mgtAwaitFWTupdateNot: INFO: MN-SAP FWTupdateNot service primitive received *");
		log("* a_mgtAwaitFWTsetNot: INFO: MN-SAP FWTupdateNot service primitive received *");
		}
		} // End of altstep a_mgtAwaitFWTupdateNot
		} // End of altstep a_mgtAwaitFWTsetNot

		/**
		* @desc Wait for creation of an entry in a forwarding table.
		* @see ISO/WD 24102-4 Clause D.2.3 FWTset
		* @verdict Unchanged
		*/
		altstep a_mgtAwaitFWTset() runs on ItsMgt {

		[] mgtMNSapPort.receive(mw_mgtMNSapCommandReq(mw_fWTSetCommandReq)) {
		log("* a_mgtAwaitFWTset: INFO: MN-SAP FWTupdateNot service primitive received *");
		}
		} // End of altstep a_mgtAwaitFWTset

		} // End of group mnSap

ttcn/MGT/LibItsMgt_Templates.ttcn3

+41 −1

Original line number	Diff line number	Diff line
		@@ -521,6 +521,16 @@ module LibItsMgt_Templates {
		} // End of field 'command_param'
		} // End of template mw_fWTUpdateCommandReq

		template MN_Command_request mw_fWTSetCommandReq := {
		commandRef := ?,
		command_param := {
		fill := ?,
		mnCmd := {
		fWTset := mw_fWTset_any
		} // End of field 'mnCmd'
		} // End of field 'command_param'
		} // End of template mw_fWTSetCommandReq

		/**
		* @desc Receive a "FWTupdate message" to update the FNTP forwarding table
		* @see ISO/CD 24102-3 Clause E.2.4
		@@ -534,7 +544,37 @@ module LibItsMgt_Templates {
		} // End of field 'update'
		} // End of template mw_fWTupdate

		} // End of group fWTupdate
		template FWTset mw_fWTset_any := {
		fill := ?,
		set_ := {
		fntp := {
		remotePort := ?,
		linkID := ?,
		ciStatus := ?,
		linkPort := ?,
		serviceInfo := ?,
		priority := ?,
		timeout_ := ?
		} // End of field 'fntp'
		} // End of field 'set_'
		} // End of template mw_fWTset_any

		template FWTset mdw_fWTset(
		in template (present) PortNumber p_remotePort/*,
		CALMllsap.Link_ID linkID,
		CALMllsap.CIstatus ciStatus,
		PortNumber linkPort,
		HostServiceInfo serviceInfo*/
		) modifies mw_fWTset_any := {
		set_ := {
		fntp := {
		remotePort := p_remotePort
		} // End of field 'fntp'
		} // End of field 'set_'
		} // End of template mdw_fWTset

		} // End of group fWTcommands

		//
		// group itsSAMrxNot { // FIXME To be deleted
		//