Resolve conflicts (a05ef206) · Commits · TTCN-3 Libraries / LibIts

ttcn/CALM/LibItsCalm_Interface.ttcn

+44 −38

Original line number	Original line	Diff line number	Diff line
	@@ -13,8 +13,8 @@ module LibItsCalm_Interface {
	};		};

	// LibIts - IP Protocols		// LibIts - IP Protocols
			// import from LibItsExternal_TypesAndValues all;
	// LibItsCalm		// LibIts - Non IP Protocols
	import from CALMiitsscu language "ASN.1:1997" {		import from CALMiitsscu language "ASN.1:1997" {
	type		type
	IIC_Request, IIC_Response,		IIC_Request, IIC_Response,
	@@ -45,6 +45,11 @@ module LibItsCalm_Interface {
	UtFsapInitialize, UtFsapEvent, UtFsapEventInd,		UtFsapInitialize, UtFsapEvent, UtFsapEventInd,
	CfFsapInitialize, CfFsapEventInd		CfFsapInitialize, CfFsapEventInd
	, AcFsapPrimitive // TODO To be removed		, AcFsapPrimitive // TODO To be removed
			};
			import from LibItsAtsp_TypesAndValues {
			type
			UtAtspInitialize, UtAtspEventInd, UtAtspEvent,
			CfAtspInitialize, CfAtspEventInd, CfAtspEvent
	};		};
	import from LibItsIicp_TypesAndValues all; // FIXME Remove 'all'		import from LibItsIicp_TypesAndValues all; // FIXME Remove 'all'

	@@ -80,7 +85,7 @@ module LibItsCalm_Interface {
	*/		*/
	type port ConfigTesterPort message {		type port ConfigTesterPort message {
	out		out
	CfInitialize;		CfInitialize, CfEvent;
	in		in
	CfResult, CfEventInd		CfResult, CfEventInd
	} // End of ConfigTesterPort		} // End of ConfigTesterPort
	@@ -122,7 +127,7 @@ module LibItsCalm_Interface {
	* @desc Test component for ITS Network and Transport layer		* @desc Test component for ITS Network and Transport layer
	* @member fntpPort Fast Network & Transport layer Protocol port		* @member fntpPort Fast Network & Transport layer Protocol port
	* @member fsapPort Fast Service Advertisement Protocol port		* @member fsapPort Fast Service Advertisement Protocol port
	* @member atsPort TODO		* @member atspPort Access Technology Support Protocol port
	*/		*/
	type component ItsCalm extends ItsMgt {		type component ItsCalm extends ItsMgt {
	// MGT2 ports - Used to send command to/from through SAP interfaces		// MGT2 ports - Used to send command to/from through SAP interfaces
	@@ -130,7 +135,7 @@ module LibItsCalm_Interface {
	// NT3 ports		// NT3 ports
	port FntpPort fntpPort;		port FntpPort fntpPort;
	// AccessLayer ports		// AccessLayer ports
	port AtsPort atspPort; // FIXME Rename Ats into Atsp		port AtspPort atspPort;

	// timers		// timers

	@@ -156,7 +161,7 @@ module LibItsCalm_Interface {
	type port IicpPort message {		type port IicpPort message {
	inout		inout
	IicpReq,		IicpReq,
	IicpInd;		IicpResp;
	} // End of port IicpPort		} // End of port IicpPort

	} // End of group mgt1Ports		} // End of group mgt1Ports
	@@ -200,11 +205,11 @@ module LibItsCalm_Interface {
	/**		/**
	* @desc AccessLayer Port (Radio, IR...)		* @desc AccessLayer Port (Radio, IR...)
	*/		*/
	type port AtsPort message {		type port AtspPort message {
	in		in
	AtsInd;		AtspInd;
	out		out
	AtsReq;		AtspReq;
	} // End of port AtsPort		} // End of port AtsPort

	} // End of group accessLayerPorts		} // End of group accessLayerPorts
	@@ -218,37 +223,26 @@ module LibItsCalm_Interface {
	group mgt1Primitives {		group mgt1Primitives {

	/**		/**
	* @desc MGT1 IISC Request Primitive		* @desc MGT1 IISC Indication Primitive
	*/		*/
	type record IicpReq {		type record IicpResp {
	IIC_Request msgOut		IIC_Response msgInOut
	}		}
	with {		with {
	encode (msgOut) "LibItsIicp_asn1"		encode (msgInOut) "LibItsIicp_asn1"
	encode "LibIts_Interface"		encode "LibIts_Interface"
	}		}


	/**		/**
	* @desc TODO		* @desc MGT1 IISC Request Primitive
	*/
	type union IicpMsg {
	IIC_Request msgIn_req,
	IIC_Response msgIn_resp
	} with {
	encode (msgIn_req) "LibItsIicp_asn1";
	encode (msgIn_resp) "LibItsIicp_asn1";
	encode "LibIts_Interface"
	}

	/**
	* @desc MGT1 IISC Request/Indication Primitive
	*/		*/
	type record IicpInd {		type record IicpReq {
	IicpMsg msgIn,		IIC_Request msgInOut/*,
	Time48IAT receptionTime		Time48IAT receptionTime */
	}		}
	with {		with {
			encode (msgInOut) "LibItsIicp_asn1"
	encode "LibIts_Interface"		encode "LibIts_Interface"
	}		}

	@@ -332,7 +326,7 @@ module LibItsCalm_Interface {
	* @desc FNTP output protocol port primitive		* @desc FNTP output protocol port primitive
	* @member msgOut Message to send to the protocol port (INsapPrimitivesUp)		* @member msgOut Message to send to the protocol port (INsapPrimitivesUp)
	*/		*/
	type record AtsReq {		type record AtspReq {
	// TODO To be completed		// TODO To be completed
	} with {		} with {
	encode "LibIts_Interface"		encode "LibIts_Interface"
	@@ -343,7 +337,7 @@ module LibItsCalm_Interface {
	* @member msgIn Message monitored on the protocol port (INsapPrimitivesUp)		* @member msgIn Message monitored on the protocol port (INsapPrimitivesUp)
	* @member receptionTime Timestamp when then message is received by the test adapter (different than the generation generation timestamp)		* @member receptionTime Timestamp when then message is received by the test adapter (different than the generation generation timestamp)
	*/		*/
	type record AtsInd {		type record AtspInd {
	// TODO To be completed,		// TODO To be completed,
	Time48IAT receptionTime		Time48IAT receptionTime
	} with {		} with {
	@@ -363,7 +357,9 @@ module LibItsCalm_Interface {
	*/		*/
	type union UtInitialize {		type union UtInitialize {
	UtFntpInitialize utFntpInitialize,		UtFntpInitialize utFntpInitialize,
	UtFsapInitialize utFsapInitialize		UtFsapInitialize utFsapInitialize,
			UtIicpInitialize utIicpInitialize,
			UtAtspInitialize utAtspInitialize
	} with {		} with {
	encode "LibItsCommon_TypesAndValues"		encode "LibItsCommon_TypesAndValues"
	}		}
	@@ -391,7 +387,8 @@ module LibItsCalm_Interface {
	*/		*/
	type union UtEvent {		type union UtEvent {
	UtFntpEvent utFntpEvent,		UtFntpEvent utFntpEvent,
	UtFsapEvent utFsapEvent		UtFsapEvent utFsapEvent,
			UtAtspEvent utAtspEvent
	} with {		} with {
	encode "LibItsCommon_TypesAndValues"		encode "LibItsCommon_TypesAndValues"
	}		}
	@@ -401,7 +398,8 @@ module LibItsCalm_Interface {
	*/		*/
	type union UtEventInd {		type union UtEventInd {
	UtFntpEventInd utFntpEventInd,		UtFntpEventInd utFntpEventInd,
	UtFsapEventInd utFsapEventInd		UtFsapEventInd utFsapEventInd,
			UtAtspEventInd utAtspEventInd
	} with {		} with {
	encode "LibItsCommon_TypesAndValues"		encode "LibItsCommon_TypesAndValues"
	}		}
	@@ -420,14 +418,22 @@ module LibItsCalm_Interface {
	*/		*/
	type union CfInitialize {		type union CfInitialize {
	CfFntpInitialize cfFntpInitialize,		CfFntpInitialize cfFntpInitialize,
	CfFsapInitialize cfFsapInitialize		CfFsapInitialize cfFsapInitialize,
			CfAtspInitialize cfAtspInitialize
	} with {		} with {
	encode "LibItsCommon_TypesAndValues"		encode "LibItsCommon_TypesAndValues"
	}		}

	type union CfEventInd {		type union CfEventInd {
	CfFntpEventInd cfFntpEventInd,		CfFntpEventInd cfFntpEventInd,
	CfFsapEventInd cfFsapEventInd		CfFsapEventInd cfFsapEventInd,
			CfAtspEventInd cfAtspEventInd
			} with {
			encode "LibItsCommon_TypesAndValues"
			}

			type union CfEvent {
			CfAtspEvent cfAtspEvent
	} with {		} with {
	encode "LibItsCommon_TypesAndValues"		encode "LibItsCommon_TypesAndValues"
	}		}

ttcn/CALM/LibItsCalm_Pixits.ttcn3

+34 −17

Original line number	Original line	Diff line number	Diff line
	@@ -7,7 +7,7 @@ module LibItsCalm_Pixits {

	/**		/**
	* @desc Location of the IUT, which defines the interface(s) of the IUT for upper (/ lower) tester access.		* @desc Location of the IUT, which defines the interface(s) of the IUT for upper (/ lower) tester access.
	* Used for FNTP ATS		* Used for ATSP ATS
	* <li>ITS-S access layer: Upper tester access is via IN-SAP</li>		* <li>ITS-S access layer: Upper tester access is via IN-SAP</li>
	* <li>ITS-S networking & transport layer: Upper / lower tester access is via NF-SAP</li>		* <li>ITS-S networking & transport layer: Upper / lower tester access is via NF-SAP</li>
	* <li>ITS-S facilities layer: Upper / lower tester access is via FA-SAP</li>		* <li>ITS-S facilities layer: Upper / lower tester access is via FA-SAP</li>
	@@ -15,9 +15,9 @@ module LibItsCalm_Pixits {
	* <li>ITS-S security entity (not supported in the present document)</li>		* <li>ITS-S security entity (not supported in the present document)</li>
	* <li>ITS-S application entity (not supported in the present document)</li>		* <li>ITS-S application entity (not supported in the present document)</li>
	*/		*/
	modulepar Bit6 PX_LOC_ITS_FNTP_ACCESS_SETTINGS_MX_SAP_SET :=		modulepar Bit6 PX_LOC_ITS_ATSP_ACCESS_SETTINGS_MX_SAP_SET :=
	PX_IUT_AL_xT_AT_IN_SAP_UNSET &		PX_IUT_AL_xT_AT_IN_SAP_SET &
	PX_IUT_FNTP_xT_AT_NF_SAP_SET &		PX_IUT_FNTP_xT_AT_NF_SAP_UNSET &
	PX_IUT_FAC_xT_AT_FA_SAP_UNSET &		PX_IUT_FAC_xT_AT_FA_SAP_UNSET &
	PX_IUT_MGT_xT_AT_Mx_SAP_SET &		PX_IUT_MGT_xT_AT_Mx_SAP_SET &
	'00'B;		'00'B;
	@@ -32,16 +32,16 @@ module LibItsCalm_Pixits {
	* <li>ITS-S security entity (not supported in the present document)</li>		* <li>ITS-S security entity (not supported in the present document)</li>
	* <li>ITS-S application entity (not supported in the present document)</li>		* <li>ITS-S application entity (not supported in the present document)</li>
	*/		*/
	modulepar Bit6 PX_LOC_ITS_FNTP_ACCESS_SETTINGS_MX_SAP_UNSET :=		modulepar Bit6 PX_LOC_ITS_ATSP_ACCESS_SETTINGS_MX_SAP_UNSET :=
	PX_IUT_AL_xT_AT_IN_SAP_UNSET &		PX_IUT_AL_xT_AT_IN_SAP_SET &
	PX_IUT_FNTP_xT_AT_NF_SAP_SET &		PX_IUT_FNTP_xT_AT_NF_SAP_UNSET &
	PX_IUT_FAC_xT_AT_FA_SAP_UNSET &		PX_IUT_FAC_xT_AT_FA_SAP_UNSET &
	PX_IUT_MGT_xT_AT_Mx_SAP_UNSET &		PX_IUT_MGT_xT_AT_Mx_SAP_UNSET &
	'00'B;		'00'B;

	/**		/**
	* @desc Location of the IUT, which defines the interface(s) of the IUT for upper (/ lower) tester access.		* @desc Location of the IUT, which defines the interface(s) of the IUT for upper (/ lower) tester access.
	* Used for FSAP ATS		* Used for FNTP ATS
	* <li>ITS-S access layer: Upper tester access is via IN-SAP</li>		* <li>ITS-S access layer: Upper tester access is via IN-SAP</li>
	* <li>ITS-S networking & transport layer: Upper / lower tester access is via NF-SAP</li>		* <li>ITS-S networking & transport layer: Upper / lower tester access is via NF-SAP</li>
	* <li>ITS-S facilities layer: Upper / lower tester access is via FA-SAP</li>		* <li>ITS-S facilities layer: Upper / lower tester access is via FA-SAP</li>
	@@ -49,15 +49,16 @@ module LibItsCalm_Pixits {
	* <li>ITS-S security entity (not supported in the present document)</li>		* <li>ITS-S security entity (not supported in the present document)</li>
	* <li>ITS-S application entity (not supported in the present document)</li>		* <li>ITS-S application entity (not supported in the present document)</li>
	*/		*/
	modulepar Bit6 PX_LOC_ITS_FSAP_ACCESS_SETTINGS_MX_SAP_SET :=		modulepar Bit6 PX_LOC_ITS_FNTP_ACCESS_SETTINGS_MX_SAP_SET :=
	PX_IUT_AL_xT_AT_IN_SAP_UNSET &		PX_IUT_AL_xT_AT_IN_SAP_UNSET &
	PX_IUT_FNTP_xT_AT_NF_SAP_SET &		PX_IUT_FNTP_xT_AT_NF_SAP_SET &
	PX_IUT_FAC_xT_AT_FA_SAP_SET &		PX_IUT_FAC_xT_AT_FA_SAP_UNSET &
	PX_IUT_MGT_xT_AT_Mx_SAP_SET &		PX_IUT_MGT_xT_AT_Mx_SAP_SET &
	'00'B;		'00'B;

	/**		/**
	* @desc Location of the IUT, which defines the interface(s) of the IUT for upper (/ lower) tester access.		* @desc Location of the IUT, which defines the interface(s) of the IUT for upper (/ lower) tester access.
	* Used for FSAP ATS		* Used for FNTP ATS
	* <li>ITS-S access layer: Upper tester access is via IN-SAP</li>		* <li>ITS-S access layer: Upper tester access is via IN-SAP</li>
	* <li>ITS-S networking & transport layer: Upper / lower tester access is via NF-SAP</li>		* <li>ITS-S networking & transport layer: Upper / lower tester access is via NF-SAP</li>
	* <li>ITS-S facilities layer: Upper / lower tester access is via FA-SAP</li>		* <li>ITS-S facilities layer: Upper / lower tester access is via FA-SAP</li>
	@@ -65,13 +66,29 @@ module LibItsCalm_Pixits {
	* <li>ITS-S security entity (not supported in the present document)</li>		* <li>ITS-S security entity (not supported in the present document)</li>
	* <li>ITS-S application entity (not supported in the present document)</li>		* <li>ITS-S application entity (not supported in the present document)</li>
	*/		*/
	modulepar Bit6 PX_LOC_ITS_FSAP_ACCESS_SETTINGS_MX_SAP_UNSET :=		modulepar Bit6 PX_LOC_ITS_FNTP_ACCESS_SETTINGS_MX_SAP_UNSET :=
	PX_IUT_AL_xT_AT_IN_SAP_UNSET &		PX_IUT_AL_xT_AT_IN_SAP_UNSET &
	PX_IUT_FNTP_xT_AT_NF_SAP_SET &		PX_IUT_FNTP_xT_AT_NF_SAP_SET &
	PX_IUT_FAC_xT_AT_FA_SAP_SET &		PX_IUT_FAC_xT_AT_FA_SAP_UNSET &
	PX_IUT_MGT_xT_AT_Mx_SAP_UNSET &		PX_IUT_MGT_xT_AT_Mx_SAP_UNSET &
	'00'B;		'00'B;

			/**
			* @desc Location of the IUT, which defines the interface(s) of the IUT for upper (/ lower) tester access.
			* Used for FSAP ATS
			* <li>ITS-S access layer: Upper tester access is via IN-SAP</li>
			* <li>ITS-S networking & transport layer: Upper / lower tester access is via NF-SAP</li>
			* <li>ITS-S facilities layer: Upper / lower tester access is via FA-SAP</li>
			* <li>ITS-S management entity: Upper / lower tester access is via MX-SAPs</li>
			* <li>ITS-S security entity (not supported in the present document)</li>
			* <li>ITS-S application entity (not supported in the present document)</li>
			*/
			modulepar Bit6 PX_LOC_ITS_FSAP_ACCESS_SETTINGS_MX_SAP_SET :=
			PX_IUT_AL_xT_AT_IN_SAP_UNSET &
			PX_IUT_FNTP_xT_AT_NF_SAP_SET &
			PX_IUT_FAC_xT_AT_FA_SAP_SET &
			PX_IUT_MGT_xT_AT_Mx_SAP_SET &
			'00'B;
	/**		/**
	* @desc Location of the IUT, which defines the interface(s) of the IUT for upper (/ lower) tester access.		* @desc Location of the IUT, which defines the interface(s) of the IUT for upper (/ lower) tester access.
	* Used for FSAP ATS		* Used for FSAP ATS
	@@ -82,10 +99,10 @@ module LibItsCalm_Pixits {
	* <li>ITS-S security entity (not supported in the present document)</li>		* <li>ITS-S security entity (not supported in the present document)</li>
	* <li>ITS-S application entity (not supported in the present document)</li>		* <li>ITS-S application entity (not supported in the present document)</li>
	*/		*/
	modulepar Bit6 PX_LOC_ITS_IICP_ACCESS_SETTINGS_MX_SAP_UNSET :=		modulepar Bit6 PX_LOC_ITS_FSAP_ACCESS_SETTINGS_MX_SAP_UNSET :=
	PX_IUT_AL_xT_AT_IN_SAP_UNSET &		PX_IUT_AL_xT_AT_IN_SAP_UNSET &
	PX_IUT_FNTP_xT_AT_NF_SAP_UNSET &		PX_IUT_FNTP_xT_AT_NF_SAP_SET &
	PX_IUT_FAC_xT_AT_FA_SAP_UNSET &		PX_IUT_FAC_xT_AT_FA_SAP_SET &
	PX_IUT_MGT_xT_AT_Mx_SAP_UNSET &		PX_IUT_MGT_xT_AT_Mx_SAP_UNSET &
	'00'B;		'00'B;

ttcn/CALM/LibItsCalm_TestSystem.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@ module LibItsCalm_TestSystem {
	// NT3 ports		// NT3 ports
	port FntpPort fntpPort; // Fast Network & Transport layer Protocol		port FntpPort fntpPort; // Fast Network & Transport layer Protocol
	//		//
	port AtsPort atsPort; // Access Layer port		port AtspPort atspPort; // Access Layer port
	} // End of component ItsCalmSystem		} // End of component ItsCalmSystem

	} // End of group componentDefinitions		} // End of group componentDefinitions