Commit 3e03fd74 authored by rennoch's avatar rennoch
Browse files

testcases 509005-509007 changed due to change of history info templates

parent cbcf2c72
Loading
Loading
Loading
Loading
+28 −4
Original line number Diff line number Diff line
@@ -10552,6 +10552,9 @@ module SipIsup_IMS_TCFunctions {
					//expected status and cause values according to the testcase variant
					// From ETSI TS 186 009-2 TP509005-TP509008 - array used to parameterize the SIP test case variant
					var integer v_CauseVal[8]; 
					var NameAddr UserA,UserB;
					var template HistoryInfo_List v_HIList;
					
					// dummy value for index 0 (unused)
					v_CauseVal[0] := 0;
					v_CauseVal[1] := 404;
@@ -10562,10 +10565,18 @@ module SipIsup_IMS_TCFunctions {
					v_CauseVal[6] := 480;
					v_CauseVal[7] := 503;
					
					//var HistoryInfo_List v_HIList:=valueof (mw_HistoryInfo_List_WithCauseValue(v_CauseVal[PX_TC_VA]));
					
					if ((PX_TC_VA<1)and(PX_TC_VA>7)){log("PIXIT PX_TC_VA is not inside allowed range (1-7)!");}
					
					UserA := PX_SIP_NameAddr_From;
					UserB := PX_SIP_NameAddr_UserB;
					UserB.addrSpec.urlParameters:={({id:="cause",paramValue:=int2str(v_CauseVal[PX_TC_VA])}),
													({id:="Privacy",paramValue:="history"})};
					
					v_HIList:={
						(mw_HistoryInfoEntry(UserA.addrSpec, ({1}), omit)),
						(mw_HistoryInfoEntry(UserB.addrSpec, ({1,1}),omit))
					};
													
					//c_userProfile_ICSCFwithHomeUE or c_userProfile_IBCFwithHomeUE
					f_IMS_preamble_MGCF(c_userProfile_ICSCFwithHomeUE, p_cSeq_s); // assignment of PIXIT values to component variable

@@ -10576,7 +10587,7 @@ module SipIsup_IMS_TCFunctions {
					LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_ISUP);
					f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, omit, omit, m_MBody_SDP(vc_sdp_local)));

					f_awaitingResponse(mw_Response_HistoryInfo(c_statusLine181,vc_callId, vc_cSeq,mw_HistoryInfo(mw_HistoryInfo_List_WithCauseValue(v_CauseVal[PX_TC_VA]))));
					f_awaitingResponse(mw_Response_HistoryInfo(c_statusLine181,vc_callId, vc_cSeq,mw_HistoryInfo(v_HIList)));
					f_awaitingResponse(mw_Response_Base(c_statusLine180,vc_callId, vc_cSeq)); 

					f_check_Ringing();
@@ -10602,6 +10613,9 @@ module SipIsup_IMS_TCFunctions {
					//expected status and cause values according to the testcase variant
					// From ETSI TS 186 009-2 TP509005-TP509008 - array used to parameterize the SIP test case variant
					var integer v_CauseVal[8]; 
					var NameAddr UserA,UserB;
					var template HistoryInfo_List v_HIList;
					
					// dummy value for index 0 (unused)
					v_CauseVal[0] := 0;
					v_CauseVal[1] := 404;
@@ -10614,6 +10628,16 @@ module SipIsup_IMS_TCFunctions {
					
					if ((PX_TC_VA<1)and(PX_TC_VA>7)){log("PIXIT PX_TC_VA is not inside allowed range (1-7)!");}
					
					UserA := PX_SIP_NameAddr_From;
					UserB := PX_SIP_NameAddr_UserB;
					UserB.addrSpec.urlParameters:={({id:="cause",paramValue:=int2str(v_CauseVal[PX_TC_VA])}),
													({id:="Privacy",paramValue:="history"})};

					v_HIList:={
						(mw_HistoryInfoEntry(UserA.addrSpec, ({1}), omit)),
						(mw_HistoryInfoEntry(UserB.addrSpec, ({1,1}),omit))
					};
					
					//c_userProfile_ICSCFwithHomeUE or c_userProfile_IBCFwithHomeUE
					f_IMS_preamble_MGCF(c_userProfile_ICSCFwithHomeUE, p_cSeq_s); // assignment of PIXIT values to component variable

@@ -10624,7 +10648,7 @@ module SipIsup_IMS_TCFunctions {
					LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_ISUP);
					f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, omit, omit, m_MBody_SDP(vc_sdp_local)));

					f_awaitingResponse(mw_Response_HistoryInfo(c_statusLine180,vc_callId, vc_cSeq, mw_HistoryInfo(mw_HistoryInfo_List_WithCauseValue(v_CauseVal[PX_TC_VA])))); 
					f_awaitingResponse(mw_Response_HistoryInfo(c_statusLine180,vc_callId, vc_cSeq, mw_HistoryInfo(v_HIList))); 

					f_check_Ringing();

+48 −0
Original line number Diff line number Diff line
@@ -138,6 +138,54 @@ module SipIsup_PIXITS {
                                            		headers := omit}
										}
	
	/** @desc	NameAddr default value for diverted user field 
	* 			Used in group 509
	*/
	NameAddr	PX_SIP_NameAddr_UserB := {displayName := omit, 	 			// optional charstring
											addrSpec :=	{	  
                                                scheme := c_sipScheme,  			// contains "sip"
                                                userInfo := {userOrTelephoneSubscriber:= "+491234567", password:=omit},
                                                hostPort := {host := "ims.net", portField :=omit},
                                                urlParameters := omit,
                                                headers := omit}
										}
	
	/** @desc	NameAddr default value for diverted user field 
	* 			Used in group 509
	*/
	NameAddr	PX_SIP_NameAddr_UserC := {displayName := omit, 	 			// optional charstring
											addrSpec :=	{	  
												scheme := c_sipScheme,  			// contains "sip"
												userInfo := {userOrTelephoneSubscriber:= "+491234567", password:=omit},
												hostPort := {host := "ims.net", portField :=omit},
												urlParameters := omit,
												headers := omit}
										}	

	/** @desc	NameAddr default value for diverted user field 
	* 			Used in group 509
	*/
	NameAddr	PX_SIP_NameAddr_UserD := {displayName := omit, 	 			// optional charstring
											addrSpec :=	{	  
												scheme := c_sipScheme,  			// contains "sip"
												userInfo := {userOrTelephoneSubscriber:= "+491234567", password:=omit},
												hostPort := {host := "ims.net", portField :=omit},
												urlParameters := omit,
												headers := omit}
										}

	/** @desc	NameAddr default value for diverted user field 
	* 			Used in group 509
	*/
	NameAddr	PX_SIP_NameAddr_UserE := {displayName := omit, 	 			// optional charstring
											addrSpec :=	{	  
												scheme := c_sipScheme,  			// contains "sip"
												userInfo := {userOrTelephoneSubscriber:= "+491234567", password:=omit},
												hostPort := {host := "ims.net", portField :=omit},
												urlParameters := omit,
												headers := omit}
										}
										
    /** @desc	NameAddr default value for CHANGED From field 
     ** @remark	PICS/PIXIT Reference:	ETS TS186 009-3
     * 			Used in 606008