Commit 3bce42b6 authored by garciay's avatar garciay
Browse files

Changes for TTCN compliance with MMagic

parent 82e09ad0
Loading
Loading
Loading
Loading
+20 −8
Original line number Diff line number Diff line
@@ -1759,7 +1759,8 @@ group checksTC_IMS_CALL_0007 {
			boolean p_checkMessage 
    	) runs on ImsTestCoordinator {
    		var template SipUrl v_pcscfEutAUrl := mw_SipUrl_Host(f_GetEUTPcscfAddress(PX_EUT_A));
			var template SipUrl v_UserEutAUrl := mw_SipUrl_Host(f_getAnyValidUser(PX_EUT_A).domain);
			var ImsUserInfo v_user := f_getAnyValidUser(PX_EUT_A);
			var template SipUrl v_UserEutAUrl := mw_SipUrl_Host(v_user.domain);
    		   	    		
    		p_monitorCompRef.start(
    		 f_imsIot_receive(
@@ -1805,7 +1806,9 @@ group checksTC_IMS_CALL_0007 {
    		boolean p_checkMessage 
		) runs on ImsTestCoordinator {
    		var template SipUrl v_pcscfEutAUrl := mw_SipUrl_Host(f_GetEUTPcscfAddress(PX_EUT_A));
			var template SipUrl v_UserEutAUrl := mw_SipUrl_Host(f_getAnyValidUser(PX_EUT_A).domain);
			var ImsUserInfo v_user := f_getAnyValidUser(PX_EUT_A);
			var template SipUrl v_UserEutAUrl := mw_SipUrl_Host(v_user.domain);

    		p_monitorCompRef.start(
    		 f_imsIot_receive(
    			{mw_SipResponse(mdw_TP_IMS_5055_02_mw(v_pcscfEutAUrl, v_UserEutAUrl))},
@@ -1913,14 +1916,22 @@ group checksTC_IMS_CALL_0007 {
						
   
			f_getSipMsgFromMonitor(p_monitorCompRef, v_sip); //NOTE: icid value from 5067_01
log("### f_mtc_check_TP_IMS_5108_01_mw: v_sip=", v_sip.request.msgHeader.pChargingVector);
			if(ispresent(v_sip.request.msgHeader.pChargingVector)) {
				 if(ispresent(v_sip.request.msgHeader.pChargingVector.chargeParams))  {
log("### f_mtc_check_TP_IMS_5108_01_mw: then");
    			p_paramList := v_sip.request.msgHeader.pChargingVector.chargeParams;
log("### f_mtc_check_TP_IMS_5108_01_mw: p_paramList=", p_paramList);
    			for(var integer i := 0; i < lengthof(p_paramList); i:= i+1) {
    					if(p_paramList[i].id == "icid-value") {
log("### f_mtc_check_TP_IMS_5108_01_mw: find param=", p_paramList[i]);
    						p_param := p_paramList[i];
    						break;
    					}
    				}
    			}
			}
log("### f_mtc_check_TP_IMS_5108_01_mw: start");

			p_monitorCompRef.start(
				f_imsIot_receive(
@@ -3230,9 +3241,10 @@ group checksTC_IMS_SS_0008 {
			boolean p_checkMessage
	    ) runs on ImsTestCoordinator  {
		   var template SipUrl v_pcscfEutAUrl := mw_SipUrl_Host(f_GetEUTPcscfAddress(PX_EUT_A));
		   var template SipUrl v_UserEutBUrl := mw_SipUrl_Host(f_getAnyValidUser(PX_EUT_B).domain);
			var ImsUserInfo v_user := f_getAnyValidUser(PX_EUT_A);
			var template SipUrl v_UserEutBUrl := mw_SipUrl_Host(v_user.domain);
		   var SipMessage v_sip := {request := valueof(m_INVITE_Dummy)};
		   var Route v_Route;
		   var Route v_Route := {};
		   var template Route vt_pcscfRoute := {
					fieldName := ROUTE_E,
					routeBody := {mw_routeBody(v_pcscfEutAUrl), *}  };
@@ -3255,9 +3267,9 @@ group checksTC_IMS_SS_0008 {
		   if(ispresent(v_sip.request.msgHeader.route)) {
		   	v_Route := v_sip.request.msgHeader.route;
		   }
		   if(ispresent(v_sip.request.msgHeader.via)) {
		   //if(ispresent(v_sip.request.msgHeader.via)) {
		   	v_Via := v_sip.request.msgHeader.via;
		   }
		   //}
			
    		// Check Route header
    	  if (match(v_Route, vt_pcscfRoute)) {