Commit bf4dd5d6 authored by schmitting's avatar schmitting
Browse files

Some PIXIT modification

parent a9a2ef5b

AtsCommon/SipIsup_IMS_TCFunctions.ttcn

+18 −18
Original line number Diff line number Diff line
@@ -4553,7 +4553,7 @@ module SipIsup_IMS_TCFunctions { 
            

                 //Awaiting INVITE	

            

            	 f_wait(PX_Timeout_TOIW1 - PX_Timeout_TOIW1/0.1); // wait T(I/W)1 before INVITE arrives

            	 f_wait(PX_Timeout_Tiw1 - PX_Timeout_Tiw1/0.1); // wait T(I/W)1 before INVITE arrives

            	 

                 f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));

                 f_sendResponse(m_Response_18XonINVITE(c_statusLine180,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact));
@@ -6176,7 +6176,7 @@ module SipIsup_IMS_TCFunctions { 
                

                    //Awaiting INVITE	

                

                	f_wait(PX_Timeout_TOIW1 - PX_Timeout_TOIW1/0.1); // wait T(I/W)1 before INVITE arrives

                	f_wait(PX_Timeout_Tiw1 - PX_Timeout_Tiw1/0.1); // wait T(I/W)1 before INVITE arrives

    				f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); // Synchronisation point 1

                    f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));

                    f_sendResponse(m_Response_18XonINVITE(c_statusLine183,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact));
@@ -6639,7 +6639,7 @@ module SipIsup_IMS_TCFunctions { 
					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

					// TESTBODY

					

					f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

					f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

					//Awaiting INVITE	

					f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));

					f_sendResponse(m_Response_18XonINVITE(c_statusLine180,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact));
@@ -6669,7 +6669,7 @@ module SipIsup_IMS_TCFunctions { 
					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

					// TESTBODY

					

					f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

					f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

					//Awaiting INVITE	

					f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));

					f_sendResponse(m_Response_18XonINVITE(c_statusLine183,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact));
@@ -6699,7 +6699,7 @@ module SipIsup_IMS_TCFunctions { 
					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

					// TESTBODY

					

					f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

					f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

					//Awaiting INVITE	

					f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));
@@ -6768,7 +6768,7 @@ module SipIsup_IMS_TCFunctions { 
					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

					// TESTBODY

					

					f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

					f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

					//Awaiting INVITE	

					f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));
@@ -6801,7 +6801,7 @@ module SipIsup_IMS_TCFunctions { 
    				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

    				// TESTBODY

    

    				f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

    				f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

    				//Awaiting INVITE	 

    				f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));

                    select(PX_TC_VA) {
@@ -6836,7 +6836,7 @@ module SipIsup_IMS_TCFunctions { 
    				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

    				// TESTBODY

    

    				f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

    				f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

    				//Awaiting INVITE	 

    				f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));
