Commit c55ce646 authored by rennoch's avatar rennoch
Browse files

completion of TP607xxx with PRIV_VALUE tables

parent 69f84710

AtsCommon/SipIsup_IMS_TCFunctions.ttcn

+108 −9
Original line number Diff line number Diff line
@@ -11877,6 +11877,9 @@ module SipIsup_IMS_TCFunctions { 
				function f_IMS_TC_606_006(in CSeq p_cSeq_s) runs on ImsComponent {

					

					var INVITE_Request v_InviteReq;

					

					var PrivacyValue v_privacy[3] := {"id","user","Header"};

					

					// PREAMBLE

					// IMS component interface initialization

					//c_userProfile_ICSCFwithHomeUE or c_userProfile_IBCFwithHomeUE
@@ -11890,15 +11893,15 @@ module SipIsup_IMS_TCFunctions { 
					

					// the following is implemented without privacy header

					select(PX_SIP_MESSAGE_VA) {           

						case(1){f_sendResponse(m_Response_18XonINVITE_pAsserted_privacy_UE(c_statusLine180,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,m_PAssertedID(m_AddrUnion_NameAddr(PX_SIP_NameAddrTel_PAsserted)),m_Privacy(PX_SIP_privacy)));}

						case(2){f_sendResponse(m_Response_18XonINVITE_pAsserted_privacy_UE(c_statusLine183,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,m_PAssertedID(m_AddrUnion_NameAddr(PX_SIP_NameAddrTel_PAsserted)),m_Privacy(PX_SIP_privacy)));}

						case(1){f_sendResponse(m_Response_18XonINVITE_pAsserted_privacy_UE(c_statusLine180,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,m_PAssertedID(m_AddrUnion_NameAddr(PX_SIP_NameAddrTel_PAsserted)),m_Privacy(v_privacy[PX_SIP_privacy_VA])));}

						case(2){f_sendResponse(m_Response_18XonINVITE_pAsserted_privacy_UE(c_statusLine183,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,m_PAssertedID(m_AddrUnion_NameAddr(PX_SIP_NameAddrTel_PAsserted)),m_Privacy(v_privacy[PX_SIP_privacy_VA])));}

						case(3){setverdict(pass);} // see below for Response_200

						case else {log("Invalid PX_SIP_MESSAGE_VA variant (",PX_SIP_MESSAGE_VA,"), available variant 1-3");}

					}

					

					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync point

				

					f_sendResponse(m_Response_2XXonINVITE_pAsserted_privacy_UE(c_statusLine200,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,m_PAssertedID(m_AddrUnion_NameAddr(PX_SIP_NameAddrTel_PAsserted)),m_Privacy(PX_SIP_privacy),f_route(),valueof(m_MBody_SDP(vc_sdp_local))));

					f_sendResponse(m_Response_2XXonINVITE_pAsserted_privacy_UE(c_statusLine200,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,m_PAssertedID(m_AddrUnion_NameAddr(PX_SIP_NameAddrTel_PAsserted)),m_Privacy(v_privacy[PX_SIP_privacy_VA]),f_route(),valueof(m_MBody_SDP(vc_sdp_local))));

					f_awaitingACK(mw_ACK_Request_Base(vc_callId));



					f_check_Conversation();
@@ -11919,6 +11922,7 @@ module SipIsup_IMS_TCFunctions { 
				function f_IMS_TC_606_007(in CSeq p_cSeq_s) runs on ImsComponent {

					

					var INVITE_Request v_InviteReq;

					var PrivacyValue v_privacy[3] := {"id","user","Header"};

					// PREAMBLE

					// IMS component interface initialization

					//c_userProfile_ICSCFwithHomeUE or c_userProfile_IBCFwithHomeUE
@@ -11932,15 +11936,15 @@ module SipIsup_IMS_TCFunctions { 
					

					// the following is implemented without privacy header

					select(PX_SIP_MESSAGE_VA) {           

						case(1){f_sendResponse(m_Response_18XonINVITE_pAsserted_privacy_UE(c_statusLine180,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,m_PAssertedID(m_AddrUnion_NameAddr(PX_SIP_NameAddrTel_PAsserted_otherCC)),m_Privacy(PX_SIP_privacy)));}

						case(2){f_sendResponse(m_Response_18XonINVITE_pAsserted_privacy_UE(c_statusLine183,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,m_PAssertedID(m_AddrUnion_NameAddr(PX_SIP_NameAddrTel_PAsserted_otherCC)),m_Privacy(PX_SIP_privacy)));}

						case(1){f_sendResponse(m_Response_18XonINVITE_pAsserted_privacy_UE(c_statusLine180,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,m_PAssertedID(m_AddrUnion_NameAddr(PX_SIP_NameAddrTel_PAsserted_otherCC)),m_Privacy(v_privacy[PX_SIP_privacy_VA])));}

						case(2){f_sendResponse(m_Response_18XonINVITE_pAsserted_privacy_UE(c_statusLine183,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,m_PAssertedID(m_AddrUnion_NameAddr(PX_SIP_NameAddrTel_PAsserted_otherCC)),m_Privacy(v_privacy[PX_SIP_privacy_VA])));}

						case(3){setverdict(pass);} // see below for Response_200

						case else {log("Invalid PX_SIP_MESSAGE_VA variant (",PX_SIP_MESSAGE_VA,"), available variant 1-3");}

					}

					

					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync point

				

					f_sendResponse(m_Response_2XXonINVITE_pAsserted_privacy_UE(c_statusLine200,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,m_PAssertedID(m_AddrUnion_NameAddr(PX_SIP_NameAddrTel_PAsserted_otherCC)),m_Privacy(PX_SIP_privacy),f_route(),valueof(m_MBody_SDP(vc_sdp_local))));

					f_sendResponse(m_Response_2XXonINVITE_pAsserted_privacy_UE(c_statusLine200,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,m_PAssertedID(m_AddrUnion_NameAddr(PX_SIP_NameAddrTel_PAsserted_otherCC)),m_Privacy(v_privacy[PX_SIP_privacy_VA]),f_route(),valueof(m_MBody_SDP(vc_sdp_local))));

					f_awaitingACK(mw_ACK_Request_Base(vc_callId));



					f_check_Conversation();
@@ -11961,6 +11965,8 @@ module SipIsup_IMS_TCFunctions { 
				function f_IMS_TC_606_008(in CSeq p_cSeq_s) runs on ImsComponent {

					

					var INVITE_Request v_InviteReq;

					var PrivacyValue v_privacy[3] := {"id","user","Header"};

					

					

					// PREAMBLE

					// IMS component interface initialization
@@ -11975,15 +11981,15 @@ module SipIsup_IMS_TCFunctions { 
					

					// the following is implemented without privacy header

					select(PX_SIP_MESSAGE_VA) {           

						case(1){f_sendResponse(m_Response_18XonINVITE_supported_privacy_UE(c_statusLine180,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact, m_Supported_fromChange,m_Privacy(PX_SIP_privacy)));}

						case(2){f_sendResponse(m_Response_18XonINVITE_supported_privacy_UE(c_statusLine183,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact, m_Supported_fromChange, m_Privacy(PX_SIP_privacy)));}

						case(1){f_sendResponse(m_Response_18XonINVITE_supported_privacy_UE(c_statusLine180,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact, m_Supported_fromChange,m_Privacy(v_privacy[PX_SIP_privacy_VA])));}

						case(2){f_sendResponse(m_Response_18XonINVITE_supported_privacy_UE(c_statusLine183,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact, m_Supported_fromChange,m_Privacy(v_privacy[PX_SIP_privacy_VA])));}

						case(3){setverdict(pass);} // see below for Response_200

						case else {log("Invalid PX_SIP_MESSAGE_VA variant (",PX_SIP_MESSAGE_VA,"), available variant 1-3");}

					}

					

					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync point

				

					f_sendResponse(m_Response_2XXonINVITE_supported_privacy_UE(c_statusLine200,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact, m_Supported_fromChange ,m_Privacy(PX_SIP_privacy),f_route(),valueof(m_MBody_SDP(vc_sdp_local))));

					f_sendResponse(m_Response_2XXonINVITE_supported_privacy_UE(c_statusLine200,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact, m_Supported_fromChange ,m_Privacy(v_privacy[PX_SIP_privacy_VA]),f_route(),valueof(m_MBody_SDP(vc_sdp_local))));

					f_awaitingACK(mw_ACK_Request_Base(vc_callId));



					f_SendUPDATE(m_UPDATE_Request_Base(vc_requestUri, vc_callId, vc_cSeq, valueof(m_From(PX_SIP_NameAddr_ChangedFrom ,f_getRndTag())), vc_callee_To, vc_via, vc_contact, m_MBody_SDP(vc_sdp_local)));
@@ -12003,6 +12009,99 @@ module SipIsup_IMS_TCFunctions { 
				}// end function f_IMS_TC_606_008

				

				

				/* 

				*  @desc	This is the test case function (IMS/SIP side) for TC_606_009

				*  @param	loc_CSeq_s - Transaction Id

				*/

				function f_IMS_TC_606_009(in CSeq p_cSeq_s) runs on ImsComponent {

					

					var INVITE_Request v_InviteReq;

					

					// PREAMBLE

					// IMS component interface initialization

					//c_userProfile_ICSCFwithHomeUE or c_userProfile_IBCFwithHomeUE

					f_IMS_preamble_MGCF(c_userProfile_ICSCFwithHomeUE, p_cSeq_s); // assignment of PIXIT values to component variable



					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

					// TESTBODY

					//Awaiting INVITE	

					f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));

					v_InviteReq:=vc_request;

					

					// the following is implemented without privacy header

					select(PX_SIP_MESSAGE_VA) {           

						case(1){f_sendResponse(m_Response_18XonINVITE_supported_privacy_UE(c_statusLine180,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact, m_Supported_fromChange, omit));}

						case(2){f_sendResponse(m_Response_18XonINVITE_supported_privacy_UE(c_statusLine183,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact, m_Supported_fromChange, omit));}

						case(3){setverdict(pass);} // see below for Response_200

						case else {log("Invalid PX_SIP_MESSAGE_VA variant (",PX_SIP_MESSAGE_VA,"), available variant 1-3");}

					}

					

					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync point

				

					f_sendResponse(m_Response_2XXonINVITE_supported_privacy_UE(c_statusLine200,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact, m_Supported_fromChange ,omit,f_route(),valueof(m_MBody_SDP(vc_sdp_local))));

					f_awaitingACK(mw_ACK_Request_Base(vc_callId));



					f_SendUPDATE(m_UPDATE_Request_Base(vc_requestUri, vc_callId, vc_cSeq, valueof(m_From(PX_SIP_NameAddr_ChangedFrom ,f_getRndTag())), vc_callee_To, vc_via, vc_contact, m_MBody_SDP(vc_sdp_local)));

					f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

					

					f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict());// sync point



					f_check_Conversation();

					//await BYE and send 200 OK

					f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));



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



					// POSTAMBLE

					f_SIP_postamble_IMS1_withoutRegistration ()

						

				}// end function f_IMS_TC_606_009

				

				/* 

				*  @desc	This is the test case function (IMS/SIP side) for TC_606_010

				*  @param	loc_CSeq_s - Transaction Id

				*/

				function f_IMS_TC_606_010(in CSeq p_cSeq_s) runs on ImsComponent {

					

					var INVITE_Request v_InviteReq;

					

					// PREAMBLE

					// IMS component interface initialization

					//c_userProfile_ICSCFwithHomeUE or c_userProfile_IBCFwithHomeUE

					f_IMS_preamble_MGCF(c_userProfile_ICSCFwithHomeUE, p_cSeq_s); // assignment of PIXIT values to component variable



					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

					// TESTBODY

					//Awaiting INVITE	

					f_awaitingINVITE(mw_INVITE_Request_IMS(*,*,*,*));

					v_InviteReq:=vc_request;

					

					// the following is implemented without privacy header

					select(PX_SIP_MESSAGE_VA) {           

						case(1){f_sendResponse(m_Response_18XonINVITE_supported_privacy_UE(c_statusLine180,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact, m_Supported_fromChange, omit));}

						case(2){f_sendResponse(m_Response_18XonINVITE_supported_privacy_UE(c_statusLine183,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact, m_Supported_fromChange, omit));}

						case(3){setverdict(pass);} // see below for Response_200

						case else {log("Invalid PX_SIP_MESSAGE_VA variant (",PX_SIP_MESSAGE_VA,"), available variant 1-3");}

					}

					

					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync point

				

					f_sendResponse(m_Response_2XXonINVITE_supported_privacy_UE(c_statusLine200,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact, m_Supported_fromChange ,omit,f_route(),valueof(m_MBody_SDP(vc_sdp_local))));

					f_awaitingACK(mw_ACK_Request_Base(vc_callId));



					f_check_Conversation();

					//await BYE and send 200 OK

					f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));



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



					// POSTAMBLE

					f_SIP_postamble_IMS1_withoutRegistration ()

						

				}// end function f_IMS_TC_606_010

				





				

			} // end group TP606_COL

AtsCommon/SipIsup_PIXITS.ttcn

+4 −0
Original line number Diff line number Diff line
@@ -121,6 +121,10 @@ module SipIsup_PIXITS { 
	*/

	PrivacyValue PX_SIP_privacy := "user";

	

	/** @desc	integer value used for preselected privacy values (0=id, 1=user, 2=header)

	*/

	integer PX_SIP_privacy_VA := 0;

	

    /** @desc	NameAddr default value for From field 

     ** @remark	PICS/PIXIT Reference:	ETS TS186 009-3, Table A1, item 1.14

     * 			Used in groupe 501