Commit 080edfbd authored by pintar's avatar pintar
Browse files

Corrections due to Iskratel validation STF387 week51

parent d894d72e

ISUPAts/ttcn/SIPI_ISUP_MsgTemplates.ttcn

+23 −13
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ group SipIsup_ISUP_Receive_MsgsTempl_AnyOptional 
	/* RX template for Circuit group reset acknowledgement message (CGRA) with 'any'-optional parameters */

	{

	 msgType := '00101001'B,                                /* Message Type '00101001'B */

	 pRAS := '00000010'B,                                   /* Pointer to parameter 'Range and status'. */

	 pRAS := '00000001'B,                                   /* Pointer to parameter 'Range and status'. */

	 rangeAndStatus := p_RAS                                /* Range and status, V, len=3-34 */

	}
@@ -662,7 +662,7 @@ group SipIsup_ISUP_Receive_MsgsTempl 
	 msgType := '00000111'B,                                /* Message Type '00000111'B */

	 backwardCallIndicators := mw_BWCI_cldPstatnoInd2(p_interwInd, p_isdnUpInd, p_isdnAccInd), /* Backward call indicators, F, len=2 */

	 pOptional := ?,                                        /* Pointer to optional parameters. */

	 optionalParameters := mw_CON_OPTIONAL_PARAMS_any,      /* SET: optional parameters of Connect message (CON) */

	 optionalParameters := mw_CON_OPTIONAL_PARAMS_any ifpresent,      /* SET: optional parameters of Connect message (CON) */

	 endOfOptionalParameters := '00000000'B ifpresent       /* End of optional parameters, O, len=1 */

	}
@@ -672,7 +672,7 @@ group SipIsup_ISUP_Receive_MsgsTempl 
	 msgType := '00000111'B,                                /* Message Type '00000111'B */

	 backwardCallIndicators := mw_BWCI_cldPstatnoInd3,      /* Backward call indicators, F, len=2 */

	 pOptional := ?,                                        /* Pointer to optional parameters. */

	 optionalParameters := mw_CON_OPTIONAL_PARAMS_any,      /* SET: optional parameters of Connect message (CON) */

	 optionalParameters := mw_CON_OPTIONAL_PARAMS_any ifpresent,      /* SET: optional parameters of Connect message (CON) */

	 endOfOptionalParameters := '00000000'B ifpresent       /* End of optional parameters, O, len=1 */

	}
@@ -824,7 +824,7 @@ group SipIsup_ISUP_Receive_MsgsTempl 
	 pCAUI := '00000010'B,                                   /* Pointer to parameter 'Cause indicators'. */

	 pOptional := ?,                                         /* Pointer to optional parameters. */

	 causeIndicators := mw_CAU_cval(p_cauVal),               /* Cause indicators, V, len=3-? */

	 optionalParameters := mw_FRJ_OPTIONAL_PARAMS_any,       /* SET: optional parameters of Facility reject message (FRJ) */

	 optionalParameters := mw_FRJ_OPTIONAL_PARAMS_any ifpresent,       /* SET: optional parameters of Facility reject message (FRJ) */

	 endOfOptionalParameters := '00000000'B ifpresent        /* End of optional parameters, O, len=1 */

	}
@@ -1238,7 +1238,7 @@ group SipIsup_ISUP_Receive_MsgsTempl 
	 pCAUI := '00000010'B,                                  /* Pointer to parameter 'Cause indicators'. */

	 pOptional := ?,                                        /* Pointer to optional parameters. */

	 causeIndicators := p_CAU,                              /* Cause indicators, V, len=3-? */

	 optionalParameters := mw_REL_OPTIONAL_PARAMS_any,      /* SET: optional parameters of Release message (REL) */

	 optionalParameters := mw_REL_OPTIONAL_PARAMS_any ifpresent,      /* SET: optional parameters of Release message (REL) */

	 endOfOptionalParameters := '00000000'B ifpresent       /* End of optional parameters, O, len=1 */

	}
@@ -1268,7 +1268,7 @@ group SipIsup_ISUP_Receive_MsgsTempl 
	 pUUIF := '00000010'B,              		        /* Pointer to parameter 'userToUserInformation'. */

	 pOptional := ?,					                /* Pointer to optional parameters. */

	 userToUserInformation := p_UUIF,           		/* User-to-user information, V, len=2-130 */

	 optionalParameters := mw_UUI_OPTIONAL_PARAMS_any, 	/* SET: optional parameters of User to user message (UUI) */

	 optionalParameters := mw_UUI_OPTIONAL_PARAMS_any ifpresent, 	/* SET: optional parameters of User to user message (UUI) */

	 endOfOptionalParameters := '00000000'B ifpresent	/* End of optional parameters, O, len=1 */

	}
