Commit 9e3211c3 authored by Axel Rennoch's avatar Axel Rennoch
Browse files

replace f_ImsIot_receive by f_Iot_Sip_receive and ImsInterfaceMonitor by... 

replace f_ImsIot_receive by f_Iot_Sip_receive and ImsInterfaceMonitor by SipInterfaceMonitor for ISC TPs
parent 4b536c86

ttcn/AtsImsIot/AtsImsIot_TP_behavior_ISC.ttcn

+4 −4
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 
module AtsImsIot_TP_behavior_ISC

module AtsImsIot_TP_behavior_ISC

{

{





	import from AtsImsIot_TestSystem { type ImsInterfaceMonitor, ImsTestCoordinator; }

	import from AtsImsIot_TestSystem { type ImsInterfaceMonitor, ImsTestCoordinator, SipInterfaceMonitor; }

	import from LibIot_PIXITS {modulepar PX_MAX_MSG_WAIT;}

	import from LibIot_PIXITS {modulepar PX_MAX_MSG_WAIT;}

	import from AtsImsIot_Templates {template all;}

	import from AtsImsIot_Templates {template all;}

	import from AtsImsIot_TypesAndValues { type SipMessage, SipMessageList, NAPTRmessage, EnumResponse, EnumQuery, SkipType; }

	import from AtsImsIot_TypesAndValues { type SipMessage, SipMessageList, NAPTRmessage, EnumResponse, EnumQuery, SkipType; }
@@ -58,12 +58,12 @@ group g_ISC { 
    * @remark source function f_mtc_check_TP_IC_IBCF_REGISTER_02

    * @remark source function f_mtc_check_TP_IC_IBCF_REGISTER_02

	*/

	*/

	function f_mtc_check_TP_ISC_SCSCF_REGISTER_01(

	function f_mtc_check_TP_ISC_SCSCF_REGISTER_01(

		ImsInterfaceMonitor p_monitorCompRef, boolean p_checkMessage

		SipInterfaceMonitor  p_monitorCompRef, boolean p_checkMessage

	) runs on ImsTestCoordinator {

	) runs on ImsTestCoordinator {

        var template SipUrl v_request_uri := mw_SipUrl_Host(f_GetEUTPcscfAddress(PX_EUT_A));

        var template SipUrl v_request_uri := mw_SipUrl_Host(f_GetEUTPcscfAddress(PX_EUT_A));





		p_monitorCompRef.start(

		p_monitorCompRef.start(

		f_imsIot_receive(

		f_Iot_Sip_receive(

			{mw_SipRequest(mdw_TP_ISC_SCSCF_REGISTER_01(?,?,v_request_uri))},

			{mw_SipRequest(mdw_TP_ISC_SCSCF_REGISTER_01(?,?,v_request_uri))},

			{mw_SipRequest(mw_REGISTER_Request_Base)},

			{mw_SipRequest(mw_REGISTER_Request_Base)},

			{0, omit},

			{0, omit},
@@ -79,7 +79,7 @@ group g_ISC { 
		var template SipUrl v_eutBUri := mw_SipUrl_Host(f_GetEUTScscfAddress(PX_EUT_B));

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

            

            

		p_monitorCompRef.start(

		p_monitorCompRef.start(

			f_imsIot_receive(

		      f_Iot_Sip_receive(

                {mw_SipResponse(mw_Response_Base_ToFrom(c_statusLine200, ?, ?,?,?))}, //TODO To/From

                {mw_SipResponse(mw_Response_Base_ToFrom(c_statusLine200, ?, ?,?,?))}, //TODO To/From

//				{mw_SipResponse(mdw_TP_IC_IBCF_REGISTER200OK_02(v_EUT_A_Addr, v_eutBUri))},

//				{mw_SipResponse(mdw_TP_IC_IBCF_REGISTER200OK_02(v_EUT_A_Addr, v_eutBUri))},

				{mw_SipResponse (mw_200OK_Base)},

				{mw_SipResponse (mw_200OK_Base)},