Update IICP (a5886a0f) · Commits · TTCN-3 Libraries / LibIts

ttcn/BTP/LibItsBtp_TypesAndValues.ttcn

+174 −174

Original line number	Diff line number	Diff line
		@@ -12,10 +12,10 @@ module LibItsBtp_TypesAndValues {

		// LibIts
		import from CAM_PDU_Descriptions language "ASN.1:1997" {
		type CamPdu
		type CAM
		};
		import from DENM_PDU_Descriptions language "ASN.1:1997" {
		type DenmPdu
		type DENM
		};

		group btpPdus {
		@@ -101,8 +101,8 @@ module LibItsBtp_TypesAndValues {
		* @member
		*/
		type union DecodedBtpPayload {
		CamPdu camPacket,
		DenmPdu denmPacket
		CAM camPacket,
		DENM denmPacket
		} with {
		encode (camPacket) "LibItsCam_asn1";
		encode (denmPacket) "LibItsDenm_asn1"

ttcn/CALM/IICP/LibItsIicp_Functions.ttcn3

+30 −15

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ module LibItsIicp_Functions {
		import from LibCommon_VerdictControl all;

		// LibIts

		// LibItsCalm
		import from CALMllsap language "ASN.1:1997" {
		type
		Link_ID, Errors
		@@ -53,7 +55,7 @@ module LibItsIicp_Functions {
		import from LibItsIicp_Pixits all;
		import from LibItsCalm_Interface {
		type
		IicpResp, IicpResp,
		IicpReq, IicpInd,
		ItsMgt;
		function
		f_utInitializeIut
		@@ -69,10 +71,9 @@ module LibItsIicp_Functions {
		function f_cf01Up() runs on ItsMgt {

		// Map
		map(self:acPort, system:acPort);
		// map(self:acPort, system:acPort);
		map(self:utPort, system:utPort);
		map(self:iicpPort, system:iicpPort);
		// TODO To be removed map(self:mgtMfSapPort, system:mgtMfSapPort);

		// Connect
		f_connect4SelfOrClientSync();
		@@ -96,10 +97,9 @@ module LibItsIicp_Functions {
		deactivate;

		// Unmap
		unmap(self:acPort, system:acPort);
		// unmap(self:acPort, system:acPort);
		unmap(self:utPort, system:utPort);
		unmap(self:iicpPort, system:iicpPort);
		// TODO To be removed unmap(self:mgtMfSapPort, system:mgtMfSapPort);

		// Disconnect
		f_disconnect4SelfOrClientSync();
		@@ -133,7 +133,7 @@ module LibItsIicp_Functions {
		* @param p_rCmd The remote commad to trigger
		* @return FncRetCode
		*/
		function f_iicpTriggerRequest( // FIXME To be removed
		/* function f_iicpTriggerRequest( // FIXME To be removed
		in template (value) IIC_Request p_rCmd
		) runs on ItsMgt return FncRetCode {
		var FncRetCode v_ret := e_success;
		@@ -141,14 +141,14 @@ module LibItsIicp_Functions {
		iicpPort.send(m_iicpReq(p_rCmd));

		return v_ret;
		}
		}*/

		/**
		* @desc Triggers a response command event in the test system adaptation.
		* @param p_rCmd The remote commad to trigger
		* @return FncRetCode
		*/
		function f_iicpTriggerResponse(
		/* function f_iicpTriggerResponse(
		in template (value) IIC_Response p_rCmd
		) runs on ItsMgt return FncRetCode {
		var FncRetCode v_ret := e_success;
		@@ -156,12 +156,10 @@ module LibItsIicp_Functions {
		iicpPort.send(m_iicpResp(p_rCmd));

		return v_ret;
		}
		}*/

		} // End of group iicpFunctions



		group iicpAltsteps {

		/**
		@@ -169,16 +167,16 @@ module LibItsIicp_Functions {
		* @verdict Set to fail on unknown message
		*/
		altstep a_iicpDefault() runs on ItsMgt {
		[] iicpPort.receive(mw_iicpRequest(mw_iicpRequest_any)) { // Receive any IIC-Request message
		[] 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;
		}
		[] iicpPort.receive(mw_iicpResponse(mw_iicpResponse_any)) { // Receive any IIC-Response message
		[] iicpPort.receive(mw_iicpIndResp(mw_iicpResponse_any)) { // Receive any IIC-Response message
		log("* a_iicpDefault: INFO: Remote IIC-Response command service primitive received in default *");
		repeat;
		}
		[] iicpPort.receive { // Receive unknown message
		log("* a_iicpDefault: ERROR: event received on IISC port in default *");
		log("* a_iicpDefault: ERROR: event received on IICP port in default *");
		f_selfOrClientSyncAndVerdict("error", e_error);
		}
		[] tc_wait.timeout {
		@@ -223,7 +221,6 @@ module LibItsIicp_Functions {
		* @desc Brings the IUT into an initial state.
		*/
		function f_initialState() runs on ItsMgt {
		f_utInitializeIut(m_iicpInitialize);
		f_sleepIgnoreDef(PX_WAIT_FOR_IUT_READY); // Wait until the IUT is in a stable situation (beaconing...)
		} // End of function f_initialState

		@@ -338,6 +335,24 @@ module LibItsIicp_Functions {
		return PX_TALIVE;
		}

		/**
		* @desc Gets the Talive retransmit timer.
		* @return Talive retransmit timer
		* @see PX_TALIVE
		*/
		function f_getIutTaliveRetransmitTimer() return float {
		return 0.9 * int2float(PX_TALIVE) / 100.0; // 90%;
		}

		/**
		* @desc Gets the maximum Talive jitter.
		* @return Maximum Talive jitter
		* @see PICS_SAM_RETRANSMIT_TIMER
		*/
		function f_getIutTaliveMaxJitter() return float {
		return 1.1 * int2float(PX_TALIVE) / 100.0; // 110%;
		}

		/**
		* @desc Get the MI-Command value used for remote command
		* @return The MI-Command value used for remote command

ttcn/CALM/IICP/LibItsIicp_Templates.ttcn3

+65 −52

Original line number	Diff line number	Diff line
		@@ -13,13 +13,16 @@ module LibItsIicp_Templates {
		};

		// LibIts

		// LibItsCalm
		import from CALMiitsscu language "ASN.1:1997" {
		type
		McmdRs, TestConfigIICP,
		IIC_Request, IICrequestTX, IICrequestRX,
		IIC_Response, IICresponseTX, IICresponseRX,
		PduRequest, PduResponse,
		IICPpdu, PduCounter,
		McmdRq, McmdRs,
		McmdRq,
		ITS_SCUalive, ITS_SCUtype, AliveMessage,
		VCI_info_req, VCI_info_res, VCI_update_req, VCI_Info,
		PduErrStatus
		@@ -37,6 +40,12 @@ module LibItsIicp_Templates {
		import from CALMfntp language "ASN.1:1997" {
		type PortNumber
		};
		import from LibItsCalm_Pixits {
		modulepar
		PX_LOC_ITS_IICP_ACCESS_SETTINGS_MX_SAP_UNSET,
		PX_IUT_LOWER_LAYER_USED, PX_IUT_LOWER_LAYER_UNUSED,
		PX_IUT_TEST_MODE_ON
		};
		import from LibItsMgt_Templates {
		template
		mw_mfCommandRequest_any, mw_mfRequestRequest_any
		@@ -54,17 +63,61 @@ module LibItsIicp_Templates {

		group iicpPrimitives {

		group utPrimitives {
		/**
		* @desc Send template for Iisc packet (Inter-ITS-SCU communication Primitives)
		* @param p_msgOut Inter-ITS-SCU communication packet to send
		*/
		template (value) IicpReq m_iicpReq(
		template (value) IIC_Request p_msgOut
		) := {
		msgOut := p_msgOut
		} // End of template m_iicpReq

		/**
		* @desc Send template for Iisc packet (Inter-ITS-SCU communication Primitives)
		* @param p_msgInOut Inter-ITS-SCU communication packet to send
		*/
		template (present) IicpInd mw_iicpIndReq(
		template (present) IIC_Request p_msgInReq
		) := {
		msgIn := {
		msgIn_req := p_msgInReq
		},
		receptionTime := ?
		} // End of template mw_iicpIndReq

		template (present) IicpInd mw_iicpIndResp(
		template (present) IIC_Response p_msgInResp
		) := {
		msgIn := {
		msgIn_resp := p_msgInResp
		},
		receptionTime := ?
		} // End of template mw_iicpIndResp

		group testIicpConfig {

		/**
		* @desc Initializes the IICP IUT
		* @desc Initializes the IICP IUT including support notification to the Management entity
		* See Test System Configuration Access to SUT
		*/
		template (value) UtInitialize m_iicpInitialize := {
		utIicpInitialize := {
		template (value) PduRequest m_pduRequest_testIicpConfig := {
		reqRef := 9,
		iicpReq := {
		McmdRq := {
		mCmdRef := 255,
		mcmd := {
		TestConfigIICP := {
		location := PX_LOC_ITS_IICP_ACCESS_SETTINGS_MX_SAP_UNSET,
		lowerLayers := PX_IUT_LOWER_LAYER_UNUSED, // PX_IUT_LOWER_LAYER_USED
		testMode := PX_IUT_TEST_MODE_ON
		}
		} // End of template m_iicpInitialize
		} // End of field 'mcmd'
		} // End of field 'McmdRq'
		} // End of field 'iicpReq'
		} // End of template m_pduRequest_testIicpConfig

		} // End of group utPrimitives
		} // End of group testIicpConfig

		group taPrimitives {

		@@ -111,13 +164,13 @@ module LibItsIicp_Templates {
		* @param p_iICrequestTX IICrequestTX description
		* @see ISO 24102-4 Clause 8.2.1 IIC-Request PDU
		*/
		template (present) MF_Command_request mdw_mfCommandRequest_iicRequestTx(
		/*FIXME To be removed template (present) MF_Command_request mdw_mfCommandRequest_iicRequestTx(
		in template (present) IICrequestTX p_iicRequestTx
		) modifies mw_mfCommandRequest_any := {
		ref := 11,
		command_param := { IICrequestTX := p_iicRequestTx }
		} // End of template mdw_mfCommandRequest_iicRequestTx

		*/
		/**
		* @desc Receive template for MF-COMMAND.request in case of forwarding the IIC-Response PDU to the IICA
		* @param p_iICresponseTX IICresponseTX description
		@@ -159,7 +212,7 @@ module LibItsIicp_Templates {
		* @param p_mf_rreq MF-REQUEST.confirm mesage description
		* @see ISO 24102-4 Clause 8.2.2 IIC-Response PDU
		*/
		template (value) IICPpdu m_pduResponse_mfRequestConfirm(
		/*FIXME To be removed template (value) IICPpdu m_pduResponse_mfRequestConfirm(
		in template (value) MF_Request_confirm p_mfReqReq
		) := {
		pduRef := 1,
		@@ -170,7 +223,7 @@ module LibItsIicp_Templates {
		} // End of 'PduResponse' field
		} // End of 'iicpPDU' field
		} // End of template m_pduResponse_mfRequestConfirm

		*/
		} // End of group mfRequestRequestSend

		group mfRequestRequestRecv {
		@@ -761,26 +814,6 @@ module LibItsIicp_Templates {

		group iicpTemplatesSend {

		/**
		* @desc Send template for Iisc packet (Inter-ITS-SCU communication Primitives)
		* @param p_msgInOut Inter-ITS-SCU communication packet to send
		*/
		template (value) IicpReq m_iicpReq(
		template (value) IIC_Request p_msgInOut
		) := {
		msgInOut := p_msgInOut
		} // End of template m_iicpReq

		/**
		* @desc Send template for Iisc packet (Inter-ITS-SCU communication Primitives)
		* @param p_msgInOut Inter-ITS-SCU communication packet to send
		*/
		template (value) IicpResp m_iicpResp(
		template (value) IIC_Response p_msgInOut
		) := {
		msgInOut := p_msgInOut
		} // End of template m_iicpResp

		template (value) IIC_Request m_iicRequest(
		in template (value) ITS_scuId p_sourceItsScuId,
		in template (value) ITS_scuId p_destinationItsScuId,
		@@ -815,26 +848,6 @@ module LibItsIicp_Templates {

		group iicpTemplatesRecv {

		/**
		* @desc Receive template for Iisc packet (Inter-ITS-SCU communication Primitives)
		* @param p_iicpMsg Inter-ITS-SCU communication packet to receive
		*/
		template (present) IicpReq mw_iicpRequest(
		template (present) IIC_Request p_iicpMsg
		) := {
		msgInOut := p_iicpMsg
		} // End of template mw_iicpRequest

		/**
		* @desc Receive template for Iisc packet (Inter-ITS-SCU communication Primitives)
		* @param p_iicpMsg Inter-ITS-SCU communication packet to be received
		*/
		template (present) IicpResp mw_iicpResponse(
		template (present) IIC_Response p_iicpMsg
		) := {
		msgInOut := p_iicpMsg
		} // End of template mw_iicpResponse

		/**
		* @desc Unspecified receive template
		* Used for:

ttcn/CALM/IICP/LibItsIicp_TypesAndValues.ttcn3

+25 −27

Original line number	Diff line number	Diff line
		@@ -6,14 +6,12 @@
		*/
		module LibItsIicp_TypesAndValues {

		group utPrimitives {
		// LibCommon

		/**
		* @desc Trigger to initialize the IUT.
		*/
		type record UtIicpInitialize {
		}
		// LibIts

		// LibItsCalm
		group utPrimitives {

		} // End of group utPrimitives

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

+231 −230

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ module LibItsDenm_TypesAndValues {
		//LibIts
		import from DENM_PDU_Descriptions language "ASN.1:1997" all;
		import from CAM_PDU_Descriptions language "ASN.1:1997" all;
		import from ITS_Container language "ASN.1:1997" all;

		group actionTypes {