Commit 6ec080ed authored by pintar's avatar pintar
Browse files

Corrections due to Iskratel validation STF387 week48

parent 42866337

ISUPAts/ttcn/SIPI_ISUP_MsgTemplates.ttcn

+96 −53

File changed.

Preview size limit exceeded, changes collapsed.

ISUPAts/ttcn/SIPI_ISUP_ParamTemplates.ttcn

+14 −1
Original line number Diff line number Diff line
@@ -1762,7 +1762,7 @@ group ReceivParams { 
	 paramType := '01110010'B,           /* Parameter Type '01110010'B */

	 paramLen := '00000001'B,            /* Parameter Length field */

	 conferenceAcceptanceIndicator := ?, /* bits BA: Conference acceptance indicator (Note) */

	 spare := '000000'B,                 /* bits G-C: spare */

	 spare := '00000'B,                 /* bits G-C: spare */

	 ext := ?                            /* bit H: Extension indicator */

	}
@@ -3729,6 +3729,19 @@ group TransmitParams{ 
	 diagnostics := omit                            /* Diagnostic(s) (if any) */

	}



     template CAUI_PAR_lv m_CAUI_Def :=

     /* Default TX template for Cause indicators parameter (CAUI); Variable(V) format. */

     {

      paramLen := '00000010'B,  /* Parameter Length field */

      location := '0000'B,      /* location */

      spare := '0'B,            /* spare */

      codingStandard := '00'B,  /* codingStandard */

      ext1 := '1'B,             /* Extension */

      causeValue := '0010000'B, /* Cause value */

      ext2 := '1'B,             /* Extension */

      diagnostics := omit       /* Diagnostic(s)*/

     }



	template CCPI_PAR_tlv m_CCNR_Poss_Def :=

	/* TX template for CCNR possible indicator parameter (CCPI); Optional(O) format, with all default values. */

	{

ISUPAts/ttcn/SIPI_ISUP_ParamTypes.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ type record CTI_PAR_tlv /* Conference treatment indicators parameter (CTI); Opti 
 Bit8 paramType ('01110010'B),       /* Parameter Type '01110010'B */

 Bit8 paramLen ('00000001'B),        /* Parameter Length field */

 Bit2 conferenceAcceptanceIndicator, /* bits BA: Conference acceptance indicator (Note) */

 Bit6 spare,                         /* bits G-C: spare */

 Bit5 spare,                         /* bits G-C: spare */

 Bit1 ext                            /* bit H: Extension indicator */

}

with { encode "present=bytes(1,0x72)"; }

ISUPAts/ttcn/SIPI_ISUP_Steps.ttcn

+1856 −1778

File changed.

Preview size limit exceeded, changes collapsed.

ISUPAts/ttcn/SIPI_ISUP_TCFunctions.ttcn

+18 −7
Original line number Diff line number Diff line
@@ -5780,7 +5780,7 @@ group TP301_Sending_IAM { 
	  v_ISUP_inTestBody := false;



	  // Postamble sending REL and expecting RLC for cic1

	  f_IsupBicc_Post_sendREL1(false);

	  //f_IsupBicc_Post_sendREL1(false);



	}//End f_IsupBicc_TC_301_008
@@ -5869,6 +5869,17 @@ group TP301_Sending_IAM { 
	  /*Send Initial address message (IAM) with default (F) and (V) parameters, except for Nature of connection indicators ('continuity check not required'), and with 'no optional parameters except Propagation delay counter.*/

	  f_send_IAM(m_IAM_NCI(m_NatConn_notReq));

	  

	  /*Await default ACM message*/

	  f_awaiting_ACM(mw_ACM_MSG_Def);

	  

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



	  /*Await default ANM message*/

	  f_awaiting_ANM(mw_ANM_MSG_Def);



	  // Check Conversation

	  f_IsupBicc_CheckConversation();



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



	  // TestBody end
@@ -7203,14 +7214,14 @@ group TP301_Sending_IAM { 
	  // Check Conversation

	  f_IsupBicc_CheckConversation();

	  

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



	  /*Send default REL message*/

	  f_send_REL(m_REL_MSG_Def, true);



	  /*Await default RLC message*/

	  f_awaiting_RLC(mw_RLC_MSG_Def);



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



	  v_ISUP_inTestBody := false;



	  // Postamble checking signalling- and bearer states
@@ -9536,7 +9547,7 @@ group TP303_Sending_ACM { 
	  f_send_IAM(m_IAM_CLD1(PX_ISUP_TX_CLD_natAddr_txDef, PX_ISUP_IAM_CLD_digits_txDef));



	  /*Receive Address complete message (ACM) with Called party status indicator = 'subscriber free', Called party's category indicator = '(no indication or ordinary subscriber or payphone)', with Interworking indicator, ISDN access indicator, ISDN user part indicator (BCI) parameterized, and any other optional parameters.*/

	  f_awaiting_ACM(mw_ACM_BCI_cpCat_3alt(PX_ISUP_TX_BCI_v_interwInd, PX_ISUP_TX_BCI_v_iSDNUserPartInd, PX_ISUP_TX_BCI_v_iSDNAccessInd));//PX instead of ? because of waiting on specific values

	  f_awaiting_ACM(mw_ACM_BCI(m_BCI_Def));



	  f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());//Synchronisation point 2
@@ -9913,7 +9924,7 @@ group TP303_Sending_ACM { 
	  v_ISUP_inTestBody := true;



	  /*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_send_IAM(m_IAM_NCI_CLD1(m_NatConn_Req, PX_ISUP_TX_CLD_natAddr_txDef, PX_ISUP_IAM_CLD_digits_txDef));



	  /*Send default COT message*/

	  f_send_COT(m_COT_CTI_Succ, true);
@@ -10041,8 +10052,8 @@ group TP304_Sending_CPG { 
	  /*Send default IAM message*/

	  f_send_IAM(m_IAM_MSG_Def);



	  /*Receive Address complete message (ACM) with Called party status indicator = 'no indication', Called party's category indicator = '(no indication or ordinary subscriber or payphone)', with Interworking indicator, ISDN user part indicator and ISDN access indicator (BCI) parameterized, and any other optional parameters.*/

	  f_awaiting_ACM(mw_ACM_BCI_cpCat_3alt(?, ?, ?));

      /*Receive Address complete message (ACM) with Called party status indicator = 'subscriber free', Called party's category indicator = '(no indication or ordinary subscriber or payphone)', with Interworking indicator, ISDN access indicator, ISDN user part indicator (BCI) parameterized, and any other optional parameters.*/

      f_awaiting_ACM(mw_ACM_BCI(m_BCI_Def));



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