Commit 0369a5f7 authored by rennoch's avatar rennoch
Browse files

modified TC_410_007

parent d95e69e1

CommonAts/ttcn/SIPI_PIXITS.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ group TestCaseVariants { 
	integer PX_TC404_007_VA := 1;

	integer PX_TC405_004_VA := 1;

	integer PX_TC407_003_VA := 1;

	integer PX_TC410_008_VA := 1;

 	integer PX_TC409_007_VA := 1;

 	integer PX_TC409_008_VA := 1;

 	integer PX_TC410_001_VA := 1;
@@ -79,6 +78,8 @@ group TestCaseVariants { 
	integer PX_TC410_004_VA := 1;

	integer PX_TC410_005_VA := 1;

	integer PX_TC410_006_VA := 1;

	integer PX_TC410_007_VA := 1;

	integer PX_TC410_008_VA := 1;

	}

}//end of group TestCaseVariants

CommonAts/ttcn/SIPI_TestCases_SupplementaryServices.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -2798,7 +2798,7 @@ 
			   v_isupBiccComponent.start(f_IsupBicc_TC_410_007()) ;

									

			   // synchronize both PTCs on sychronization points

			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_tbDone});

			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_uPlane, c_tbDone});

									

			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									

			} //end TC_410_007

ISUPAts/ttcn/SIPI_ISUP_TCFunctions.ttcn

+30 −7
Original line number Diff line number Diff line
@@ -17281,6 +17281,7 @@ group TP410_CFB_CFNR_CFU_CD { 


	function f_IsupBicc_TC_410_007() runs on IsupBiccComponent

	{

	  var integer v_VA := PX_TC410_007_VA;

	  var FncRetCode v_ret := e_error;



	  // Perform preamble
@@ -17294,14 +17295,36 @@ group TP410_CFB_CFNR_CFU_CD { 
	  /*Send Initial address message (IAM) with default (F) and (V) parameters, with default Original called number, Redirecting number and Redirection information and with no other optional parameters except Propagation delay counter.*/

	  f_send_IAM(m_IAM_OCN_RDGN_RDNI(m_OCN_Def(PX_ISUP_TX_OCN_addrSignals_Nat), m_RDGN_Def(PX_ISUP_TX_RDN_addrSignals_Nat), m_RDNI_Def));



	  /*Awaiting default ACM message*/

		/* await ACM, CPG and ANM in case A (v_VA = 1), otherwice await CON  */

		if (v_VA == 1)

		{

            

    	  /*Awaiting ACM message*/

    	  f_awaiting_ACM(mw_ACM_RNS(mw_RNS_PAR_def));

    

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

    	  

	  /*Await default ANM message*/

		  /*Receive Call progress message (CPG) */

		  f_awaiting_CPG(mw_CPG_RNS(mw_RNS_PAR_def));

    

    	  f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict());//Synchronisation point 2



    	  /*Await ANM message*/

    	  f_awaiting_ANM(mw_ANM_RNS(mw_RNS_PAR_def));



		}

		else

		{ 

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

			f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict());//Synchronisation point 2

        		

			/* Awaiting CON message*/

			f_awaiting_CON(mw_CON_RNS(*, *, *,mw_RNS_PAR_def));		



		}	





  

	  // Check Conversation

	  f_IsupBicc_CheckConversation();

SIPAts/ttcn/SIPI_SIP_EncapsISUP.ttcn

+4 −0
Original line number Diff line number Diff line
@@ -3628,8 +3628,12 @@ group TP410_CFB_CFNR_CFU_CD { 


		f_mACM_v(m_ACM_RDNN_CDI_RDNR_GNI(c_BCI_cldPstatInd_subFree, m_CallDivInfo_Def, m_GenNotifInd(c_GNI_gNotInd_diverting), m_RDNN_Def(PX_ISUP_TX_RNN_addrSignals_Nat), m_RedirNumRestr_Def));



		f_mCPG_v(m_CPG_EVI_CDI(c_EVI_eventInd_alert, omit, omit, omit, m_RedirNumRestr_Def));



		f_mANM_v(m_ANM_RDNR(m_RedirNumRestr_Def));

		

		f_mCON_v(m_CON_RDNR(m_RedirNumRestr_Def));

				

		/*function with default mwREL and mRLC messages*/	

		f_mwREL_mRLC();

SIPAts/ttcn/SIPI_SIP_TCFunctions.ttcn

+23 −2
Original line number Diff line number Diff line
@@ -13344,6 +13344,7 @@ module SIPI_SIP_TCFunctions { 
					deactivate;

			} // end function f_Sip_TC_410_006

			function f_Sip_TC_410_007(in CSeq p_cSeq_s) runs on SipComponent {

				var integer v_VA := PX_TC410_008_VA-1;

				var FncRetCode v_ret := e_error;

				var default v_def := activate (a_Sip_catchSyncStop());

				// handle syncServerStop signal receipt
@@ -13359,13 +13360,33 @@ module SIPI_SIP_TCFunctions { 
				//awaiting INVITE with encapsulated ISUP and IAM

				f_awaitingInviteRequest(mw_INVITE_Request_MIME(vc_iam_msg), true);



				f_send180_Encaps(false, false, valueof(vc_acm_msg));



				// cases A (CPG/ACM/ANM) and B (CON)								

				if (v_VA == 0)

				{

					

				//sending 183,  ACM encapsulated				

				f_send183_Encaps(false, valueof(vc_acm_msg));



				f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

				//sending 180,  CPG encapsulated				

				f_send180_Encaps(false, false, valueof(vc_cpg_msg));



				f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict());

		

				//sending 200 OK,  ANM encapsulated

				f_send200OKInvite_Encaps(valueof(vc_anm_msg));

				f_awaitingAckRequest(vc_cSeq);



    			} 

    			else 

    			{

   				f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

				f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict());    					

				f_send200OKInvite_Encaps(valueof(vc_con_msg));

    			}



				

				// check Conversation

				f_check_Conversation();