Commit 5bb54c2e authored by garciay's avatar garciay
Browse files

corrections due to validation session 1-5 february 2010

parent 54e003d7
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
@@ -571,6 +571,14 @@ group ISUPTimer{
	*/
	float		PX_Timeout_T9 := 135.0;

	/** @desc	Nominal timeout (float) value of ISUP protocol timer T16 (RLC timer)
	*/
	float		PX_Timeout_T16 := 30.0;

	/** @desc	Nominal timeout (float) value of ISUP protocol timer T18 (CGBA timer)
	*/
	float		PX_Timeout_T18 := 15.0;

	/** @desc	Nominal timeout (float) value of ISUP/SIP interworking protocol timer TOIW1
	   @remark	PICS/PIXIT Reference:	ETSI TS 186002-5, Table A5
	*/
@@ -969,11 +977,6 @@ group MessagePar {
	*/
	charstring		PX_ISUP_SAM_SQN_digits_rx2 := "2";

	/** @desc	characterstring for 'address digits' value sent in the 'Subsequent number' parameter in the first SAM message, containing the middle part of the number, where the IAM contained less than the minimum digits to route the call.
	   @remark	PICS/PIXIT Reference: ETSI TS 186002-5, Table A7
	*/
	charstring		PX_ISUP_SAM_SQN_digits_txMidLess := "0";

	/** @desc	characterstring for 'address digits' value sent in the 'Subsequent number' parameter in the first SAM message, containing the final part of the number, where the IAM contained less than the minimum digits to route the call.
	   @remark	PICS/PIXIT Reference: ETSI TS 186002-5, Table A7
	*/
+2 −2
Original line number Diff line number Diff line
@@ -4076,7 +4076,7 @@
				   v_isupBiccComponent.start(f_IsupBicc_TC_302_018()) ;
									
				   // 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);		
@@ -4913,7 +4913,7 @@
				   v_isupBiccComponent.start(f_IsupBicc_TC_309_002()) ;
									
				   // synchronize both PTCs on sychronization points
				   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_tbDone});
				   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_tbDone});
									
				   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
				} //end TC_309_002		
