Changes due to library approach (9c0fe776) · Commits · INT - Core Network and Interoperability Testing / IMS / IMS_CON_SS

AtsCommon/SipIsup_PICS.ttcn→AtsCommon/SS_Ims_PICS.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		* ETSI ES 186 009-1 V0.0.3
		*/

		module SipIsup_PICS {
		module SS_Ims_PICS {
		group PICS_Module_Parameters
		{
		modulepar {

AtsCommon/SipIsup_PIXITS.ttcn→AtsCommon/SS_Ims_PIXITS.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		* @desc This module contains the PIXIT parameters
		*/

		module SipIsup_PIXITS {
		module SS_Ims_PIXITS {

		import from LibCommon_BasicTypesAndValues all;
		import from LibCommon_DataStrings all;

AtsCommon/SipIsup_SS_TCFunctions.ttcn→AtsCommon/SS_Ims_TCFunctions.ttcn

+3 −5

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		* 186 017 - 2 ACR/CB
		* 186 018 - 2 MCID
		*/
		module SipIsup_SS_TCFunctions {
		module SS_Ims_TCFunctions {
		//LibCommon
		import from LibCommon_Sync all;
		import from LibCommon_VerdictControl all;
		@@ -29,10 +29,8 @@ module SipIsup_SS_TCFunctions {
		import from LibIms_SIPTypesAndValues all;
		import from LibIms_Interface all;
		import from LibIms_PIXITS all;
		//IsupAts
		import from SipIsup_ISUP_ModuleParams all; // for timer values e.g. PX: T7, T9
		import from SipIsup_PIXITS all;
		import from SipIsup_ISUP_Constants all;
		//AtsCommon
		import from SS_Ims_PIXITS all;

		//Type to adress the IUT to send it message
		//type Address address;

AtsCommon/SipIsup_TestConfiguration.ttcn→AtsCommon/SS_Ims_TestConfiguration.ttcn

+3 −82

Original line number	Diff line number	Diff line
		@@ -7,16 +7,11 @@
		* test configurations.
		*
		*/
		module SipIsup_TestConfiguration {
		module SS_Ims_TestConfiguration {

		//LibCommon
		import from LibCommon_Sync all ;
		import from LibCommon_VerdictControl all;
		//AtsSipIsup
		import from SipIsup_TestSystem all;
		import from SipIsup_ISUP_ModuleParams all;
		import from SipIsup_ISUP_ParamTypes all;
		import from SipIsup_ISUP_MsgTypes all;
		//LibSip
		import from LibSip_SIPTypesAndValues all;
		import from LibSip_Interface all;
		@@ -39,86 +34,16 @@

		}//end group auxSipFunction

		group syncCommands {
		const charstring c_syncSip_Isup := "syncSipIsup";
		}//end group syncCommands

		group cfUp {

		/**
		*
		* @desc Creates test configuration of Ims and Isup component
		* @param p_imsComponen ims component
		* @param p_isupBiccComponent isup component
		*/
		function f_cf_imsIsupUp( out ImsComponent p_imsComponent,
		out IsupBiccComponent p_isupBiccComponent)
		runs on ServerSyncComp {
		//Variables
		var FncRetCode v_ret := e_success;
		//Create
		p_imsComponent := ImsComponent.create ;
		p_isupBiccComponent := IsupBiccComponent.create ;
		//Connect
		connect(p_imsComponent:syncPort, self:syncPort) ;
		map(p_imsComponent:SIPP, system:IMSCN1); // Init test Configuration
		// TODO check if opPort will be used
		//if (PX_SIP_CheckConversation)
		// {map(p_imsComponent:opPort, system:opPortS);} // Init test Configuration
		connect(p_isupBiccComponent:syncPort, self:syncPort) ;
		//Map
		if (PX_IsupBicc_CheckConversation or PX_IsupBicc_CheckRinging)
		{map(p_isupBiccComponent:opPort_IsupBicc, system:opPortS_IsupBicc);} // Init test Configuration
		// note-axr: workaround to avoid enumerated PIXIT parameter
		// if (PX_ISUP_IsupOrBicc == selectIsup) {
		if (PX_ISUP_Isup) {
		map(p_isupBiccComponent:IsupBiccP, system:atm);
		}
		else {
		map(p_isupBiccComponent:IsupBiccP, system:atm);
		}
		//map(p_sipComponent:SIPP, system:UDP1);

		f_setVerdict(v_ret);
		}//end f_cf_imsIsupUp

		}//end group cfUp

		group cfDown {

		/**
		*
		* @desc Deletes test configuration of Ims and Isup component
		* @param p_imsComponen ims component
		* @param p_isupBiccComponent isup component
		*/
		function f_cf_imsIsupDown( in ImsComponent p_imsComponent,
		in IsupBiccComponent p_isupBiccComponent)
		runs on ServerSyncComp {
		var FncRetCode v_ret;
		f_serverWaitForAllClientsToStop();
		//Variables
		v_ret := e_success;
		//Disconnect
		disconnect(p_imsComponent:syncPort, self:syncPort) ;
		disconnect(p_isupBiccComponent:syncPort, self:syncPort) ;
		//Unmap
		// note-axr: workaround to avoid enumerated PIXIT parameter
		// if (PX_ISUP_IsupOrBicc == selectIsup) {
		if (PX_ISUP_Isup) {
		unmap(p_isupBiccComponent:IsupBiccP, system:atm ); // IsupP
		}
		else {
		unmap(p_isupBiccComponent:IsupBiccP, system:atm); // BiccP
		}
		unmap(p_imsComponent:SIPP, system:IMSCN1);
		// TODO check if opPort will be used
		//if (PX_SIP_CheckConversation)
		// {unmap(p_imsComponent:opPort, system:opPortS);}
		if (PX_IsupBicc_CheckConversation or PX_IsupBicc_CheckRinging)
		{unmap(p_isupBiccComponent:opPort_IsupBicc, system:opPortS_IsupBicc);} // Init test Configuration

		}//end f_cf_imsIsupDown
		}//end cfDown

		group syncNoStop // Same functions as in LibCommon but without call of f_serverWaitForAllClientsToStop()
		{
		@@ -199,8 +124,4 @@
		}
		} //end group syncNoStop

		} //end group cfDown



		} // end module SipIsup_TestConfiguration
		No newline at end of file

AtsCommon/SipIsup_TestExecution.ttcn→AtsCommon/SS_Ims_TestExecution.ttcn

+5 −5

Original line number	Diff line number	Diff line
		module SipIsup_TestExecution {
		module SS_Ims_TestExecution {

		//LobCommon
		import from LibCommon_BasicTypesAndValues all;
		//AtsCommon
		import from SipIsup_PIXITS all;
		import from SipIsup_Testcases all;
		import from SS_Ims_PIXITS all;
		import from SS_Ims_Testcases all;
		//SipAts
		import from LibSip_SIPTypesAndValues all;
		import from SipIsup_PICS all;
		//import from SipIsup_PICS all;

		control {

		@@ -24,4 +24,4 @@ module SipIsup_TestExecution {

		}//end control

		} // end module SipIsup_TestExecution
		No newline at end of file
		} // end module SS_Ims_TestExecution
		No newline at end of file