@@ -6870,7 +6870,7 @@ module SipIsup_IMS_TCFunctions { 
    				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

    				// TESTBODY

    

    				f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

    				f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

    				//Awaiting INVITE	

    				//Check PSTN XML parameters regarding specification 

    				f_awaitingINVITE(mw_INVITE_Request_IMS_pstn(*,*,*,*,mw_PSTN_transit_bc(mw_BearerCapabilityType_TrfCap(PX_BearerCapabilityInformationTransferCapability),
@@ -6907,7 +6907,7 @@ module SipIsup_IMS_TCFunctions { 
    				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

    				// TESTBODY

    

    				f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

    				f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

    				//Awaiting INVITE	

    				//Check PSTN XML parameters regarding specification 

    				f_awaitingINVITE(mw_INVITE_Request_IMS_pstn(*,*,*,*,mw_PSTN_transit_bc(mw_BearerCapabilityType_TrfCap(PX_BearerCapabilityInformationTransferCapability),
@@ -6940,7 +6940,7 @@ module SipIsup_IMS_TCFunctions { 
    				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

    				// TESTBODY

    

    				f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

    				f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

    				//Awaiting INVITE	

    				//Check PSTN XML parameters regarding specification 

    				f_awaitingINVITE(mw_INVITE_Request_IMS_pstn(*,*,*,*,mw_PSTN_transit_bc(mw_BearerCapabilityType_TrfCap(PX_BearerCapabilityInformationTransferCapability),
@@ -6977,7 +6977,7 @@ module SipIsup_IMS_TCFunctions { 
    				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

    				// TESTBODY

    

    				f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

    				f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

    				//Awaiting INVITE	

    				f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));
@@ -7009,7 +7009,7 @@ module SipIsup_IMS_TCFunctions { 
    				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

    				// TESTBODY

    

    				f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

    				f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

    				//Awaiting INVITE	

    				f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));
@@ -7042,7 +7042,7 @@ module SipIsup_IMS_TCFunctions { 
					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

					// TESTBODY

					

					f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

					f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

					//Awaiting INVITE	

					f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));
@@ -7075,7 +7075,7 @@ module SipIsup_IMS_TCFunctions { 
    				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

    				// TESTBODY

    

    				f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

    				f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

    				//Awaiting INVITE	 

    				f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));

                    select(PX_TC_VA) {
@@ -7109,7 +7109,7 @@ module SipIsup_IMS_TCFunctions { 
    				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

    				// TESTBODY

    

    				f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

    				f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

    				//Awaiting INVITE	 

    				f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));
@@ -7140,7 +7140,7 @@ module SipIsup_IMS_TCFunctions { 
                    f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

                    // TESTBODY

                

    				f_wait(PX_SIP_Tiw1); // may be replaced by c_sync1

    				f_wait(PX_Timeout_Tiw1); // may be replaced by c_sync1

                    //Awaiting INVITE	           

                    f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));
@@ -8284,7 +8284,7 @@ module SipIsup_IMS_TCFunctions { 
					f_sendResponse(m_Response_4XXonINVITE(v_statusLine[PX_TC_VA],vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact));

					f_awaitingACK(mw_ACK_Request_Base(vc_callId));

					

					f_wait(PX_Timeout_TOIW3 - PX_Timeout_TOIW3/0.1); // wait T(I/W)3 before end

					f_wait(PX_Timeout_Tiw3 - PX_Timeout_Tiw3/0.1); // wait T(I/W)3 before end

					

					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync point

AtsCommon/SipIsup_PIXITS.ttcn

+4 −8
Original line number Diff line number Diff line
@@ -98,17 +98,13 @@ module SipIsup_PIXITS { 
	*/

	integer PX_SIP_MESSAGE_VA:=1;



	/** @desc	float default value for Ti/w1 (4 - 6s, default 4s)

	/** @desc	float Nominal timeout value of ISUP/SIP interworking protocol timer Ti/w1 (4 - 6s, default 4s)

	*/

	float        PX_SIP_Tiw1 := 4.0;

	float        PX_Timeout_Tiw1 := 4.0;



	/** @desc	float default value for Ti/w2 (4 - 6s, default 4s)

	/** @desc	float  Nominal timeout value of ISUP/SIP interworking protocol timer Ti/w3 (4 - 6s, default 4s)

	*/

	float        PX_SIP_Tiw2 := 4.0;

	

	/** @desc	float default value for Ti/w3 (4 - 6s, default 4s)

	*/

	float        PX_SIP_Tiw3 := 4.0;

	float        PX_Timeout_Tiw3 := 4.0;

	

    /** @desc	NameAddr default value for From field 

     * 			used in groupe 501

IsupAts/SipIsup_ISUP_ModuleParams.ttcn

+0 −10
Original line number Diff line number Diff line
@@ -123,16 +123,6 @@ float PX_Timeout_T9 := 135.0; 
*/

float		PX_Timeout_T39 := 120.0;



/* @desc	Nominal timeout value of ISUP/SIP interworking protocol timer TOIW1

** @remark	PICS/PIXIT Reference:	TISPAN DTS 06014-3, Table A3, item 3.12

*/

float		PX_Timeout_TOIW1 := 4.0;



/* @desc	Nominal timeout value of ISUP/SIP interworking protocol timer TOIW3

** @remark	PICS/PIXIT Reference:	TISPAN DTS 06014-3, Table A3, item 3.13

*/

float		PX_Timeout_TOIW3 := 4.0;



/* true if conversation check is used

** @remark	PICS/PIXIT Reference: TISPAN DTS 06014-3, Table A4, item 4.1

*/

IsupAts/SipIsup_ISUP_TCFunctions.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -5093,7 +5093,7 @@ function f_IsupBicc_TC_301_003() runs on IsupBiccComponent 
function f_IsupBicc_TC_301_004() runs on IsupBiccComponent

{



  var float v_timeout := PX_Timeout_TOIW1;

  var float v_timeout := PX_Timeout_Tiw1;

  var float v_timeout_min := (v_timeout)*0.9;

	

  // Perform preamble
@@ -10590,7 +10590,7 @@ group TP309_AutonomousRelease{ 
/* -----------------------------------TEST CASE TC309001------------------------------------*/

function f_IsupBicc_TC_309_001() runs on IsupBiccComponent

{

  var float v_timeout_min := PX_SIP_Tiw3 * 0.9;

  var float v_timeout_min := PX_Timeout_Tiw3 * 0.9;



  // Perform preamble

  f_IsupBicc_Pre0();