Commit 9105d898 authored by schmitting's avatar schmitting
Browse files

Some chages on SS___UP__05-08 and on CDIV tests

parent e2711249

AtsNIT_SipSip/ttcn/AtsNIT_SipSip_BC_TCFunctions.ttcn

+139 −107
Original line number Diff line number Diff line
@@ -367,7 +367,8 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						vc_via,

						vc_contact,

                    	m_Require_100rel,

						m_MBody_SDP(vc_sdp_local)

						m_MBody_SDP(vc_sdp_local),

						omit

					));

					

					// await PRACK
@@ -747,7 +748,8 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						vc_via,

						vc_contact,

                    	m_Require_100rel,

						m_MBody_SDP(vc_sdp_local)

						m_MBody_SDP(vc_sdp_local),

                    	omit

					));

					

					// await PRACK
@@ -1225,7 +1227,8 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						vc_via,

						vc_contact,

						mw_require_100rel,

						m_MBody_SDP(vc_sdp_local)

						m_MBody_SDP(vc_sdp_local),

						omit

					));

					

					// await PRACK
@@ -1690,7 +1693,8 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						vc_via,

						vc_contact,

						mw_require_100rel,

						m_MBody_SDP(vc_sdp_local)

						m_MBody_SDP(vc_sdp_local),

						omit

					));

					

					// await PRACK
@@ -1903,7 +1907,8 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						vc_via,

						vc_contact,

						m_Require_100rel,

						m_MBody_SDP(vc_sdp_local)

						m_MBody_SDP(vc_sdp_local),

						omit

					));

					

                    p_cSeq_s := vc_cSeq;
@@ -2077,7 +2082,8 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						vc_via,

						vc_contact,

						m_Require_100rel,

						m_MBody_SDP(vc_sdp_local)

						m_MBody_SDP(vc_sdp_local),

						omit

					));

					

                    p_cSeq_s := vc_cSeq;
@@ -2640,7 +2646,8 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						vc_via,

						vc_contact,

						mw_require_100rel,

						m_MBody_SDP(vc_sdp_local)

						m_MBody_SDP(vc_sdp_local),

						omit

					));

					

					// await PRACK
@@ -3049,7 +3056,8 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						vc_via,

						vc_contact,

						mw_require_100rel,

						m_MBody_SDP(vc_sdp_local)

						m_MBody_SDP(vc_sdp_local),

						omit

					));

					

					// await PRACK
