Test session with Peek in Amersfoort (6621cb79) · Commits · TTCN-3 Libraries / LibIts

ttcn/CALM/FNTP/LibItsFntp_Pixits.ttcn3

+9 −9

Original line number	Diff line number	Diff line
		@@ -87,17 +87,17 @@ module LibItsFntp_Pixits {
		* @desc Identifies the VCI localCIID on ITS-S router (e.g. It coud be the G5 radio MAC address of the IUT)
		* @see ISO 21218 - Clause 6.2 Link Identifier
		*/
		// modulepar EUI64 PX_WL_LOCAL_CIID := '0A0B0CFFFE0D0E0F'O; Commsignia FNTP setting
		modulepar EUI64 PX_WL_LOCAL_CIID := 'FFFFFFFFFEFFFFFF'O ; // Commsignia FSAP setting
		// modulepar EUI64 PX_WL_LOCAL_CIID := 'D4CA6DFFFF55A72C'O ; Commsignia FNTP setting
		// modulepar EUI64 PX_WL_LOCAL_CIID := 'A22D8CFFFF198063'O; Peek setting
		// modulepar EUI64 PX_WL_LOCAL_CIID := '0A0B0CFFFE0D0E0F'O; // Commsignia FNTP setting
		// modulepar EUI64 PX_WL_LOCAL_CIID := 'FFFFFFFFFEFFFFFF'O ; // Commsignia FSAP setting
		// modulepar EUI64 PX_WL_LOCAL_CIID := 'D4CA6DFFFF55A72C'O ; // Commsignia FNTP setting
		modulepar EUI64 PX_WL_LOCAL_CIID := '000C42FFFF6A9E2C'O; // Peek setting

		/**
		* @desc Identifies the VCI remoteCIID on ITS-S router (e.g. It coud be the G5 radio MAC address of the IUT)
		* @see ISO 21218 - Clause 6.2 Link Identifier
		*/
		// modulepar EUI64 PX_WL_REMOTE_CIID := '0A0B0CFFFE0D0E0F'O; // Commsignia setting
		modulepar EUI64 PX_WL_REMOTE_CIID := 'D4CA6DFFFF55A72C'O; // Peek setting
		modulepar EUI64 PX_WL_REMOTE_CIID := '000C42FFFF6A9E2C'O; // Peek setting

		/**
		* @desc Identifies the VCI for broadcast on ITS-S router
		@@ -176,8 +176,8 @@ module LibItsFntp_Pixits {
		/**
		* @desc Identifies uniquely a specific CI in a specific ITS-SCU for broadcast
		*/
		modulepar EUI64 PX_DEST_REMOTE_CIID_BC := 'FFFFFFFFFEFFFFFF'O; // Standard value
		// modulepar EUI64 PX_DEST_REMOTE_CIID_BC := 'FFFFFFFFFFFFFFFF'O; // For Peek
		// modulepar EUI64 PX_DEST_REMOTE_CIID_BC := 'FFFFFFFFFEFFFFFF'O; // Standard value
		modulepar EUI64 PX_DEST_REMOTE_CIID_BC := 'FFFFFFFFFFFFFFFF'O; // For Peek

		/**
		* @desc Identifies uniquely a specific CI in a specific ITS-SCU for multicast
		@@ -187,8 +187,8 @@ module LibItsFntp_Pixits {
		/**
		* @desc Identifies uniquely a specific VCI in a specific ITS-SCU for unicast (peer to peer)
		*/
		modulepar EUI64 PX_DEST_REMOTE_CIID_UC := '030009FFFE010001'O; // Commsignia
		// modulepar EUI64 PX_DEST_REMOTE_CIID_UC := 'D4CA6DFFFF55A72C'O; // Peek
		// modulepar EUI64 PX_DEST_REMOTE_CIID_UC := '030009FFFE010001'O; // Commsignia
		modulepar EUI64 PX_DEST_REMOTE_CIID_UC := 'D4CA6DFFFF55A72C'O; // Peek

		/**
		* @desc Identifies a second VCI for unicast (peer to peer) on ITS-SCU

ttcn/CALM/FSAP/LibItsFsap_Functions.ttcn3

+6 −2

Original line number	Diff line number	Diff line
		@@ -331,6 +331,10 @@ module LibItsFsap_Functions {
		template (value) CTX p_ctx
		) runs on ItsCalm {
		if (PICS_FSAP_FNTP == true) {
		log(
		"*** f_sendCtx: Send CTX: ",
		p_ctx,
		"***");
		fsapPort.send(
		m_fsapReq_inSap(
		m_inSapPrimitivesUp(
		@@ -561,7 +565,7 @@ module LibItsFsap_Functions {
		* @see PICS_SAM_RETRANSMIT_TIMER
		*/
		function f_getIutSamRetransmitTimer() return float {
		return 0.9 * PICS_SAM_RETRANSMIT_TIMER / 1000.0; // 90%
		return 0.8 * PICS_SAM_RETRANSMIT_TIMER / 1000.0; // 80%
		}

		/**
		@@ -570,7 +574,7 @@ module LibItsFsap_Functions {
		* @see PICS_SAM_RETRANSMIT_TIMER
		*/
		function f_getIutSamMaxJitter() return float {
		return 1.1 * PICS_SAM_RETRANSMIT_TIMER / 1000.0; // 110%
		return 1.2 * PICS_SAM_RETRANSMIT_TIMER / 1000.0; // 120%
		}

		/**

ttcn/CALM/FSAP/LibItsFsap_Pixits.ttcn3

+9 −6

Original line number	Diff line number	Diff line
		@@ -87,9 +87,11 @@ module LibItsFsap_Pixits {

		group iutVcisMac {

		modulepar EUI64 PX_IUT_MEDTYPE_ISO21215_LOCAL_CIID := '0A0B0CFFFE0D0E10'O;
		// modulepar EUI64 PX_IUT_MEDTYPE_ISO21215_LOCAL_CIID := '0A0B0CFFFE0D0E10'O; // Commsignia settings
		modulepar EUI64 PX_IUT_MEDTYPE_ISO21215_LOCAL_CIID := '0000000000000000'O; // Peek settings

		modulepar EUI64 PX_IUT_MEDTYPE_ISO21215_REMOTE_CIID := '0A0B0CFFFE0D0E10'O;
		// modulepar EUI64 PX_IUT_MEDTYPE_ISO21215_REMOTE_CIID := '0A0B0CFFFE0D0E10'O; // Commsignia settings
		modulepar EUI64 PX_IUT_MEDTYPE_ISO21215_REMOTE_CIID := '000C42FFFF974497'O; // Peek settings

		modulepar EUI64 PX_IUT_MEDTYPE_OTHER_LOCAL_CIID := '0A0B0CFFFE0D0E0F'O;

		@@ -107,14 +109,15 @@ module LibItsFsap_Pixits {
		/**
		* @desc The service client ITS station
		*/
		modulepar StationID PX_IUT_ID := '30390000'O; // Commsignia setting
		//modulepar StationID PX_CLIENT_ID := '5045454B'O; Peek setting
		// modulepar StationID PX_IUT_ID := '473A0000'O; // Commsignia setting for the ITS-S box
		// modulepar StationID PX_IUT_ID := '30390000'O; // Commsignia setting
		modulepar StationID PX_IUT_ID := '5045454B'O; // Peek setting

		/**
		* @desc The service client ITS station
		*/
		modulepar StationID PX_LOCAL_ID := '39300000'O; // Commsignia setting
		//modulepar StationID PX_CLIENT_ID := '5045454B'O; Peek setting
		// modulepar StationID PX_LOCAL_ID := '39300000'O; // Commsignia setting
		modulepar StationID PX_LOCAL_ID := '5045454B'O; // Peek setting

		/**
		* @desc The globally unique ITS-AID of the ITS-S application

ttcn/CALM/FSAP/LibItsFsap_Templates.ttcn3

+7 −6

Original line number	Diff line number	Diff line
		@@ -416,8 +416,8 @@ module LibItsFsap_Templates {
		} // End of template mw_fsapGcSam

		/**
		* @desc Receive template for FAsapPrimitivesUp/GCctx message
		* @param p_gcCtx GCctx notification message
		* @desc Receive template for FAsapPrimitivesUp/GCsamctx message
		* @param p_gcSamCtx GCsamctx notification message
		*/
		template UtEventInd mw_fsapGcSamCtx(
		in template (present) GCsamctx p_gcSamCtx
		@@ -931,8 +931,8 @@ module LibItsFsap_Templates {
		* @param p_clientID Client identifier
		* @see ISO 24102-5 Clause 8.2.6 Reception of CTX
		*/
		template (value) CTX mdw_ctx(
		in template (value) StationID p_clientId
		template (present) CTX mdw_ctx(
		in template (present) StationID p_clientId
		) modifies mw_ctx_any := {
		clientID := p_clientId
		} // End of template mw_ctx
		@@ -944,9 +944,10 @@ module LibItsFsap_Templates {
		* @see ISO2410-5 Figure 9 — serviceList
		*/
		template (present) CTX mdw_ctx_nonIpContext(
		in template (present) StationID p_clientId,
		in template (present) NonipContext p_servContext
		) modifies mw_ctx_any := {
		servContextList := ? // FIXME To be reviewed during validation superset(p_servContext)
		) modifies mdw_ctx := {
		servContextList := { p_servContext } // FIXME To be reviewed during validation superset(p_servContext)
		} // End of template mdw_ctx_nonIpContext

		/**