Bug fixed after first IICP validation (8c96ac57) · Commits · TTCN-3 Libraries / LibIts

ttcn/CALM/IICP/LibItsIicp_Functions.ttcn3

+46 −10

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ module LibItsIicp_Functions {
		import from CALMiitsscu language "ASN.1:1997" {
		type
		IIC_Request, IIC_Response,
		SimUt,
		ITS_SCUtype, ITS_SCUalive,
		VCI_Info, VCI_info_res, VCI_update_req
		};
		@@ -163,7 +164,7 @@ module LibItsIicp_Functions {
		var UtIicpEventInd v_utIicpEventInd;

		utPort.send(p_utIicpEvent);
		tc_noac.start;
		/* tc_noac.start;
		alt {
		[] utPort.receive(UtIicpEventInd:?) -> value v_utIicpEventInd { // FIXME Use altstep for UtPort
		tc_noac.stop;
		@@ -174,11 +175,32 @@ module LibItsIicp_Functions {
		log("* f_utIicpEvent: INFO: CommandRequest succeed *");
		}
		} // End of 'alt' statement

		*/
		} // End of function f_utIicpEvent

		} // End of group utFunctions

		/**
		* @desc Test trigger function
		*/
		group whenFunctions {

		/**
		* @desc Send a NFsapPrimitivesDown primitive and do not wait for the NFsapPrimitivesDown confirm response
		* @param p_utIicpEvent The NFsapPrimitivesDown primitive
		* @verdict Unchanged on success, fail otherwise
		*/
		function f_iicpEvent(
		in template (value) IIC_Request p_IIC_Request
		) runs on ItsCalm {
		iicpPort.send(
		m_iicpReq(
		p_IIC_Request
		));
		} // End of function f_iicpEvent

		} // End of group whenFunctions

		/**
		* @desc Config tester functions
		*/
		@@ -189,7 +211,7 @@ module LibItsIicp_Functions {
		* @param p_cfInitialize The initialisation to trigger.
		* @verdict Unchanged on success, fail otherwise
		*/
		function f_cfIicpInitialize(template (value) CfInitialize p_cfInitialize) runs on ItsCalm {
		/* function f_cfIicpInitialize(template (value) CfInitialize p_cfInitialize) runs on ItsCalm {

		cfPort.send(p_cfInitialize);
		tc_wait.start;
		@@ -213,14 +235,14 @@ module LibItsIicp_Functions {
		} // End of 'alt' statement

		} // End of function f_cfIicpInitialize

		*/
		/**
		* @desc Await for notification on MN-SAP
		* @param p_cfIicpEventInd The MN_Request_request notification message.
		* @param p_discard Set to true if responses shall be discard, otherwise the function failed
		* @verdict Unchanged on success, fail otherwise
		*/
		function f_cfIicpAwaitNotificationToManagement(
		/* function f_cfIicpAwaitNotificationToManagement(
		in template CfIicpEventInd p_cfIicpEventInd,
		in boolean p_discard
		) runs on ItsCalm {
		@@ -254,7 +276,7 @@ module LibItsIicp_Functions {
		} // End of 'alt' statement

		} // End of function f_cfIicpAwaitNotificationToManagement

		*/
		} // End of group cfFunctions

		/**
		@@ -272,6 +294,7 @@ module LibItsIicp_Functions {
		// Map
		// map(self:acPort, system:acPort);
		map(self:utPort, system:utPort);
		// map(self:cfPort, system:cfPort);
		map(self:iicpPort, system:iicpPort);

		// Connect
		@@ -298,6 +321,7 @@ module LibItsIicp_Functions {
		// Unmap
		// unmap(self:acPort, system:acPort);
		unmap(self:utPort, system:utPort);
		// unmap(self:cfPort, system:cfPort);
		unmap(self:iicpPort, system:iicpPort);

		// Disconnect
		@@ -375,7 +399,19 @@ module LibItsIicp_Functions {
		* @desc Trap for not processed IICP message.
		* @verdict Set to fail on unknown message
		*/
		altstep a_iicpDefault() runs on ItsCalm { // TODO Add Alive messages filtering
		altstep a_iicpDefault() runs on ItsCalm {
		[] iicpPort.receive(
		mw_iicpIndReq(
		mdw_iicRequestTx_scuAlive(
		?,
		65535,
		mw_scuAlive(
		?,
		?
		)))) {
		log("* a_iicpDefault: INFO: Broadcasted Alive message, skip it and repeat *");
		repeat;
		}
		[] iicpPort.receive(mw_iicpIndReq(mw_iicpRequest_any)) { // Receive any IIC-Request message
		log("* a_iicpDefault: INFO: Remote IIC-Request command service primitive received in default *");
		repeat;
		@@ -436,7 +472,7 @@ module LibItsIicp_Functions {
		} else {
		f_utIicpInitializeIut(m_utIicpInitialize_without_management);
		}
		f_cfIicpInitialize(m_cfIicpInitialize);
		// f_cfIicpInitialize(m_cfIicpInitialize);
		f_sleepIgnoreDef(PX_WAIT_FOR_IUT_READY); // Wait until the IUT is in a stable situation (beaconing...)
		cfPort.clear; // Because TestConfigIICP should trigger management port deletion message
		} // End of function f_initialState
		@@ -558,7 +594,7 @@ module LibItsIicp_Functions {
		* @see PX_TALIVE
		*/
		function f_getIutTaliveRetransmitTimer() return float {
		return 0.9 * int2float(PX_TALIVE) / 100.0; // 90%;
		return 0.9 * int2float(PX_TALIVE); // 90%;
		}

		/**
		@@ -567,7 +603,7 @@ module LibItsIicp_Functions {
		* @see PICS_SAM_RETRANSMIT_TIMER
		*/
		function f_getIutTaliveMaxJitter() return float {
		return 1.1 * int2float(PX_TALIVE) / 100.0; // 110%;
		return 1.1 * int2float(PX_TALIVE); // 110%;
		}

		/**

ttcn/CALM/IICP/LibItsIicp_Pixits.ttcn3

+3 −2

Original line number	Diff line number	Diff line
		@@ -72,7 +72,8 @@ module LibItsIicp_Pixits {
		* @desc The type ITS scuID
		* @see ISO/WD 24102-4 - Table 2 — ITS-SCU-ID value assignment
		*/
		modulepar ITS_SCUtype PX_LOCAL_ITS_TYPE := 1; // ITS_SCUtype_host_
		// modulepar ITS_SCUtype PX_LOCAL_ITS_TYPE := 1; // ITS_SCUtype_host_
		modulepar ITS_SCUtype PX_LOCAL_ITS_TYPE := 255; // any - broadcast address

		/**
		* @desc Host ITS-SCU-ID
		@@ -82,7 +83,7 @@ module LibItsIicp_Pixits {
		/**
		* @desc Alive timer
		*/
		modulepar Talive PX_TALIVE := 100; // TODO Check what is the role of Talive?
		modulepar Talive PX_TALIVE := 5000;

		/**
		* Wait until the IUT is in a stable situation (beaconing...)

ttcn/CALM/IICP/LibItsIicp_Templates.ttcn3

+242 −235

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/CALM/IICP/LibItsIicp_TypesAndValues.ttcn3

+11 −11

Original line number	Diff line number	Diff line
		@@ -13,9 +13,9 @@ module LibItsIicp_TypesAndValues {
		// LibItsCalm
		import from CALMiitsscu language "ASN.1:1997" {
		type
		McmdRq,
		SimUtIn, SimUtOut,
		IICPpdu // TODO Check if CfEventInd should be used
		McmdRq, McmdRs,
		SimUt/*,
		IICPpdu*/ // TODO Check if CfEventInd should be used
		};

		group utPrimitives {
		@@ -34,13 +34,13 @@ module LibItsIicp_TypesAndValues {

		/**
		* @desc Events at the application layer of the IUT.
		* @member pduRequest IICPpdu primitive
		* @member mcmdRs McmdRs confirm
		*/
		type union UtIicpEvent {
		SimUtIn simUtIn
		McmdRs mcmdRs
		}
		with {
		encode (simUtIn) "LibItsIicp_asn1"
		encode (mcmdRs) "LibItsIicp_asn1"
		}

		/**
		@@ -48,10 +48,10 @@ module LibItsIicp_TypesAndValues {
		* @member TODO IICPpdu primitive
		*/
		type union UtIicpEventInd {
		SimUtOut simUtOut
		McmdRq mcmdRq
		}
		with {
		encode (simUtOut) "LibItsIicp_asn1"
		encode (mcmdRq) "LibItsIicp_asn1"
		}

		} with {
		@@ -70,12 +70,12 @@ module LibItsIicp_TypesAndValues {
		* @desc Send a IICPpdu primitive to the Management layer through a SAP. FIXME Check the comment
		* @member IICPpdu primitive
		*/
		type union CfIicpEventInd {
		/* type union CfIicpEventInd {
		IICPpdu pduRequest
		}
		with {
		encode (pduRequest) "LibItsCALMmsap_asn1"
		}
		encode (pduRequest) "LibItsIicp_asn1"
		}*/

		} with {
		encode "ConfigTester"

ttcn/CALM/LibItsCalm_Interface.ttcn

+6 −7

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ module LibItsCalm_Interface {
		import from LibItsIicp_TypesAndValues {
		type
		UtIicpInitialize, UtIicpEventInd, UtIicpEvent,
		CfIicpInitialize, CfIicpEventInd
		CfIicpInitialize//FIXME To be removed, CfIicpEventInd
		};
		import from LibItsAtsp_TypesAndValues {
		type
		@@ -86,7 +86,7 @@ module LibItsCalm_Interface {
		out
		CfInitialize, CfAtspEvent;
		in
		CfResult, CfFntpEventInd, CfFsapEventInd, CfIicpEventInd, CfAtspEventInd
		CfResult, CfFntpEventInd, CfFsapEventInd/, CfIicpEventInd/, CfAtspEventInd
		} // End of ConfigTesterPort

		} // End portDefinitions
		@@ -252,7 +252,7 @@ module LibItsCalm_Interface {
		Time48IAT receptionTime
		}
		with {
		encode (msgIn) "LibItsIicp_asn1"
		encode (receptionTime) "LibItsCALMllsap_asn1";
		encode "LibIts_Interface"
		}

		@@ -291,7 +291,6 @@ module LibItsCalm_Interface {
		FsapMsg msgIn,
		Time48IAT receptionTime
		} with {
		encode (msgIn) "LibIts_Interface";
		encode (receptionTime) "LibItsCALMllsap_asn1";
		encode "LibIts_Interface"
		}
		@@ -427,14 +426,14 @@ module LibItsCalm_Interface {
		type union CfInitialize {
		CfFntpInitialize cfFntpInitialize,
		CfFsapInitialize cfFsapInitialize,
		CfIicpInitialize cfIicpInitialize,
		// CfIicpInitialize cfIicpInitialize,
		CfAtspInitialize cfAtspInitialize
		}

		type union CfEventInd {
		CfFntpEventInd cfFntpEventInd,
		CfFsapEventInd cfFsapEventInd,
		CfIicpEventInd cfIicpEventInd,
		//FIXME To be removed CfIicpEventInd cfIicpEventInd,
		CfAtspEventInd cfAtspEventInd
		}