@@ -1475,9 +1475,9 @@ group SipIsup_ISUP_Transmit_Msgs_Templ 
	/* TX template for Answer message (ANM) without optional parameters except call history */

	{

	 msgType := '00001001'B,                                /* Message Type '00001001'B */

	 pOptional := '00000001'B,                              /* Pointer to optional parameters. */

	 optionalParameters := m_ANM_USED_OPTIONAL_PARAMS(omit, omit, omit, omit, omit), /* SET: optional parameters of Answer message (ANM) */

	 endOfOptionalParameters := '00000000'B                 /* End of optional parameters, O, len=1 */

	 pOptional := '00000000'B,                              /* Pointer to optional parameters. */

	 optionalParameters := omit, 							/* SET: optional parameters of Answer message (ANM) */

	 endOfOptionalParameters := omit                 /* End of optional parameters, O, len=1 */

	}

	

	template ANM_MSG m_ANM_RDNR(template RNS_PAR_tlv p_RDNR) :=
@@ -1599,9 +1599,19 @@ group SipIsup_ISUP_Transmit_Msgs_Templ 
	{

	 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,omit),       /* SET: optional parameters of Connect message (CON) */

	 endOfOptionalParameters := '00000000'B                  /* End of optional parameters, O, len=1 */

	 pOptional := '00000000'B,                               /* Pointer to optional parameters. */

	 optionalParameters := omit,							 /* SET: optional parameters of Connect message (CON) */

	 endOfOptionalParameters := omit	 	                 /* 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.*/

	{

		msgType := '00000111'B,                                 /* Message Type '00000111'B */

		backwardCallIndicators := m_BCI_cpStatInd(p_cldPstatInd),/* Backward call indicators, F, len=2 */

		pOptional := '00000000'B,                               /* Pointer to optional parameters. */

		optionalParameters := omit,							 /* SET: optional parameters of Connect message (CON) */

		endOfOptionalParameters := omit	 	                 /* End of optional parameters, O, len=1 */

	}

	

	template CON_MSG m_CON_CNN_AT_GEN(template CPN_PAR_tlv p_CNN, template ATP_PAR_tlv p_AT_CNSU, template GNU_PAR_tlv p_GNU) :=
@@ -2312,7 +2322,7 @@ group SipIsup_ISUP_Transmit_Msgs_Templ 
	 msgType := '00111000'B,				/* Message Type '00111000'B */

	 pOptional := '00000001'B,				/* Pointer to optional parameters. */

	 optionalParameters := m_SEG_USED_OPTIONAL_PARAMS(p_AT_CLSU, omit),			/* SET: optional parameters of Segmentation message (SEG) */

	 endOfOptionalParameters := omit		/* End of optional parameters, O, len=1 */

	 endOfOptionalParameters := '00000000'B	/* End of optional parameters, O, len=1 */

	}

	

	template SUS_MSG m_SUS_SRI(template SRI_PAR_v p_suspResInd) :=

ISUPAts/ttcn/SIPI_ISUP_ParamTemplates.ttcn

+5 −5
Original line number Diff line number Diff line
@@ -2517,8 +2517,8 @@ group ReceivParams { 
	 passOnNotPossibleIndicator := ?,     /* bits G F: Pass on not possible indicator */

	 ext := ?,                            /* c: Extension indicator (ext.) */

	 broadNarrowBandInterwIndicator := ? ifpresent, /* bits J I: Broadband/narrowband interworking indicator */

	 spare := '000000'B ifpresent,                  /* bits O-K: spare */

	 moreInstructionIndicators := omit    /* to be defined when required */

	 spare := *,                          /* bits O-K: spare */

	 moreInstructionIndicators := *       /* to be defined when required */

	}



	template PCI_PAR_tlv mw_PCI_PAR_tlv_any :=

ISUPAts/ttcn/SIPI_ISUP_TCFunctions.ttcn

