CALM protocols split out (2f6eb881) · Commits · TTCN-3 Libraries / LibIts

CALM/FNTP/LibItsFntp_Functions.ttcn3

+26 −31

Original line number	Original line	Diff line number	Diff line
	@@ -44,12 +44,7 @@ module LibItsFntp_Functions {
	// import from LibItsCommon_TypesAndValues {		// import from LibItsCommon_TypesAndValues {
	// type UtCommandConfirm		// type UtCommandConfirm
	// };		// };
	import from LibItsCommon_Functions {		import from LibItsCalm_Interface all;
	function
	f_utInitializeIut,
	f_utCommandRequestConfirm, f_utCommandRequestWithoutConfirm
	};
	import from LibIts_Interface all;

	group fntpConfigurationFunctions {		group fntpConfigurationFunctions {

	@@ -58,7 +53,7 @@ module LibItsFntp_Functions {
	* <li>Host and Router are combined (see ISO/WD 29281-2 - Figure 1 - Implementation architecture I)</li>		* <li>Host and Router are combined (see ISO/WD 29281-2 - Figure 1 - Implementation architecture I)</li>
	* <li>MGT1 IISC Port (IISC/LAN) is not used</li>		* <li>MGT1 IISC Port (IISC/LAN) is not used</li>
	*/		*/
	function f_cf01Up() runs on ItsNt {		function f_cf01Up() runs on ItsCalm {

	// Sanity check		// Sanity check
	if (PICS_ITS_S_INW) {		if (PICS_ITS_S_INW) {
	@@ -91,7 +86,7 @@ module LibItsFntp_Functions {
	* <li>Host and Router are separated (see ISO/WD 29281-2 - Figure 3 - Implementation architecture II & III)</li>		* <li>Host and Router are separated (see ISO/WD 29281-2 - Figure 3 - Implementation architecture II & III)</li>
	* <li>MGT1 IISC Port (IISC/LAN) is not used</li>		* <li>MGT1 IISC Port (IISC/LAN) is not used</li>
	*/		*/
	function f_cf02Up() runs on ItsNt {		function f_cf02Up() runs on ItsCalm {

	// Sanity check		// Sanity check
	if (not(PICS_ITS_S_INW)) {		if (not(PICS_ITS_S_INW)) {
	@@ -125,7 +120,7 @@ module LibItsFntp_Functions {
	/**		/**
	* @desc Deletes configuration cf01		* @desc Deletes configuration cf01
	*/		*/
	function f_cf01Down() runs on ItsNt {		function f_cf01Down() runs on ItsCalm {

	deactivate;		deactivate;

	@@ -143,7 +138,7 @@ module LibItsFntp_Functions {
	/**		/**
	* @desc Deletes configuration cf02		* @desc Deletes configuration cf02
	*/		*/
	function f_cf02Down() runs on ItsNt {		function f_cf02Down() runs on ItsCalm {

	deactivate;		deactivate;

	@@ -161,7 +156,7 @@ module LibItsFntp_Functions {
	* @desc Behavior function for initializing component's variables and tables		* @desc Behavior function for initializing component's variables and tables
	* @param p_componentName Name of the component		* @param p_componentName Name of the component
	*/		*/
	function f_initialiseComponent(in charstring p_componentName) runs on ItsNt {		function f_initialiseComponent(in charstring p_componentName) runs on ItsCalm {

	// Initialize variables		// Initialize variables
	vc_componentName := p_componentName;		vc_componentName := p_componentName;
	@@ -181,7 +176,7 @@ module LibItsFntp_Functions {
	/**		/**
	* @desc Brings the IUT into an initial state.		* @desc Brings the IUT into an initial state.
	*/		*/
	function f_initialState() runs on ItsNt {		function f_initialState() runs on ItsCalm {

	f_utInitializeIut(m_fntpInitialize);		f_utInitializeIut(m_fntpInitialize);
	f_sleepIgnoreDef(PX_WAIT_FOR_IUT_READY); // Wait until the IUT is in a stable situation (beaconing...)		f_sleepIgnoreDef(PX_WAIT_FOR_IUT_READY); // Wait until the IUT is in a stable situation (beaconing...)
	@@ -197,7 +192,7 @@ module LibItsFntp_Functions {
	* @verdict Unchanged on success, set to fail on error (e_timeout)		* @verdict Unchanged on success, set to fail on error (e_timeout)
	* @see ISO/WD 29281-2 Clause 8.2		* @see ISO/WD 29281-2 Clause 8.2
	*/		*/
	function f_initializeFntpForwardingTable(in PortNumber p_port) runs on ItsNt {		function f_initializeFntpForwardingTable(in PortNumber p_port) runs on ItsCalm {
	// Request allocation of a port number associated with the ITS-SP		// Request allocation of a port number associated with the ITS-SP
	// TODO Consider case of c_portDyn, and use f_utCommandRequestConfirm		// TODO Consider case of c_portDyn, and use f_utCommandRequestConfirm
	f_utCommandRequestWithoutConfirm(		f_utCommandRequestWithoutConfirm(
	@@ -221,7 +216,7 @@ module LibItsFntp_Functions {
	* @desc Call this method to remove entry created by f_initializeFntpForwardingTable() in FNTP Forwarding Table		* @desc Call this method to remove entry created by f_initializeFntpForwardingTable() in FNTP Forwarding Table
	* @verdict Unchanged		* @verdict Unchanged
	*/		*/
	function f_unInitializeFntpForwardingTable() runs on ItsNt {		function f_unInitializeFntpForwardingTable() runs on ItsCalm {
	// check c_portDyn		// check c_portDyn
	// Send for FTN-SOCKET.request & Wait for FTN-SOCKET.confirm		// Send for FTN-SOCKET.request & Wait for FTN-SOCKET.confirm
	f_utCommandRequestConfirm(		f_utCommandRequestConfirm(
	@@ -234,7 +229,7 @@ module LibItsFntp_Functions {
	/**		/**
	* @desc Trigger a basic FNTPNPDU to create an entry in forwarding table for a known peer station		* @desc Trigger a basic FNTPNPDU to create an entry in forwarding table for a known peer station
	*/		*/
	function f_setupKnownPeerStation() runs on ItsNt {		function f_setupKnownPeerStation() runs on ItsCalm {
	f_acGenerateFntpNPDU(		f_acGenerateFntpNPDU(
	f_getIutRemotePortNumberValue(),		f_getIutRemotePortNumberValue(),
	vc_portNumber,		vc_portNumber,
	@@ -252,7 +247,7 @@ module LibItsFntp_Functions {
	/**		/**
	* @desc The default postamble.		* @desc The default postamble.
	*/		*/
	function f_poDefault() runs on ItsNt {		function f_poDefault() runs on ItsCalm {
	// Nothing to do		// Nothing to do
	}		}

	@@ -272,7 +267,7 @@ module LibItsFntp_Functions {
	* @desc Wait for MN-SAP.MN-COMMAND/FWTupdate message sent by IST management entity to update the forwarding table		* @desc Wait for MN-SAP.MN-COMMAND/FWTupdate message sent by IST management entity to update the forwarding table
	* @verdict Unchanged		* @verdict Unchanged
	*/		*/
	function f_mnSapAwaitFWTupdate() runs on ItsNt {		function f_mnSapAwaitFWTupdate() runs on ItsCalm {

	tc_ac.start;		tc_ac.start;
	alt {		alt {
	@@ -294,7 +289,7 @@ module LibItsFntp_Functions {
	* @verdict Unchanged		* @verdict Unchanged
	*/		*/
	// FIXME To be removed - Moved on NF-SAP		// FIXME To be removed - Moved on NF-SAP
	// function f_mnSapGenerateGCctxTxCmd(in CommandRef p_commandRef, in Link_ID p_linkID, in ITSaid p_clientID) runs on ItsNt {		// function f_mnSapGenerateGCctxTxCmd(in CommandRef p_commandRef, in Link_ID p_linkID, in ITSaid p_clientID) runs on ItsCalm {
	// f_mgtGenerateGCctxTxCmd(		// f_mgtGenerateGCctxTxCmd(
	// p_commandRef,		// p_commandRef,
	// m_gCctxTxCmd(		// m_gCctxTxCmd(
	@@ -313,7 +308,7 @@ module LibItsFntp_Functions {
	* @verdict Unchanged		* @verdict Unchanged
	*/		*/
	// FIXME To be removed - Moved on NF-SAP		// FIXME To be removed - Moved on NF-SAP
	// function f_mnSapGenerateCTXrxNot(in CommandRef p_commandRef, in Link_ID p_linkID, in ITSaid p_clientID) runs on ItsNt {		// function f_mnSapGenerateCTXrxNot(in CommandRef p_commandRef, in Link_ID p_linkID, in ITSaid p_clientID) runs on ItsCalm {
	// f_mgtGenerateCTXrxNot(		// f_mgtGenerateCTXrxNot(
	// p_commandRef,		// p_commandRef,
	// m_cTXrxNot(		// m_cTXrxNot(
	@@ -332,7 +327,7 @@ module LibItsFntp_Functions {
	* @desc Triggers event in the test system adaptation via IN-SAP interface.		* @desc Triggers event in the test system adaptation via IN-SAP interface.
	* @param p_event The event to trigger		* @param p_event The event to trigger
	*/		*/
	function f_acTriggerEvent(template (value) AcFntpPrimitive p_event) runs on ItsAdapterComponent {		function f_acTriggerEvent(template (value) AcFntpPrimitive p_event) runs on ItsCalm {
	acPort.send(p_event);		acPort.send(p_event);
	}		}

	@@ -350,7 +345,7 @@ module LibItsFntp_Functions {
	in template (value) LLserviceAddr p_insapSourceAddress,		in template (value) LLserviceAddr p_insapSourceAddress,
	in template (value) LLserviceAddr p_insapDestAddress,		in template (value) LLserviceAddr p_insapDestAddress,
	in FNTPhopCount p_hops		in FNTPhopCount p_hops
	) runs on ItsNt {		) runs on ItsCalm {
	f_acTriggerEvent(		f_acTriggerEvent(
	m_generateFntpNPDU(		m_generateFntpNPDU(
	p_insapSourceAddress,		p_insapSourceAddress,
	@@ -382,7 +377,7 @@ module LibItsFntp_Functions {
	in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress		in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress
	in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress		in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress
	in template (value) FNTPhopCount p_hops		in template (value) FNTPhopCount p_hops
	) runs on ItsNt {		) runs on ItsCalm {
	f_acTriggerEvent(		f_acTriggerEvent(
	m_generateFntpNPDU(		m_generateFntpNPDU(
	p_insapSourceAddress,		p_insapSourceAddress,
	@@ -412,7 +407,7 @@ module LibItsFntp_Functions {
	in template (value) PortNumber p_destinationPort,		in template (value) PortNumber p_destinationPort,
	in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress		in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress
	in template (value) LLserviceAddr p_insapDestAddress // TODO Rename in p_insapDestAddress		in template (value) LLserviceAddr p_insapDestAddress // TODO Rename in p_insapDestAddress
	) runs on ItsNt {		) runs on ItsCalm {
	f_acTriggerEvent(		f_acTriggerEvent(
	m_generateFntpNPDU(		m_generateFntpNPDU(
	p_insapSourceAddress,		p_insapSourceAddress,
	@@ -450,7 +445,7 @@ module LibItsFntp_Functions {
	in template (value) RXcip p_rxCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough		in template (value) RXcip p_rxCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
	in template (value) TXcip p_txCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough		in template (value) TXcip p_txCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
	in template (value) AccessParameters p_accessParams		in template (value) AccessParameters p_accessParams
	) runs on ItsNt {		) runs on ItsCalm {
	f_acTriggerEvent(		f_acTriggerEvent(
	m_generateFntpNPDU_CIP(		m_generateFntpNPDU_CIP(
	p_insapSourceAddress,		p_insapSourceAddress,
	@@ -491,7 +486,7 @@ module LibItsFntp_Functions {
	in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress		in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress
	in template (value) FNTPpacketCounter p_counter,		in template (value) FNTPpacketCounter p_counter,
	in template (value) FNTPhopCount p_hops		in template (value) FNTPhopCount p_hops
	) runs on ItsNt {		) runs on ItsCalm {
	f_acTriggerEvent(		f_acTriggerEvent(
	m_generateFntpNPDU(		m_generateFntpNPDU(
	p_insapSourceAddress,		p_insapSourceAddress,
	@@ -532,7 +527,7 @@ module LibItsFntp_Functions {
	in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress		in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress
	in template (value) FNTPpacketCounter p_counter,		in template (value) FNTPpacketCounter p_counter,
	in template (value) FNTPhopCount p_hops		in template (value) FNTPhopCount p_hops
	) runs on ItsNt {		) runs on ItsCalm {
	f_acTriggerEvent(		f_acTriggerEvent(
	m_generateFntpNPDU(		m_generateFntpNPDU(
	p_insapSourceAddress,		p_insapSourceAddress,
	@@ -578,7 +573,7 @@ module LibItsFntp_Functions {
	in template (value) RXcip p_rxCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough		in template (value) RXcip p_rxCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
	in template (value) TXcip p_txCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough		in template (value) TXcip p_txCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
	in template (value) AccessParameters p_accessParams		in template (value) AccessParameters p_accessParams
	) runs on ItsNt {		) runs on ItsCalm {
	f_acTriggerEvent(		f_acTriggerEvent(
	m_generateFntpNPDU_CIP(		m_generateFntpNPDU_CIP(
	p_insapSourceAddress,		p_insapSourceAddress,
	@@ -616,7 +611,7 @@ module LibItsFntp_Functions {
	* @verdict Unchanged on success, set to fail otherwise		* @verdict Unchanged on success, set to fail otherwise
	* @see ISO/CD 21218 - Clause 8.2.2		* @see ISO/CD 21218 - Clause 8.2.2
	*/		*/
	function f_oct2npdu(in octetstring p_data, in charstring p_syncPoint, out FNTPNPDU p_decoded) runs on ItsAdapterComponent {		function f_oct2npdu(in octetstring p_data, in charstring p_syncPoint, out FNTPNPDU p_decoded) runs on ItsCalm {
	var integer v_result;		var integer v_result;

	v_result := decvalue(oct2bit(p_data), p_decoded);		v_result := decvalue(oct2bit(p_data), p_decoded);
	@@ -957,7 +952,7 @@ module LibItsFntp_Functions {
	/**		/**
	* @desc The base default.		* @desc The base default.
	*/		*/
	altstep a_fntpDefault() runs on ItsNt {		altstep a_fntpDefault() runs on ItsCalm {
	// FIXME Check why TTWB detect an error here?		// FIXME Check why TTWB detect an error here?
	// [] fntpPort.receive(mw_fntpInSapPrimitiveReq(mw_inUnitDataReq_any)) {		// [] fntpPort.receive(mw_fntpInSapPrimitiveReq(mw_inUnitDataReq_any)) {
	// log("* a_fntpDefault: INFO: IN-UNITDATA.request received in default *");		// log("* a_fntpDefault: INFO: IN-UNITDATA.request received in default *");
	@@ -993,7 +988,7 @@ module LibItsFntp_Functions {
	/**		/**
	* @desc Default handling cf01 de-initialisation.		* @desc Default handling cf01 de-initialisation.
	*/		*/
	altstep a_cf01Down() runs on ItsNt {		altstep a_cf01Down() runs on ItsCalm {
	[] a_shutdown() {		[] a_shutdown() {
	f_poDefault();		f_poDefault();
	f_cf01Down();		f_cf01Down();
	@@ -1005,7 +1000,7 @@ module LibItsFntp_Functions {
	/**		/**
	* @desc Default handling cf02 de-initialisation.		* @desc Default handling cf02 de-initialisation.
	*/		*/
	altstep a_cf02Down() runs on ItsNt {		altstep a_cf02Down() runs on ItsCalm {
	[] a_shutdown() {		[] a_shutdown() {
	f_poDefault();		f_poDefault();
	f_cf02Down();		f_cf02Down();

CALM/FNTP/LibItsFntp_Templates.ttcn3

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -27,16 +27,12 @@ module LibItsFntp_Templates {
	type ITS_scuId		type ITS_scuId
	};		};
	import from CALMfntp language "ASN.1:1997" all;		import from CALMfntp language "ASN.1:1997" all;
	import from LibIts_Interface all;		import from LibItsCalm_Interface all;
	import from LibItsFntp_TypesAndValues {		import from LibItsFntp_TypesAndValues {
	const c_portRtr, c_portHst, c_portNon, c_portReservedLow, c_portReservedHigh;		const c_portRtr, c_portHst, c_portNon, c_portReservedLow, c_portReservedHigh;
	type AcFntpPrimitive		type AcFntpPrimitive
	};		};
	import from LibItsFntp_Pixits all;		import from LibItsFntp_Pixits all;
	import from LibItsCommon_TypesAndValues {
	type
	UtInitialize, UtCommandRequest, UtCommandConfirm, UtCommandIndication
	};

	group fntpPrimitives {		group fntpPrimitives {

CALM/FSAP/LibItsFsap_Functions.ttcn3

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -41,15 +41,8 @@ module LibItsFsap_Functions {
	import from LibItsIicp_Functions {		import from LibItsIicp_Functions {
	altstep a_iicpDefault		altstep a_iicpDefault
	};		};
	import from LibItsCommon_Functions {
	function
	f_utInitializeIut, f_utCommandRequestConfirm
	};
	import from LibItsFntp_Templates all;		import from LibItsFntp_Templates all;
	import from LibIts_Interface {		import from LibItsCalm_Interface all;
	type
	ItsMgt, ItsAdapterComponent
	};

	group fsapConfigurationFunctions {		group fsapConfigurationFunctions {

CALM/FSAP/LibItsFsap_Templates.ttcn3

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -43,9 +43,8 @@ module LibItsFsap_Templates {
	PX_FMTID_CTX, PX_VERSION_FSAP,		PX_FMTID_CTX, PX_VERSION_FSAP,
	PX_USER_PRIORITY		PX_USER_PRIORITY
	};		};
	import from LibItsCommon_TypesAndValues {
	type UtInitialize, UtCommandRequest		import from LibItsCalm_Interface all;
	};

	group fsapPrimitives {		group fsapPrimitives {

CALM/IICP/LibItsIicp_Functions.ttcn3

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -31,17 +31,15 @@ module LibItsIicp_Functions {
	IIC_Request,		IIC_Request,
	ITS_SCUtype		ITS_SCUtype
	};		};
	import from LibItsCommon_Functions {
	function
	f_utInitializeIut
	};
	import from LibItsIicp_Templates all;		import from LibItsIicp_Templates all;
	import from LibItsIicp_Pics all;		import from LibItsIicp_Pics all;
	import from LibItsIicp_Pixits all;		import from LibItsIicp_Pixits all;
	import from LibIts_Interface {		import from LibItsCalm_Interface {
	type		type
	IicpResp, IicpResp,		IicpResp, IicpResp,
	ItsMgt		ItsMgt;
			function
			f_utInitializeIut
	};		};

	group iicpConfigurationFunctions {		group iicpConfigurationFunctions {

Admin message