Commit c9b9fe67 authored by poglitsch's avatar poglitsch
Browse files

corrections

parent 0e6d7105

AtsImsIot/AtsImsIot_Behavior.ttcn

+79 −90
Original line number Diff line number Diff line
@@ -2218,13 +2218,12 @@ group checksTC_IMS_CALL_0009 { 
				f_imsIot_receive(

				{mw_SipRequest(mw_ACK_Request_Base(?))},

				{},

				{0, omit},

				{1, mw_SipRequest(mw_ACK_Request_Base(?))},

				"TP_IMS_5052_01",

				true,	

				false

				)

			);



			p_monitorCompRef.done;

			

			// get Record-route header from prev ACK
@@ -2233,10 +2232,14 @@ group checksTC_IMS_CALL_0009 { 
				p_recordRoute := v_sip.request.msgHeader.recordRoute;

			}

			

			

			p_monitorCompRef.start(

			 f_imsIot_receive(

				{mw_SipRequest(mdw_TP_IMS_5052_01_mw(?, v_PCSCF_IMS_A, p_recordRoute))},

				{mw_SipRequest(mw_BYE_Request_Base(?))},

				{mw_SipRequest(mdw_TP_IMS_5052_01_p_mw(?,p_recordRoute))},

				{

					mw_SipRequest(mdw_TP_IMS_5052_01_f_mw(?, v_PCSCF_IMS_A)),

					mw_SipRequest(mw_BYE_Request_Base(?))

				},

				{0, omit},

				"TP_IMS_5052_01",

				false,
@@ -2413,16 +2416,23 @@ group checksTC_IMS_CALL_0014 { 
} // group



group checksTC_IMS_CALL_0016 {	

	

		/**

		* @desc Starts monitor component behavior

		* @param p_monitorCompRef Reference to monitor component

		*/

	function f_mtc_check_TP_IMS_5139_01_gm(

		function f_mtc_check_TP_IMS_5139_01_mw(

			ImsInterfaceMonitor p_monitorCompRef,

			boolean p_checkMessage

		) runs on ImsTestCoordinator  {

			var template SipUrl v_scscfImsAUrl := mw_SipUrl_Host(f_GetEUTScscfAddress(PX_EUT_A));

			var SipMessage v_sip := {request := valueof(m_INVITE_Dummy)};

						var SipUrl v_UE_URI;

			var To  v_to; 

			var From v_from;

			var CallId v_callId;

			var CSeq v_cSeq;

			var Route v_route;

			

			

			p_monitorCompRef.start(

    			f_imsIot_receive(
@@ -2436,6 +2446,14 @@ group checksTC_IMS_CALL_0016 { 
    		);

    		p_monitorCompRef.done;

    		

			f_getSipMsgFromMonitor(p_monitorCompRef, v_sip);

			// Get Contact Header from INVITE



			if(ischosen(v_sip.request)) {

				v_from := valueof(v_sip.request.msgHeader.fromField);		

				v_callId := valueof(v_sip.request.msgHeader.callId);

			}

    

    		p_monitorCompRef.start(

    			f_imsIot_receive(

    			{mw_SipResponse(mw_200OK_Base)},
@@ -2448,39 +2466,12 @@ group checksTC_IMS_CALL_0016 { 
    		);

    		p_monitorCompRef.done;

			

	} //function	

	

	/**

	  * @desc Starts monitor component behavior

	  * @param p_monitorCompRef Reference to monitor component

	  */

	function f_mtc_check_TP_IMS_5139_01_mw(

		ImsInterfaceMonitor p_monitorCompRef,

		boolean p_checkMessage

	) runs on ImsTestCoordinator  {

		var template SipUrl v_scscfImsAUrl := mw_SipUrl_Host(f_GetEUTScscfAddress(PX_EUT_A));

		var SipMessage v_sip := {request := valueof(m_INVITE_Dummy)};

    	var SipUrl v_UE_URI;

		var To  v_to; 

		var From v_from;

		var CallId v_callId;

		var CSeq v_cSeq;

		var Route v_route;



   		f_getSipMsgFromMonitor(p_monitorCompRef, v_sip);

    	// Get Contact Header from INVITE

		

 		if(ischosen(v_sip.request)) {

 			v_from := valueof(v_sip.request.msgHeader.fromField);		

 			v_callId := valueof(v_sip.request.msgHeader.callId);

		}

    	

			f_getSipMsgFromMonitor(p_monitorCompRef, v_sip);

			// Get Contact Header from 200-OK response

  			

    		if(ischosen(v_sip.response)) {

    			if(ispresent(v_sip.response.msgHeader.contact)) {

 				v_UE_URI := valueof(v_sip.response.msgHeader.contact.contactBody.contactAddresses[0].addressField.nameAddr.addrSpec);

    				v_UE_URI := f_getContactAddr(v_sip.response.msgHeader.contact);

    			}

    			v_to := valueof(v_sip.response.msgHeader.toField);		

			}
@@ -2498,7 +2489,6 @@ group checksTC_IMS_CALL_0016 { 
			p_monitorCompRef.done;

			

		} //function



} // group



group checksTC_IMS_CALL_0024 {
@@ -3088,8 +3078,7 @@ group checksTC_IMS_SS_0003 { 
    	) runs on ImsTestCoordinator  {

			

			var template SipUrl v_AS_IMS_B := mw_SipUrl_Host(f_GetEUTASServerAddress(PX_EUT_B));

			var template SipUrl v_SCSCF_IMS_B := (mw_SipUrl_Host(f_GetEUTScscfAddress(PX_EUT_B)),

															 mw_SipUrl_Host(f_GetEUTScscfIpAddress(PX_EUT_B)));

			var template SipUrl v_SCSCF_IMS_B := mw_SipUrl_Host(f_GetEUTScscfAddress(PX_EUT_B));

    			

    		p_monitorCompRef.start(

    		 f_imsIot_receive(
@@ -3308,7 +3297,7 @@ group checksTC_IMS_SS_0008 { 
			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 template Route v_Route := omit;

		   var template Route vt_pcscfRoute := {

					fieldName := ROUTE_E,

					routeBody := {mw_routeBody(v_pcscfEutAUrl), *}  };

AtsImsIot/AtsImsIot_TestCases_CALL.ttcn

+3 −4
Original line number Diff line number Diff line
@@ -848,13 +848,13 @@ module AtsImsIot_TestCases_CALL { 
		// create components

		var IotEquipmentUser v_ueA := f_cf_create_IotEquipmentUser(c_userUE_A);

		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);

		var IotEquipmentUser v_imsA := f_cf_create_IotEquipmentUser(c_trigger_A);

		var IotEquipmentUser v_imsA := f_cf_create_IotEquipmentUser("IMS A");

		var ImsInterfaceMonitor v_gmA := f_cf_create_monitor(c_gm_A);

		var ImsInterfaceMonitor v_gmB := f_cf_create_monitor(c_gm_B);

		var ImsInterfaceMonitor v_mw := f_cf_create_monitor(c_mw);

		var ImsUserInfo v_userInfoA := f_getSipUserId(PX_EUT_A);

		var ImsUserInfo v_userInfoB := f_getSipUserId(PX_EUT_B);

		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

		var CF_INT_CALL v_config := {v_gmA, v_mw, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -876,7 +876,6 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_userCheckCallEstablished(v_ueB); //Test Sequence Step 6		

		f_mtc_imsTriggerUeDeregistration(v_imsA, v_ueA); //Test Sequence Step 7

		

		f_mtc_check_TP_IMS_5139_01_gm(v_gmB, false); // Check 1

		f_mtc_check_TP_IMS_5139_01_mw(v_mw, false); // Check 1

		

		f_mtc_userCheckCallEnded(v_ueB); //Test Sequence Step 8
@@ -1093,7 +1092,7 @@ module AtsImsIot_TestCases_CALL { 
		// create components

		var ImsInterfaceMonitor v_gmA := f_cf_create_monitor(c_gm_A);

		var ImsInterfaceMonitor v_mw := f_cf_create_monitor(c_mw);

		var ImsInterfaceMonitor v_gmB := f_cf_create_monitor(c_gm_A);

		var ImsInterfaceMonitor v_gmB := f_cf_create_monitor(c_gm_B);

		var ImsUserInfo v_userInfoA := f_getAnyValidUser(PX_EUT_A);

		var ImsUserInfo v_userInfoB := f_getAnyValidUser(PX_EUT_B);