@@ -3197,7 +3205,7 @@ module AtsNIT_SipSip_BC_TCFunctions { 
            		f_SendACK(m_ACK_Request_Base(

            			vc_requestUri, 

            			vc_callId, 

            			vc_cSeq, 

                    	v_INVITE_CSeq, 

            			vc_from, 

            			vc_to, 

            			vc_via
@@ -3220,6 +3228,9 @@ module AtsNIT_SipSip_BC_TCFunctions { 
				* @param	p_CSeq_s Transaction Id

				*/

				function f_AtsNIT_TC_SS___UP__05UE2(in CSeq p_cSeq_s) runs on ImsComponent {

					var CSeq v_INVITE_CSeq;

					var CSeq v_Postamble_CSeq;

					var Via v_INVITE_Via;

                    var REGISTER_Request v_register;

                                

                    v_register :=
@@ -3240,6 +3251,10 @@ module AtsNIT_SipSip_BC_TCFunctions { 
					// Testbody

					

            		f_awaitingINVITE(mw_INVITE_Request_Base);

            		

                    v_INVITE_CSeq := vc_cSeq;

                    v_INVITE_Via := vc_via;

            		

					f_sendResponse(m_Response_18XonINVITE_require_sdp_UE(

						c_statusLine180,

						vc_callId,
@@ -3249,7 +3264,8 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						vc_via,

						vc_contact,

						m_Require_100rel,

						valueof(m_MBody_SDP(vc_sdp_local))

						valueof(m_MBody_SDP(vc_sdp_local)),

                    	m_Allow({"INVITE, ACK, OPTIONS, CANCEL, BYE, UPDATE, PRACK"})

					));

					

					// await PRACK
@@ -3275,8 +3291,12 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						valueof(m_MBody_SDP(vc_sdp_local))

					));

					

                    v_Postamble_CSeq := vc_cSeq;

                    vc_cSeq := v_INVITE_CSeq;

                    vc_via := v_INVITE_Via;



					// send 200 OK Invite

					f_send200OK(); // TODO must be checked

					f_send200OK();

            		

            		// await ACK

					f_awaitingACK(mw_ACK_Request_Base(vc_callId));
@@ -3288,7 +3308,7 @@ module AtsNIT_SipSip_BC_TCFunctions { 
					f_terminateCall_UE(

						vc_requestUri, 

						vc_callId, 

						vc_cSeq, 

                    	v_Postamble_CSeq, 

						vc_callee_From, 

						vc_callee_To

					);
@@ -3447,7 +3467,8 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						vc_via,

						vc_contact,

						m_Require_100rel,

						valueof(m_MBody_SDP(vc_sdp_local))

						valueof(m_MBody_SDP(vc_sdp_local)),

						omit

					));

					

					v_via := vc_via;
@@ -3480,7 +3501,6 @@ module AtsNIT_SipSip_BC_TCFunctions { 
                    vc_via := v_via;

                    vc_cSeq := v_cSeq;				

					

					

					// send 200 OK Invite

                    f_sendResponse(m_Response_Base(c_statusLine200, vc_callId, vc_cSeq, vc_callee_From, vc_callee_To, vc_via));
@@ -3572,24 +3592,20 @@ module AtsNIT_SipSip_BC_TCFunctions { 
            		// await 200 OK PRACK response

            		f_awaitingOkResponse(vc_cSeq);

            		

            			// await UPDATE

					f_awaitingUPDATE(mw_UPDATE_Request_SDP(

            			vc_callId,

            			mw_MBody_SDP(?)

            		));

            		

            		// 200 OK Update

            		f_sendResponse(m_Response_2xxonINVITE_UE(

						c_statusLine200,

                    f_SendUPDATE(m_UPDATE_Request_Base(

                        vc_requestUri, 

                        vc_callId, 

                        vc_cSeq, 

						vc_caller_From, 

						vc_caller_To, 

						vc_via,vc_contact,

                    	f_recordroute(),

						valueof(m_MBody_SDP(vc_sdp_local))

                        vc_from, 

                        vc_to, 

                        vc_via, 

                        vc_contact, 

                        m_MBody_SDP(vc_sdp_local)

                    ));

            		

                    // await 200 OK UPDATE response

                    f_awaitingOkResponse(vc_cSeq);

            		

                    // await 200 OK INVITE response

                    f_awaitingOkResponse(v_INVITE_CSeq);
@@ -3597,7 +3613,7 @@ module AtsNIT_SipSip_BC_TCFunctions { 
                    f_SendACK(m_ACK_Request_Base(

                        vc_requestUri, 

                        vc_callId, 

            			vc_cSeq, 

                        v_INVITE_CSeq, 

                        vc_from, 

                        vc_to, 

                        vc_via
@@ -3620,6 +3636,9 @@ module AtsNIT_SipSip_BC_TCFunctions { 
				* @param	p_CSeq_s Transaction Id

				*/

				function f_AtsNIT_TC_SS___UP__07UE2(in CSeq p_cSeq_s) runs on ImsComponent {

					var CSeq v_INVITE_CSeq;

					var CSeq v_Postamble_CSeq;

					var Via v_INVITE_Via;

					var Response v_response;

                    var REGISTER_Request v_register;
@@ -3650,9 +3669,12 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						vc_via,

						vc_contact,

						m_Require_100rel,

						valueof(m_MBody_SDP(vc_sdp_local))

						valueof(m_MBody_SDP(vc_sdp_local)),

						omit

					);

					

                    v_INVITE_CSeq := vc_cSeq;

                    v_INVITE_Via := vc_via;

            		v_response.msgHeader.allow := m_Allow({"INVITE, ACK, OPTIONS, CANCEL, BYE, UPDATE, PRACK"});

            		

					f_sendResponse(v_response);
@@ -3662,22 +3684,30 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						mw_PRACK_Request_sdp(vc_callId, mw_MBody_SDP(?))

					);

            		

            		f_SendUPDATE(m_UPDATE_Request_Base(

            		    vc_requestUri, 

                    // await UPDATE

                    f_awaitingUPDATE(mw_UPDATE_Request_SDP(

                        vc_callId,

                        mw_MBody_SDP(?)

                    ));

            		

                    // 200 OK Update

                    f_sendResponse(m_Response_2xxonINVITE_UE(

                        c_statusLine200,

                        vc_callId, 

                        vc_cSeq,

            			vc_from, 

            			vc_to, 

            			vc_via, 

            			vc_contact, 

            			m_MBody_SDP(vc_sdp_local)

                        vc_caller_From, 

                        vc_caller_To, 

                        vc_via,vc_contact,

                        f_recordroute(),

                        valueof(m_MBody_SDP(vc_sdp_local))

                    ));

					

            		// await 200 OK UPDATE response

            		f_awaitingOkResponse(vc_cSeq);

                    v_Postamble_CSeq := vc_cSeq;

                    vc_cSeq := v_INVITE_CSeq;

                    vc_via := v_INVITE_Via;



                    // send 200 OK Invite

					f_send200OK(); // TODO must be checked

                    f_send200OK();

            		

                    // await ACK

                    f_awaitingACK(mw_ACK_Request_Base(vc_callId));
@@ -3689,7 +3719,7 @@ module AtsNIT_SipSip_BC_TCFunctions { 
                    f_terminateCall_UE(

                        vc_requestUri, 

                        vc_callId, 

						vc_cSeq, 

                        v_Postamble_CSeq, 

                        vc_callee_From, 

                        vc_callee_To

                    );
@@ -3786,6 +3816,7 @@ module AtsNIT_SipSip_BC_TCFunctions { 
                    // await 200 OK INVITE response

                    f_awaitingOkResponse(v_INVITE_CSeq);

            		

                    // send ACK

                    f_setHeadersACK();

                    f_SendACK(m_ACK_Request_Base(

                        vc_requestUri,
@@ -3847,7 +3878,8 @@ module AtsNIT_SipSip_BC_TCFunctions { 
						vc_via,

						vc_contact,

						m_Require_100rel,

						valueof(m_MBody_SDP(vc_sdp_local))

						valueof(m_MBody_SDP(vc_sdp_local)),

						omit

					);

					

					v_response.msgHeader.allow := m_Allow({"INVITE, ACK, OPTIONS, CANCEL, BYE, UPDATE, PRACK"});
@@ -3886,7 +3918,7 @@ module AtsNIT_SipSip_BC_TCFunctions { 
                    vc_cSeq := v_cSeq;				

					

                    // send 200 OK Invite

					f_send200OK(); // TODO must be checked

                    f_sendResponse(m_Response_Base(c_statusLine200, vc_callId, vc_cSeq, vc_callee_From, vc_callee_To, vc_via));

            		

                    // await ACK

                    f_awaitingACK(mw_ACK_Request_Base(vc_callId));

AtsNIT_SipSip/ttcn/AtsNIT_SipSip_SS_TCFunctions.ttcn

+7 −7
Original line number Diff line number Diff line
@@ -7989,7 +7989,7 @@ module AtsNIT_SipSip_SS_TCFunctions { 
		//TODO: verify that cause is associated to user B

		f_awaitingResponse(mw_Response_PAsserted_Privacy_History(c_statusLine181,vc_callId, vc_cSeq, mw_PAssertedID(mw_PAssertedIDValue(mw_SipUrl_Number(PX_IMS_SUT_UE2_PUBLIC_USER))), *, 

			mw_HistoryInfo(

				{mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{m_Cause("302")}),{1},omit), // Note: cause is part of hi-targeted-to-uri

				{mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{mw_Cause("302")}),{1},omit), // Note: cause is part of hi-targeted-to-uri

				 mw_HistoryInfoEntry(mw_SipUrl_Number(PX_IMS_SUT_UE3_PUBLIC_USER),{1,1},omit)

				})));
@@ -8961,7 +8961,7 @@ module AtsNIT_SipSip_SS_TCFunctions { 
		//TODO: verify that cause is associated to user B

		f_awaitingResponse(mw_Response_PAsserted_Privacy_History(c_statusLine181,vc_callId, vc_cSeq, mw_PAssertedID(mw_PAssertedIDValue(mw_SipUrl_Number(PX_IMS_SUT_UE2_PUBLIC_USER))), *, 

			mw_HistoryInfo(

				{mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{m_Cause("486")}),{1},omit), // Note: cause is part of hi-targeted-to-uri

				{mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{mw_Cause("486")}),{1},omit), // Note: cause is part of hi-targeted-to-uri

					mw_HistoryInfoEntry(mw_SipUrl_Number(PX_IMS_SUT_UE3_PUBLIC_USER),{1,1},omit)

				})));
@@ -9445,7 +9445,7 @@ module AtsNIT_SipSip_SS_TCFunctions { 
        //TODO: verify that cause is associated to user B

        f_awaitingResponse(mw_Response_PAsserted_Privacy_History(c_statusLine181,vc_callId, vc_cSeq, mw_PAssertedID(mw_PAssertedIDValue(mw_SipUrl_Number(PX_IMS_SUT_UE2_PUBLIC_USER))), *, 

            mw_HistoryInfo(

                {mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{m_Cause("486")}),{1},omit), // Note: cause is part of hi-targeted-to-uri

                {mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{mw_Cause("486")}),{1},omit), // Note: cause is part of hi-targeted-to-uri

                    mw_HistoryInfoEntry(mw_SipUrl_Number(PX_IMS_SUT_UE3_PUBLIC_USER),{1,1},omit)

                })));
@@ -10207,7 +10207,7 @@ module AtsNIT_SipSip_SS_TCFunctions { 
		//TODO: verify that cause is associated to user B

		f_awaitingResponse(mw_Response_PAsserted_Privacy_History(c_statusLine181,vc_callId, vc_cSeq, mw_PAssertedID(mw_PAssertedIDValue(mw_SipUrl_Number(PX_IMS_SUT_UE2_PUBLIC_USER))), *, 

			mw_HistoryInfo(

				{mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{m_Cause("408")}),{1},omit), // Note: cause is part of hi-targeted-to-uri

				{mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{mw_Cause("408")}),{1},omit), // Note: cause is part of hi-targeted-to-uri

					mw_HistoryInfoEntry(mw_SipUrl_Number(PX_IMS_SUT_UE3_PUBLIC_USER),{1,1},omit)

				})));
@@ -11097,7 +11097,7 @@ module AtsNIT_SipSip_SS_TCFunctions { 
		//TODO: verify that cause is associated to user B

		f_awaitingResponse(mw_Response_PAsserted_Privacy_History(c_statusLine181,vc_callId, vc_cSeq, mw_PAssertedID(mw_PAssertedIDValue(mw_SipUrl_Number(PX_IMS_SUT_UE2_PUBLIC_USER))), *, 

			mw_HistoryInfo(

				{mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{m_Cause("404")}),{1},omit), // Note: cause is part of hi-targeted-to-uri

				{mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{mw_Cause("404")}),{1},omit), // Note: cause is part of hi-targeted-to-uri

				 mw_HistoryInfoEntry(mw_SipUrl_Number(PX_IMS_SUT_UE3_PUBLIC_USER),{1,1},omit)

				})));
@@ -15980,7 +15980,7 @@ module AtsNIT_SipSip_SS_TCFunctions { 
		//TODO: verify that cause is associated to user B

		f_awaitingResponse(mw_Response_PAsserted_Privacy_History(c_statusLine181,vc_callId, vc_cSeq, mw_PAssertedID(mw_PAssertedIDValue(mw_SipUrl_Number(PX_IMS_SUT_UE2_PUBLIC_USER))), *, 

			mw_HistoryInfo(

				{mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{m_Cause("503")}),{1},omit), // Note: cause is part of hi-targeted-to-uri

				{mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{mw_Cause("503")}),{1},omit), // Note: cause is part of hi-targeted-to-uri

				 mw_HistoryInfoEntry(mw_SipUrl_Number(PX_IMS_SUT_UE3_PUBLIC_USER),{1,1},omit)

				})));
@@ -16851,7 +16851,7 @@ module AtsNIT_SipSip_SS_TCFunctions { 
		//TODO: verify that cause is associated to user B

		f_awaitingResponse(mw_Response_PAsserted_Privacy_History(c_statusLine181,vc_callId, vc_cSeq, mw_PAssertedID(mw_PAssertedIDValue(mw_SipUrl_Number(PX_IMS_SUT_UE2_PUBLIC_USER))), *, 

			mw_HistoryInfo(

				{*,mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{m_Cause("480")}),PX_UE2_HI_index,omit), // Note: cause is part of hi-targeted-to-uri

				{*,mw_HistoryInfoEntry(mw_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,{mw_Cause("480")}),PX_UE2_HI_index,omit), // Note: cause is part of hi-targeted-to-uri

					mw_HistoryInfoEntry(mw_SipUrl_Number(PX_IMS_SUT_UE3_PUBLIC_USER),PX_UE3_HI_index,omit)

				 ,*})

				));