+20 −10
Original line number Diff line number Diff line
@@ -10440,6 +10440,9 @@ group TP307_Receiving_REL { 
	  /*Send Initial address message (IAM) with default (F) and (V) parameters, and with 'no optional parameters except Propagation delay counter.*/

	  f_send_IAM(m_IAM_CLD1(PX_ISUP_TX_CLD_natAddr_txDef, PX_ISUP_IAM_CLD_digits_txDef));



	  /*Await ACM instead*/

	  f_awaiting_ACM(mw_ACM_MSG_Def);



	  /*Send Release message (REL) with Cause Indicators value 16, and without optional parameters*/

	  f_send_REL(m_REL_CAU2(m_CAU_Causev(16)), true);
@@ -10753,6 +10756,9 @@ group TP308_Sending_REL { 
	  /*Send Initial address message (IAM) with default (F) and (V) parameters, and with 'no optional parameters except Propagation delay counter.*/

	  f_send_IAM(m_IAM_CLD1(PX_ISUP_TX_CLD_natAddr_txDef, PX_ISUP_IAM_CLD_digits_txDef));

  

      /*Await default ACM message*/

      f_awaiting_ACM(mw_ACM_MSG_Def);

  

	  /*Receive Release message (REL) with Cause value parameterized.*/

	  f_awaiting_REL(mw_REL_CAU1(mw_CAU_cval(v_CauseVal[v_VA])));
@@ -10986,6 +10992,7 @@ group TP309_Receiving_RSC_GRS_CGB { 
	  /*Await default RLC message*/

	  f_awaiting_RLC(mw_RLC_MSG_Def);



	  f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict());//Synchronisation point 'trigger from RLC'

	  f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());//Synchronisation point 'test body done'



	  v_ISUP_inTestBody := false;
@@ -11027,14 +11034,14 @@ group TP309_Receiving_RSC_GRS_CGB { 
	  /*Send Initial address message (IAM) with default (F) and (V) parameters, and with 'no optional parameters except Propagation delay counter.*/

	  f_send_IAM(m_IAM_CLD1(PX_ISUP_TX_CLD_natAddr_txDef, PX_ISUP_IAM_CLD_digits_txDef));



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



	  /*Send default RSC message*/

	  f_send_RSC(m_RSC_MSG_noOpt, true);



	  /*Await default RLC message*/

	  f_awaiting_RLC(mw_RLC_MSG_Def);

	  

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



	  f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());//Synchronisation point 'test body done'



	  v_ISUP_inTestBody := false;
@@ -11129,6 +11136,9 @@ group TP309_Receiving_RSC_GRS_CGB { 
	  /*Send Initial address message (IAM) with default (F) and (V) parameters, and with 'no optional parameters except Propagation delay counter.*/

	  f_send_IAM(m_IAM_CLD1(PX_ISUP_TX_CLD_natAddr_txDef, PX_ISUP_IAM_CLD_digits_txDef));



	  /*Await default ACM message*/

	  f_awaiting_ACM(mw_ACM_MSG_Def);

	

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



	  /*Send default RSC message*/
@@ -12141,8 +12151,8 @@ group TP312_Receiving_BLO { 
	  // TestBody end

	  v_ISUP_inTestBody := false;



	  // Postamble expecting REL for cic1 and sending RLC

	  f_IsupBicc_Post_expREL1(false);

      // Postamble sending REL and expecting RLC for cic1

      f_IsupBicc_Post_sendREL1(false);



	}//End f_IsupBicc_TC_312_005
@@ -12339,8 +12349,8 @@ group TP314_Receiving_SGM { 
	  // TestBody end

	  v_ISUP_inTestBody := false;



	  // Postamble expecting REL for cic1 and sending RLC

	  f_IsupBicc_Post_expREL1(false);

      // Postamble sending REL and expecting RLC for cic1

      f_IsupBicc_Post_sendREL1(false);



	}//End f_IsupBicc_TC_314_001
@@ -12933,7 +12943,7 @@ group TP401_CLIP { 
		  v_ISUP_inTestBody := true;



		  /*Receive Initial address message (IAM) with default (F) and (V) parameters with Generic number parameterized and with 'any' other optional parameters.*/

		  f_awaiting_IAM(mw_IAM_GEN(mw_GenNum_allowed_up(c_GEN_natAddrInd_natSig, PX_ISUP_TX_GEN_addrSignals_rxNat)));

		  f_awaiting_IAM(mw_IAM_GEN(mw_GenNum_allowed_upNot(c_GEN_natAddrInd_natSig, PX_ISUP_TX_GEN_addrSignals_rxNat)));

		  

		  /*Send default ACM message*/

		  f_send_ACM(m_ACM_MSG_Def, true);
@@ -13277,7 +13287,7 @@ group TP401_CLIP { 
	  v_ISUP_inTestBody := true;



	  /*Send Initial address message (IAM) with default (F) and (V) parameters with Calling party number, Generic number and Access transport parameterized and with no other optional parameters. */

	  f_send_IAM(m_IAM_CLI_GEN_ATP(m_CallingNum_allowed(c_CLI_natAddrInd_internat, c_CLI_screenInd_ntwProv, PX_ISUP_IAM_CLI_digits_txInat),m_GenericNum_allowed(c_GEN_natAddrInd_internat, c_GEN_screenInd_userNotVerif, PX_ISUP_TX_GEN_addrSignals_txInat), omit));

	  f_send_IAM(m_IAM_CLI_GEN_ATP(m_CallingNum_allowed(c_CLI_natAddrInd_natSig, c_CLI_screenInd_ntwProv, PX_ISUP_IAM_CLI_digits_txNat),m_GenericNum_allowed(c_GEN_natAddrInd_natSig, c_GEN_screenInd_userNotVerif, PX_ISUP_TX_GEN_addrSignals_txNat), omit));



	  /*Await default ACM message*/

	  f_awaiting_ACM(mw_ACM_MSG_Def);
@@ -14404,7 +14414,7 @@ group TP402_CLIR { 
		v_ISUP_inTestBody := true;



		/*Receive Initial address message (IAM) with default (F) and (V) parameters with Generic number parameterized and with 'any' other optional parameters.*/

		f_awaiting_IAM(mw_IAM_GEN(mw_GenNum_restr_up(c_GEN_natAddrInd_natSig, PX_ISUP_TX_GEN_addrSignals_rxNat)));

		f_awaiting_IAM(mw_IAM_GEN(mw_GenNum_restr_upNot(c_GEN_natAddrInd_natSig, PX_ISUP_TX_GEN_addrSignals_rxNat)));

		

		/*Send default ACM message*/

		f_send_ACM(m_ACM_MSG_Def, true);