+44 −45
Original line number Diff line number Diff line
@@ -3868,7 +3868,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_412_017()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_412_017			
@@ -4002,34 +4002,7 @@
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_412_022			

			/*  
			* @desc TC_412_023
			* @param loc_CSeq_s Transaction Id  
			*/  
			testcase TC_412_023(inout CSeq loc_CSeq_s)
			runs on ServerSyncComp
			system TestAdapter 
			{
			   //Variables
			   var SipComponent v_sipComponent ;
			   var IsupBiccComponent v_isupBiccComponent;
									        
			   f_cf00Up(v_sipComponent, v_isupBiccComponent);
									
			   //Start
			   f_IncCSeq(loc_CSeq_s); 
										   
			   v_sipComponent.start(f_Sip_TC_412_023(loc_CSeq_s));
			   v_isupBiccComponent.start(f_IsupBicc_TC_412_023()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane/*, c_sync3*/, c_uPlane, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_412_023			
		} // end group TP412_ECT
				
		group TP413_3PTY {
			/*  
			* @desc TC_413_001
@@ -4052,7 +4025,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_413_001()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_uPlane, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_413_001			
@@ -4078,7 +4051,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_413_002()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_uPlane, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_413_002			
@@ -4104,7 +4077,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_413_003()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_uPlane, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_413_003			
@@ -4130,7 +4103,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_413_004()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_uPlane, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_413_004			
@@ -4156,7 +4129,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_413_005()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_sync3, c_sync4, c_sync5, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_sync3, c_sync4, c_sync5, c_uPlane, c_uPlane, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_413_005			
@@ -4182,7 +4155,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_413_006()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_sync3, c_sync4, c_sync5, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_sync3, c_sync4, c_sync5, c_uPlane, c_uPlane, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_413_006			
@@ -4208,7 +4181,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_413_007()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_uPlane, c_uPlane, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_413_007			
@@ -4234,7 +4207,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_413_008()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_uPlane, c_uPlane, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_413_008			
@@ -4260,7 +4233,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_413_009()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_uPlane, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_413_009			
@@ -4286,7 +4259,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_413_010()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_uPlane, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_413_010			
@@ -4312,7 +4285,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_413_011()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_sync3, c_sync4, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_sync3, c_sync4, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_413_011			
@@ -4338,7 +4311,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_413_012()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_sync3, c_sync4, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_sync3, c_sync4, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_413_012				
@@ -4604,6 +4577,32 @@
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_414_010	
							
			/*  
			* @desc TC_414_011
			* @param loc_CSeq_s Transaction Id  
			*/  
			testcase TC_414_011(inout CSeq loc_CSeq_s)
			runs on ServerSyncComp
			system TestAdapter 
			{
			   //Variables
			   var SipComponent v_sipComponent ;
			   var IsupBiccComponent v_isupBiccComponent;
									        
			   f_cf00Up(v_sipComponent, v_isupBiccComponent);
									
			   //Start
			   f_IncCSeq(loc_CSeq_s); 
										   
			   v_sipComponent.start(f_Sip_TC_414_011(loc_CSeq_s));
			   v_isupBiccComponent.start(f_IsupBicc_TC_414_011()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_414_011					
		} // end group TP4140_UUS1
				
		group TP4141_UUS2 {
@@ -4734,7 +4733,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_414_201()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_414_201			
@@ -4760,7 +4759,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_414_202()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_414_202			
@@ -4786,7 +4785,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_414_203()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_414_203			
@@ -4812,7 +4811,7 @@
			   v_isupBiccComponent.start(f_IsupBicc_TC_414_204()) ;
									
			   // synchronize both PTCs on sychronization points
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_sync2, c_uPlane, c_tbDone});
			   f_serverSync2ClientsAndStop({c_prDone, c_sync1, c_uPlane, c_sync2, c_tbDone});
									
			   f_cfTwoPtcsDown(v_sipComponent, v_isupBiccComponent);									
			} //end TC_414_204			
+5 −5
Original line number Diff line number Diff line
@@ -1775,11 +1775,6 @@ module SIPI_TestExecution {
		  execute(TC_412_022(v_CSeq_s));
		}			

		// Mnemonic selection condition: TCs have not PICS conditions
		if (f_selection_true()) {
		  execute(TC_412_023(v_CSeq_s));
		}			
		
		// Mnemonic selection condition: TCs have not PICS conditions
		if (f_selection_true()) {
		  execute(TC_413_001(v_CSeq_s));
@@ -1890,6 +1885,11 @@ module SIPI_TestExecution {
		  execute(TC_414_010(v_CSeq_s));
		}			
		
		// Mnemonic selection condition: TCs have not PICS conditions
		if (f_selection_true()) {
		  execute(TC_414_011(v_CSeq_s));
		}			
		
		// Mnemonic selection condition: TCs have not PICS conditions
		if (f_selection_true()) {
		  execute(TC_414_101(v_CSeq_s));
+30 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,36 @@ return Bit8 {
 return int2bit((lengthof (v_ras.status) + p_int), 8 );
}

/* Function to calculate length of USI contents parameter */
function f_calc_length_usi_contents (in template USIContents p_uSIContents, in integer p_int)
return Bit8 {
 var USIContents v_uSIContents := valueof(p_uSIContents);
 var integer v_result := 0;
 if (ispresent(v_uSIContents.bCAP_octet4))
 	{	v_result := v_result + 1;
		if (ispresent(v_uSIContents.bCAP_octet4.rateMultiplier))
 		{v_result := v_result + 1}
 	}
 if (ispresent(v_uSIContents.bCAP_octet5))
	{v_result := v_result + 1;
		if (ispresent(v_uSIContents.bCAP_octet5.bCAP_octet5a))
			{v_result := v_result + 1}
		if (ispresent(v_uSIContents.bCAP_octet5.bCAP_octet5b1))
			{v_result := v_result + 1}
		if (ispresent(v_uSIContents.bCAP_octet5.bCAP_octet5b2))
			{v_result := v_result + 1}
		if (ispresent(v_uSIContents.bCAP_octet5.bCAP_octet5c))
			{v_result := v_result + 1}
		if (ispresent(v_uSIContents.bCAP_octet5.bCAP_octet5d))
			{v_result := v_result + 1}	
	}
 if (ispresent(v_uSIContents.bCAP_octet6))
	{v_result := v_result + 1;}
 if (ispresent(v_uSIContents.bCAP_octet7))
	{v_result := v_result + 1;}
 return int2bit((v_result + p_int), 8 );
}

/* Function to calculate length of UUIF parameter */
function f_calc_length_uuif (in template UUIF_PAR_lv p_uuif, in integer p_int)
return Bit8 {
Loading