Commit 9d666ee2 authored by pintar's avatar pintar
Browse files

corrections due to week 6/2010 validation

parent d5cb142f

SIPAts/ttcn/SIPI_SIP_EncapsISUP.ttcn

+6 −6
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ group TP101_Sending_IAM { 
			for encapsulated IAM called number use 

			ex:  (prefix is nat or inat code which is not necesary to use)02580796123

			ourSIPI trunk=0258, prevISUP=0796, Asub called DN=123*/

		f_mIAM_v(m_IAM_CLD1(c_CLD_natAddrInd_natSig, PX_ISUP_IAM_CLD_digits_txNat_encaps));

		f_mIAM_v(m_IAM_CLD1(c_CLD_natAddrInd_internat, PX_ISUP_IAM_CLD_digits_txInat_encaps));

			

		//default messages are defined in the function - ACM,ANM,REL,RLC

		f_mwACM_mwANM_mREL_mwRLC();
@@ -615,8 +615,8 @@ group TP104_Receiving_ACM { 
		/*function with default sent IAM messages*/	

		f_mIAM();



//		f_mwACM_v(mw_ACM_BCI_OBCI(v_IsdnUpInd[v_VA], v_BCI_isdnAccInd[v_VA], mw_OBCI_iBandInd(v_OBCI_INBAND[v_VA])));

		f_mwACM_v(m_ACM_BCI_OBCI(v_IsdnUpInd[v_VA], v_BCI_isdnAccInd[v_VA], m_OBCI_iBandInd(v_OBCI_INBAND[v_VA])));

		f_mwACM_v(mw_ACM_BCI_OBCI(v_IsdnUpInd[v_VA], v_BCI_isdnAccInd[v_VA], mw_OBCI_iBandInd(v_OBCI_INBAND[v_VA])));

//		f_mwACM_v(m_ACM_BCI_OBCI(v_IsdnUpInd[v_VA], v_BCI_isdnAccInd[v_VA], m_OBCI_iBandInd(v_OBCI_INBAND[v_VA])));

			//mw_BWCI_isdn_Up_Acc_Ind(Bit1 p_isdnUpInd, Bit1 p_isdnAccInd)

			

		/*function with default ANM, REL and RLC messages*/
@@ -1215,7 +1215,7 @@ group TP114_Receiving_CFN { 
	function f_EncapsIsup_TC_114_001() runs on SipComponent {

		

		

		f_mIAM_v(m_IAM_With_UnknownParameters);

		f_mIAM_v(m_IAM_ENC_With_UnknownParameters);

		

		/*function with default mIAM, mwACM, mwANM messages*/	

		f_mwACM_mwANM();
@@ -2224,8 +2224,8 @@ group TP310_Receiving_CFN { 


	function f_EncapsIsup_TC_310_001() runs on SipComponent {



		/*function with default mwIAM messages*/	

		f_mwIAM();

		/*function with mwIAM messages*/	

		f_mwIAM_v(mw_IAM_CLD_UNKNOWN(PX_ISUP_TX_CLD_natAddr_txDef, PX_ISUP_IAM_CLD_digits_txDef, true));



		f_mCFN_v(m_CFN_MSG_Def(m_CAU_Causev(97)));

SIPAts/ttcn/SIPI_SIP_Steps.ttcn

+37 −2
Original line number Diff line number Diff line
@@ -464,7 +464,32 @@ import from LibCommon_VerdictControl all; 
		  

    }// end function setHeadersOnReceiptOfResponse



		// Function to set sent headers for PRACK

	function f_setHeadersIUTInvite_FULL(inout CSeq loc_CSeq_s, in SipUrl p_requestUrl) runs on SipComponent

	{

		v_CallId := { fieldName:=CALL_ID_E, callid:=f_getRndCallId(loc_CSeq_s) & AT & PX_SIP_IUT_IPADDR };

      

		loc_CSeq_s.seqNumber := loc_CSeq_s.seqNumber + 1;

		loc_CSeq_s.method := "INVITE";

		v_CSeq := loc_CSeq_s;

      

		v_To := valueof(m_To_IUT_sipUrl(p_requestUrl));

		v_Cancel_To := v_To;

		caller_To := v_To;

      

		v_From := valueof(m_From_ETS(getRndTag()));

		caller_From := v_From;

      

		v_Contact := valueof(m_Contact_ETS);

      

		v_Branch := BRANCH_COOKIE & getRndTag();

		v_Via:={

        	fieldName := VIA_E,

        	viaBody 	 := {valueof(m_ViaBody_ETS_IPADDR(v_Branch))}

		};

      

		v_RequestUri := valueof(p_requestUrl); // valueof(m_SipUrl_ofIUT);

		v_reqHostPort :=v_RequestUri.hostPort;

	}// end function f_setHeadersIUTInvite



	function f_setHeadersIUTInvite(inout CSeq loc_CSeq_s) runs on SipComponent

	{
@@ -2262,6 +2287,16 @@ group SendMessage { 
		f_SendINVITE_MIME_sub(loc_100rel, loc_precond, loc_SDP, loc_msg)

	} // end of f_SendINVITE



	/* 

	*  @desc Send INVITE message with SDP and MIME content in message body

	*		 

	*/

	function f_SendINVITE_MIME_FULL(boolean loc_100rel, boolean loc_precond, template SDP_Message loc_SDP, template ISUP_BICC_MSG loc_msg) runs on SipComponent

	{

		f_setHeadersIUTInvite_FULL(v_CSeq, m_SipUrl_ofIUT_FULL);

		f_SendINVITE_MIME_sub(loc_100rel, loc_precond, loc_SDP, loc_msg)

	} // end of f_SendINVITE



	/* 

	*  @desc Send Re-INVITE message with SDP and MIME content in message body

	*
@@ -2326,7 +2361,7 @@ group SendMessage { 
	*/

	function f_SendINVITE_MIME_precond0_8(boolean required, template ISUP_BICC_MSG loc_msg) runs on SipComponent

	{

		f_SendINVITE_MIME_precond_SDPml(required, m_media_list2audio, loc_msg);

		f_SendINVITE_MIME_precond_SDPml(required, m_media_list2audio_precond, loc_msg);

	} // end of f_SendINVITE_MIME_precond



	/*

SIPAts/ttcn/SIPI_SIP_TCFunctions.ttcn

+32 −26
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ module SIPI_SIP_TCFunctions { 
					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

					// implement test body behavior which should set return code	



					f_SendINVITE_MIME(false, false, valueof(m_SDP(m_media_PT0_PT8)), v_iam_msg); // prov.rel.resp. supported (100rel)

					f_SendINVITE_MIME_FULL(false, false, valueof(m_SDP(m_media_PT0_PT8)), v_iam_msg); // prov.rel.resp. supported (100rel)



					// awaiting 180 with A-law and 200							

					f_awaiting180Response(); // [ACM encapsulated]
@@ -1034,7 +1034,7 @@ module SIPI_SIP_TCFunctions { 
					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

					// implement test body behavior which should set return code	



					f_SendINVITE_MIME(false, false, valueof(m_SDP(m_media_PT0_PT8)), v_iam_msg); // prov.rel.resp. supported (100rel)

					f_SendINVITE_MIME_FULL(false, false, valueof(m_SDP(m_media_PT0_PT8)), v_iam_msg); // prov.rel.resp. supported (100rel)



					// awaiting 180 with A-law and 200							

					f_awaiting180Response(); // [ACM encapsulated]
@@ -7863,7 +7863,9 @@ module SIPI_SIP_TCFunctions { 
					var Response v_Response;

					const StatusLine c_StatusLine[3] := 

						{StatusLine100, StatusLine180, StatusLine183};

					var boolean v_100auto := true;

					if (PX_TC309_002_VA>3) {setverdict(inconc); stop;};

					if (PX_TC309_002_VA==1) {v_100auto:= false;};

					

					f_SIP_preamble_00(loc_CSeq_s);
@@ -7872,7 +7874,7 @@ module SIPI_SIP_TCFunctions { 
					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

					// implement test body behavior which should set return code	



					f_awaitingInviteRequest(mw_INVITE_Request_MIME(v_iam_msg), false);

					f_awaitingInviteRequest(mw_INVITE_Request_MIME(v_iam_msg), v_100auto);



					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); // trigger for RSC
@@ -7880,9 +7882,8 @@ module SIPI_SIP_TCFunctions { 
					  caller_From, caller_To, v_Via, c_StatusLine[PX_TC309_002_VA-1].statusCode,

					  c_StatusLine[PX_TC309_002_VA-1].reasonPhrase));

					

					//f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict()); // trigger from RLC

					//awaiting CANCEL(REL) or BYE(REL) and respond with 200 OK(RLC)

					f_awaitingBYEorCANCEL_Encaps(v_CallId,v_CSeq,caller_From,caller_To,v_reqHostPort,v_rel_msg);

					//awaiting CANCEL

					f_awaiting_cancel_sendOK(v_CallId,v_CSeq,caller_From,caller_To,v_reqHostPort);

										

					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -7983,8 +7984,8 @@ module SIPI_SIP_TCFunctions { 
					

					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); // trigger for RSC

					

					//awaiting CANCEL(REL) or BYE(REL) and respond with 200 OK(RLC)

					f_awaitingBYEorCANCEL_Encaps(v_CallId,v_CSeq,caller_From,caller_To,v_reqHostPort,v_rel_msg);

					//awaiting CANCEL

					f_awaiting_cancel_sendOK(v_CallId,v_CSeq,caller_From,caller_To,v_reqHostPort);

										

					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -8025,7 +8026,9 @@ module SIPI_SIP_TCFunctions { 
					var Response v_Response;

					const StatusLine c_StatusLine[3] := 

						{StatusLine100, StatusLine180, StatusLine183};

					var boolean v_100auto := true;

					if (PX_TC309_008_VA>3) {setverdict(inconc); stop;};

					if (PX_TC309_008_VA==1) {v_100auto:= false;};

					

					f_SIP_preamble_00(loc_CSeq_s);
@@ -8034,7 +8037,7 @@ module SIPI_SIP_TCFunctions { 
					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

					// implement test body behavior which should set return code	



					f_awaitingInviteRequest(mw_INVITE_Request_MIME(v_iam_msg), false);

					f_awaitingInviteRequest(mw_INVITE_Request_MIME(v_iam_msg), v_100auto);



					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); // trigger from GRA
@@ -8042,8 +8045,8 @@ module SIPI_SIP_TCFunctions { 
					  caller_From, caller_To, v_Via, c_StatusLine[PX_TC309_008_VA-1].statusCode,

					  c_StatusLine[PX_TC309_008_VA-1].reasonPhrase));

					

					//awaiting CANCEL(REL) or BYE(REL) and respond with 200 OK(RLC)

					f_awaitingBYEorCANCEL_Encaps(v_CallId,v_CSeq,caller_From,caller_To,v_reqHostPort,v_rel_msg);

					//awaiting CANCEL

					f_awaiting_cancel_sendOK(v_CallId,v_CSeq,caller_From,caller_To,v_reqHostPort);

										

					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -8153,8 +8156,8 @@ module SIPI_SIP_TCFunctions { 
					

					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); // trigger for RSC

					

					//awaiting CANCEL(REL) or BYE(REL) and respond with 200 OK(RLC)

					f_awaitingBYEorCANCEL_Encaps(v_CallId,v_CSeq,caller_From,caller_To,v_reqHostPort,v_rel_msg);

					//awaiting CANCEL

					f_awaiting_cancel_sendOK(v_CallId,v_CSeq,caller_From,caller_To,v_reqHostPort);

										

					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -8245,7 +8248,9 @@ module SIPI_SIP_TCFunctions { 
					var Response v_Response;

					const StatusLine c_StatusLine[3] := 

						{StatusLine100, StatusLine180, StatusLine183};

					var boolean v_100auto := true;

					if (PX_TC309_015_VA>3) {setverdict(inconc); stop;};

					if (PX_TC309_015_VA==1) {v_100auto:= false;};



					f_SIP_preamble_00(loc_CSeq_s);
@@ -8254,7 +8259,7 @@ module SIPI_SIP_TCFunctions { 
					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

					// implement test body behavior which should set return code	



					f_awaitingInviteRequest(mw_INVITE_Request_MIME(v_iam_msg), false);

					f_awaitingInviteRequest(mw_INVITE_Request_MIME(v_iam_msg), v_100auto);



					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); // trigger from CGBA
@@ -8262,8 +8267,8 @@ module SIPI_SIP_TCFunctions { 
					  caller_From, caller_To, v_Via, c_StatusLine[PX_TC309_015_VA-1].statusCode,

					  c_StatusLine[PX_TC309_015_VA-1].reasonPhrase));

					

					//awaiting CANCEL(REL) or BYE(REL) and respond with 200 OK(RLC)

					f_awaitingBYEorCANCEL_Encaps_Timer(v_CallId,v_CSeq,caller_From,caller_To,v_reqHostPort,v_rel_msg,PX_Timeout_T18);

					//awaiting CANCEL

					f_awaiting_cancel_sendOK(v_CallId,v_CSeq,caller_From,caller_To,v_reqHostPort);

										

					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -8295,7 +8300,7 @@ module SIPI_SIP_TCFunctions { 
					// awaiting CANCEL

					TWait.start(PX_Timeout_T18);

					alt 

					{[]SIPP.receive(mw_CANCEL_Request_Encaps(v_CallId, v_rel_msg)) 

					{[]SIPP.receive(mw_CANCEL_Request_1(v_CallId)) 

						-> value v_CANCEL_Request sender sent_label

						{TWait.stop;}

					}
@@ -8339,11 +8344,11 @@ module SIPI_SIP_TCFunctions { 


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

					

					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());



					//awaiting BYE(REL) and respond with 200 OK(RLC)

					f_awaitingBYE_sendReply_Encaps(v_CallId, v_CSeq);



					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

							

					f_SIP_postamble_00();



					deactivate;
@@ -8374,8 +8379,9 @@ module SIPI_SIP_TCFunctions { 
					  c_StatusLine[PX_TC309_018_VA-1].reasonPhrase));

					

					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); // trigger for RSC

					//awaiting CANCEL(REL) or BYE(REL) and respond with 200 OK(RLC)

					f_awaitingBYEorCANCEL_Encaps_Timer(v_CallId,v_CSeq,caller_From,caller_To,v_reqHostPort,v_rel_msg,PX_Timeout_T18);

					

					//awaiting CANCEL

					f_awaiting_cancel_sendOK(v_CallId,v_CSeq,caller_From,caller_To,v_reqHostPort);

						

					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -8422,10 +8428,10 @@ module SIPI_SIP_TCFunctions { 
					f_awaitingAckRequest(v_CSeq);



					//awaiting BYE(REL) and respond with 200 OK(RLC)

					f_awaitingBYE_sendReply_Encaps(v_CallId1, v_CSeq);

					f_awaitingBYE_sendReply_Encaps((v_CallId1,v_CallId2), v_CSeq);



					//awaiting BYE(REL) and respond with 200 OK(RLC)

					f_awaitingBYE_sendReply_Encaps(v_CallId2, v_CSeq);

					f_awaitingBYE_sendReply_Encaps((v_CallId1,v_CallId2), v_CSeq);



					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

SIPAts/ttcn/SIPI_SIP_Templates.ttcn

+22 −3
Original line number Diff line number Diff line
@@ -165,6 +165,12 @@ group SubFields 
	  headers := omit

	}



	template SipUrl m_SipUrl_ofIUT_FULL modifies m_SipUrl_ofIUT :=  	// SIP-URL(+CC-NDC-SN) of the user behind the IUT (ISDN user)

	{

			userInfo := {userOrTelephoneSubscriber :=PX_SIP_IUT_USER_FULL,

						 password := omit}

	}

    

	template SipUrl m_SipUrl_ofIUT_i1 :=  	// SIP-URL of the user behind the IUT (ISDN user) (incomplete number)

	{

	  scheme := SIP_SCHEME,  			// contains "sip"
@@ -405,6 +411,14 @@ group Headers 
       toParams := omit

     };



	template To m_To_IUT_sipUrl(template SipUrl p_sipUrl) modifies m_To_IUT :=

	{		

		addressField :=

		{nameAddr := {

			addrSpec :=	p_sipUrl				// SipUrl

		}}

	};



	template To m_To_IUT :=

	{

	  fieldName := TO_E,
@@ -3576,7 +3590,7 @@ group SDP_Messages { 
		phone_numbers := omit,

		connection := {

			net_type := "IN",

			addr_type := "IN4",

			addr_type := "IP4",

			conn_addr := { addr:= PX_SIP_ETS_IPADDR, ttl:=omit, num_of_addr:=omit }

		}, //c=IN IP4 172.27.1.219

		bandwidth := omit,
@@ -3645,7 +3659,7 @@ group SDP_Messages { 
		phone_numbers := omit,

		connection := {

			net_type := "IN",

			addr_type := "IN4",

			addr_type := "IP4",

			conn_addr := { addr:=PX_SIP_ETS_IPADDR, ttl:=omit, num_of_addr:=omit}

		}, //c=IN IP4 172.27.1.219

		bandwidth := omit,
@@ -3851,6 +3865,11 @@ group SDP_Fields { 
			}	



	template SDP_media_desc_list m_media_list2audio := {

		m_media_port_dynPT("0","PCMU/8000",PX_SIP_SDP_port1),

		m_media_port_dynPT("8","PCMA/8000",PX_SIP_SDP_port2)

		}	



	template SDP_media_desc_list m_media_list2audio_precond := {

		m_media_port_dynPT2("0","PCMU/8000",PX_SIP_SDP_port1),

		m_media_port_dynPT2("8","PCMA/8000",PX_SIP_SDP_port2)

		}
@@ -3931,7 +3950,7 @@ group SDP_Fields { 


	template SDP_connection m_connection := {

		net_type := "IN",

		addr_type := "IN4",

		addr_type := "IP4",

		conn_addr := { addr:= PX_SIP_ETS_IPADDR, ttl:=omit, num_of_addr:=omit }

		}; //c=IN IP4 172.27.1.219