Implement FSAP TSS&TPs, Clause 9.2.3 (9a38e10f) · Commits · TTCN-3 Libraries / LibIts

ttcn/FSAP/LibItsFsap_Functions.ttcn3

+13 −11

Original line number	Original line	Diff line number	Diff line
	@@ -331,25 +331,27 @@ module LibItsFsap_Functions {
	}		}

	/**		/**
	* @desc TODO and without request to change communication channel for session phase and without request to change communication channel for session phase		* @desc Get advertisement details with no session phase
	* @return TODO		* @return The advertisement details
			* @see PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE
	*/		*/
	function f_getIutServiceDataRegWithNoSession() return ServiceDataReg {		function f_getIutServiceDataRegWithNoSession() return ServiceDataReg {
	return PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE;		return PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE;
	}		}

	/**		/**
	* @desc TODO and with a specific access technology and with request to change communication channel for session phase		* @desc Get advertisement details with a specific access technology and with request to change communication channel for session phase
	* @return TODO		* @return The advertisement details
	* @see PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANGE_CHANNEL		* @see PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANNEL_CHANGE
	*/		*/
	function f_getIutServiceDataRegWithNoSessionAndChannelChange() return ServiceDataReg {		function f_getIutServiceDataRegWithNoSessionAndChannelChange() return ServiceDataReg {
	return PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANGE_CHANNEL;		return PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANNEL_CHANGE;
	}		}

	/**		/**
	* @desc TODO and without request to change communication channel for session phase and without request to change communication channel for session phase		* @desc Get advertisement details without request to change communication channel for session phase and without request to change communication channel for session phase
	* @return TODO		* @return The advertisement details
			* @see PX_SERVICE_DATA_REG_WITH_SESSION_PHASE
	*/		*/
	function f_getIutServiceDataRegWithSession() return ServiceDataReg {		function f_getIutServiceDataRegWithSession() return ServiceDataReg {
	return PX_SERVICE_DATA_REG_WITH_SESSION_PHASE;		return PX_SERVICE_DATA_REG_WITH_SESSION_PHASE;
	@@ -360,7 +362,7 @@ module LibItsFsap_Functions {
	* @return TODO		* @return TODO
	* @see PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL		* @see PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL
	*/		*/
	function f_getIutServicelistWithNoSessionAndNoChangeChannel() return ServiceList {		function f_getIutServicelistWithNoSessionAndNoChannelChange() return ServiceList {
	return { PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL };		return { PX_NO_IP_SERVICE_WITH_NO_SESSION_AND_NO_CHANGE_CHANNEL };
	}		}

	@@ -376,10 +378,10 @@ module LibItsFsap_Functions {
	/**		/**
	* @desc TODO		* @desc TODO
	* @return TODO		* @return TODO
	* @see PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANGE_CHANNEL		* @see PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE
	*/		*/
	function f_getIutServicelistWithSessionAndChangeChannel() return ServiceList {		function f_getIutServicelistWithSessionAndChangeChannel() return ServiceList {
	return { PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANGE_CHANNEL };		return { PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE };
	}		}

	/**		/**

ttcn/FSAP/LibItsFsap_Pixits.ttcn3

+14 −12

Original line number	Original line	Diff line number	Diff line
	@@ -49,9 +49,9 @@ module LibItsFsap_Pixits {
	modulepar EUI64 PX_SRC_REMOTE_CIID := '0000000000000000'O;		modulepar EUI64 PX_SRC_REMOTE_CIID := '0000000000000000'O;

	/**		/**
	* @desc TODO		* @desc Priority of the ITS-S application
	*/		*/
	modulepar UserPriority PX_USER_PRIORITY := 0; // TODO Check if it is used somewhere		modulepar UserPriority PX_USER_PRIORITY := 0;

	} // End of group local		} // End of group local

	@@ -78,23 +78,24 @@ module LibItsFsap_Pixits {
	modulepar ITSaid PX_UNKNOWN_ITS_AID := { content := 126 }		modulepar ITSaid PX_UNKNOWN_ITS_AID := { content := 126 }

	/**		/**
	* @desc TODO		* @desc A session port value
	*/		*/
	modulepar PortNumber PX_SESSION_PORT := { portLong := 1234 }		modulepar PortNumber PX_SESSION_PORT := { portLong := 1234 }

	/**		/**
	* @desc TODO		* @desc An unspecified session port value
	*/		*/
	modulepar PortNumber PX_NO_SESSION_PORT := { portLong := c_portNon }		modulepar PortNumber PX_NO_SESSION_PORT := { portLong := c_portNon }

	/**		/**
	* @desc TODO		* @desc An unnknown session port value
	*/		*/
	modulepar PortNumber PX_UNKNOWN_SESSION_PORT := { portLong := 1234 }		modulepar PortNumber PX_UNKNOWN_SESSION_PORT := { portLong := 1234 }

	/**		/**
	* @desc ITS application object ID (ITS-AID) for GCregServer MF-REQUEST		* @desc ITS application object ID (ITS-AID) for GCregServer MF-REQUEST
	* @see ISO EN 17419		* @see ISO EN 17419
			* @see ISO 24102-5 Clause 8.3.1 Groupcast registration
	*/		*/
	modulepar ApplicationID PX_APPLICATION_ID := {		modulepar ApplicationID PX_APPLICATION_ID := {
	hostITS_scuId := 1,		hostITS_scuId := 1,
	@@ -104,6 +105,7 @@ module LibItsFsap_Pixits {
	/**		/**
	* @desc ITS application object ID (ITS-AID) for GCregClient MF-REQUEST		* @desc ITS application object ID (ITS-AID) for GCregClient MF-REQUEST
	* @see ISO EN 17419		* @see ISO EN 17419
			* @see ISO 24102-5 Clause 8.3.1 Groupcast registration
	*/		*/
	modulepar ApplicationID PX_CLIENT_APPLICATION_ID := {		modulepar ApplicationID PX_CLIENT_APPLICATION_ID := {
	hostITS_scuId := 2,		hostITS_scuId := 2,
	@@ -159,7 +161,7 @@ module LibItsFsap_Pixits {
	} // End of modulepar PX_GSCHED_NONIP		} // End of modulepar PX_GSCHED_NONIP

	/**		/**
	* @desc TODO		* @desc Receive template for advertisement details with no session phase
	*/		*/
	modulepar ServiceDataReg PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE := {		modulepar ServiceDataReg PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE := {
	fill := '0000000'B,		fill := '0000000'B,
	@@ -174,7 +176,7 @@ module LibItsFsap_Pixits {
	} // End of modulepar PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE		} // End of modulepar PX_SERVICE_DATA_REG_WITH_NO_SESSION_PHASE

	/**		/**
	* @desc TODO		* @desc Receive template for advertisement details with session phase
	*/		*/
	modulepar ServiceDataReg PX_SERVICE_DATA_REG_WITH_SESSION_PHASE := {		modulepar ServiceDataReg PX_SERVICE_DATA_REG_WITH_SESSION_PHASE := {
	fill := '0000000'B,		fill := '0000000'B,
	@@ -189,9 +191,9 @@ module LibItsFsap_Pixits {
	} // End of modulepar PX_SERVICE_DATA_REG_WITH_SESSION_PHASE		} // End of modulepar PX_SERVICE_DATA_REG_WITH_SESSION_PHASE

	/**		/**
	* @desc TODO		* @desc Receive template for advertisement details with session phase and channel change requested
	*/		*/
	modulepar ServiceDataReg PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANGE_CHANNEL := {		modulepar ServiceDataReg PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANNEL_CHANGE := {
	fill := '0000000'B,		fill := '0000000'B,
	datareg := {		datareg := {
	nonipData := {		nonipData := {
	@@ -201,7 +203,7 @@ module LibItsFsap_Pixits {
	providerPort := PX_SESSION_PORT		providerPort := PX_SESSION_PORT
	} // End of field 'nonipData'		} // End of field 'nonipData'
	} // End of field 'datareg'		} // End of field 'datareg'
	} // End of modulepar PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANGE_CHANNEL		} // End of modulepar PX_SERVICE_DATA_REG_WITH_SESSION_PHASE_AND_CHANNEL_CHANGE

	} // End of group cRegServer		} // End of group cRegServer

	@@ -230,12 +232,12 @@ module LibItsFsap_Pixits {
	/**		/**
	* @desc TODO		* @desc TODO
	*/		*/
	modulepar NonipService PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANGE_CHANNEL := {		modulepar NonipService PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE := {
	serviceID := PX_ITS_AID,		serviceID := PX_ITS_AID,
	serviceData := ''O,		serviceData := ''O,
	serverPort := PX_SESSION_PORT,		serverPort := PX_SESSION_PORT,
	sessionChannel := 1		sessionChannel := 1
	} // End of modulepar PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANGE_CHANNEL		} // End of modulepar PX_NO_IP_SERVICE_WITH_SESSION_AND_CHANNEL_CHANGE

	/**		/**
	* @desc TODO		* @desc TODO

ttcn/FSAP/LibItsFsap_Templates.ttcn3

+179 −172

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/MGT/LibItsMgt_Functions.ttcn3

+0 −46

Original line number	Original line	Diff line number	Diff line
	@@ -189,52 +189,6 @@ module LibItsMgt_Functions {

	group preambule {		group preambule {

	// /**
	// * @desc TODO
	// *
	// * @see ISO/CD 29281-2 Clause 7.8.1
	// */
	// function f_fntpForwardingTableRegisterEntry() runs on ItsMgt {
	// var PduCounter v_pduCounter;
	// var CommandRef v_commandRef;
	//
	// // Get a pdu counter value
	// v_pduCounter := f_getNextPduCounter();
	// v_commandRef := f_getNextCommandRef();
	//
	// // Send FWSet MN-COMMAND
	// iicpPort.send(m_iiscReq(
	// m_remoteMnCommandRequest(
	// PX_SRC_ITS_SCU_ID,
	// PX_DST_ITS_SCU_ID,
	// v_pduCounter,
	// m_mnCommandRequest(
	// v_commandRef,
	// m_mnFWTSet(
	// PX_HOST_CIID,
	// PX_HOST_SCU_ID,
	// PX_REMOTE_PORT,
	// PX_HOST_SCU_ID,
	// PX_USER_PRIORITY)))));
	// tc_ac.start;
	// alt {
	// [] iicpPort.receive(mw_iiscResp(
	// mw_mnCommandConfirm(
	// PX_DST_ITS_SCU_ID,
	// PX_SRC_ITS_SCU_ID,
	// v_pduCounter + 1, // ISO/WD 24102-4 - Clause 6.2.1
	// mw_mnCommandConfirmAny // FIXME Use a more restrictive template
	// ))) {
	// tc_ac.stop;
	// }
	// [] tc_ac.timeout {
	// log("* f_fntpForwardingTableRegisterEntry: INCONC: Pre-conditions: Failed to initialize FNTP Forwarding Table *");
	// f_selfOrClientSyncAndVerdictPreamble("error", e_timeout);
	// }
	// } // End of 'alt' statement
	//
	// } // End of function f_fntpForwardingTableRegisterEntry

	} // End of group preambule		} // End of group preambule

	group testerFunctions {		group testerFunctions {

Admin message