Commit bdcdc250 authored by rennoch's avatar rennoch
Browse files

modified 410_008 with two variants

parent a733e3e4
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 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;
+1 −1
Original line number Diff line number Diff line
@@ -2824,7 +2824,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_410_008()) ;
									
			   // 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_008			
+42 −1
Original line number Diff line number Diff line
@@ -656,6 +656,17 @@ group SipIsup_ISUP_Receive_MsgsTempl
	 endOfOptionalParameters := '00000000'B ifpresent       /* End of optional parameters, O, len=1 */
	}

	
	template CON_MSG mw_CON_RNS(template CPN_PAR_tlv p_CNN, template ATP_PAR_tlv p_AT_CNSU, template GNU_PAR_tlv p_GNU, template RNS_PAR_tlv p_RNS) :=
	/* RX template for Connect message (CON) with Interworking indicator, ISDN user part indicator and ISDN access indicator parameterized, and with 'any' optional parameters.*/
	{
	 msgType := '00000111'B,                                /* Message Type '00000111'B */
	 backwardCallIndicators := mw_BCI_PAR_v_any,							/* Backward call indicators, F, len=2 */
	 pOptional := ?,                                        /* Pointer to optional parameters. */
	 optionalParameters := mw_CON_OPTIONAL_PARAMS(p_CNN, p_AT_CNSU, p_GNU, p_RNS),      /* SET: optional parameters of Connect message (CON) */
	 endOfOptionalParameters := '00000000'B ifpresent       /* End of optional parameters, O, len=1 */
	}
	
	template CON_MSG mw_CON_BCI3(Bit1 p_interwInd, Bit1 p_isdnUpInd, Bit1 p_isdnAccInd) :=
	/* RX template for Connect message (CON) with Interworking indicator, ISDN user part indicator and ISDN access indicator parameterized, and with 'any' optional parameters.*/
	{
@@ -720,6 +731,16 @@ group SipIsup_ISUP_Receive_MsgsTempl
			endOfOptionalParameters := '00000000'B ifpresent       /* End of optional parameters, O, len=1 */
		}	

	template CPG_MSG mw_CPG_RNS(template RNS_PAR_tlv p_RNS) :=
		/* RX template for Call progress message (CPG) with event information parameterized, and with 'any' optional parameters. */
		{
			msgType := '00101100'B,                                /* Message Type '00101100'B */
			eventInformation := *,          /* Event information, F, len=1 */
			pOptional := '00000001'B,                              /* Pointer to optional parameters. */
			optionalParameters := mw_CPG_USED_OPTIONAL_PARAMS(* ,*, *,p_RNS, *, *), /* SET: optional parameters of Call progress message (CPG) */
			endOfOptionalParameters := '00000000'B ifpresent       /* End of optional parameters, O, len=1 */
		}
		
	template CPG_MSG mw_CPG_EVI_GNI_CTN(Bit7 p_eventInd, template GNI_PAR_tlv p_GNI, template CTN_PAR_tlv p_CTN) :=
	/* RX template for Call progress message (CPG) with event information and Generic notification indicator parameterized, and with 'any' other optional parameters. */
	{
@@ -1645,6 +1666,16 @@ group SipIsup_ISUP_Transmit_Msgs_Templ
	 endOfOptionalParameters := omit	 	                 /* End of optional parameters, O, len=1 */
	}

	template CON_MSG m_CON_RDNR(template RNS_PAR_tlv p_RDNR) := 
	/* TX template for Connect message (CON) with Redirection number restriction parameterized, and without other optional parameters.*/
	{
		msgType := '00000111'B,                                /* Message Type '00000111'B */
	 	backwardCallIndicators := m_BCI_Def,                    /* Backward call indicators, F, len=2 */
		pOptional := '00000001'B,                              /* Pointer to optional parameters. */
		optionalParameters := m_CON_USED_OPTIONAL_PARAMS(omit, omit, omit, p_RDNR), /* SET: optional parameters of CON */
		endOfOptionalParameters := '00000000'B                 /* End of optional parameters, O, len=1 */
	}

	template CON_MSG m_CON_BCI(Bit2 p_cldPstatInd) :=
	/* TX template for Connect message (CON) with default BCI, and no optional parameters except Call History Information.*/
	{
@@ -1729,6 +1760,16 @@ group SipIsup_ISUP_Transmit_Msgs_Templ
	 endOfOptionalParameters := '00000000'B                 /* End of optional parameters, O, len=1 */
	}
	
	template CPG_MSG m_CPG_EVI_RDNR(Bit7 p_eventInd, template RNS_PAR_tlv p_RNS) :=
	/* TX template for Call progress message (CPG) with event information = 'progress' and withRedirection number, call diversion information, redirection number restriction and generic notification set to "Call is diverting"*/
	{
		msgType := '00101100'B,                                /* Message Type '00101100'B */
		eventInformation := m_EventInfo(p_eventInd), /* Event information, F, len=1 */
		pOptional := '00000001'B,                              /* Pointer to optional parameters. */
		optionalParameters := m_CPG_OPTIONAL_PARAMS_CDI(omit, omit, omit, p_RNS), /* SET: optional parameters of Call progress message (CPG) */
		endOfOptionalParameters := '00000000'B                 /* End of optional parameters, O, len=1 */
	}
	
	template CPG_MSG m_CPG_EVI_GNI(Bit7 p_eventInd, template GNI_PAR_tlv p_GNI) :=
	/* TX template for Call progress message (CPG) with event information and Generic notification indicator parameterized, and without other optional parameters. */
	{
+29 −7
Original line number Diff line number Diff line
@@ -13781,7 +13781,7 @@ group TP403_COLP {
	  { 
		f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());//Synchsonisation point 1
		
		/*Send default ANM message*/
		/*Send default CON message*/
		f_send_CON(m_CON_CNN_AT_GEN(m_ConnNum_allowed(c_CNN_natAddrInd_natSig, c_CNN_screenInd_userProv, PX_ISUP_TX_CPN_addrSignals_txNat),m_AT_ConnSub_Def, m_GenericNum_ConnNum(c_GEN_natAddrInd_natSig, c_GEN_screenInd_userNotVerif, PX_ISUP_TX_GEN_addrSignals_txNat)), true);
	  }	  
	  // Check Conversation
@@ -17319,6 +17319,7 @@ group TP410_CFB_CFNR_CFU_CD {
	
	function f_IsupBicc_TC_410_008() runs on IsupBiccComponent
	{
  		var integer v_VA := PX_TC410_008_VA;
  		var FncRetCode v_ret := e_error;

		// Perform preamble
@@ -17332,13 +17333,34 @@ group TP410_CFB_CFNR_CFU_CD {
		/*Await IAM message with original called number, redirecting number, redirecting information and without other optional parameters*/
		f_awaiting_IAM(mw_IAM_OCN_RDGN_RDNI(mw_OCN_PAR_tlv_any, mw_RDN_PAR_tlv_any, mw_RDI_PAR_tlv_any));


		/*Send ACM and ANM in case A (v_VA = 1), otherwice send CON  */
		if (v_VA == 1)
		{
			/*Send Address complete message (ACM) with default BCI, Call diversion information, Generic notification indicator = 'call is diverting', default Redirection number and Redirection number restriction, and without other optional parameters.*/
			f_send_ACM(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), true);

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

		/*Send default ANM message*/
	  		/*Send CPG message*/
			f_send_CPG(m_CPG_EVI_RDNR(c_EVI_eventInd_alert,m_RedirNumRestr_Def), true);

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

			/*Send ANM message*/
			f_send_ANM(m_ANM_RDNR(m_RedirNumRestr_Def), true);
		}
		else
		{ 
        	f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());//Synchsonisation point 1
			f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict());//Synchronisation point 2
        		
        	/*Send default CON message*/
			f_send_CON(m_CON_RDNR(m_RedirNumRestr_Def), true);
		}	 




		// Check Conversation
		f_IsupBicc_CheckConversation();
+2 −0
Original line number Diff line number Diff line
@@ -3643,6 +3643,8 @@ group TP410_CFB_CFNR_CFU_CD {

		f_mwANM_v(mw_ANM_RNS(mw_RNS_PAR_def));
		
		f_mwCON_v(mw_CON_RNS(*, *, *,mw_RNS_PAR_def));		
		
		/*function with default mREL and mwRLC messages*/	
		f_mREL_mwRLC();
		
Loading