Commit eccb0e22 authored by Rennoch's avatar Rennoch
Browse files

smaller corrections for TPs at IC

parent c6a28cfc

ttcn/AtsImsIot/AtsImsIot_TP_behavior_IC.ttcn

+104 −23
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ group g_IBCF_INVITE { 
	   );

	   p_monitorCompRef.done;

       //TODO: from/to 

       v_UEB_PublicId := f_GetUEPublicId(PX_EUT_B); //from

       v_UEB_PublicId := f_GetUEPublicId(PX_EUT_A); //from

       v_eutAUri := mw_SipUrl_Host(f_GetEUTPcscfAddress(PX_EUT_A)); //to       

	   p_monitorCompRef.start(

		f_imsIot_receive(
@@ -305,17 +305,17 @@ group g_IBCF_100TRY { 
			v_skip := {p_skipCount, mw_SipRequest(mw_INVITE_Request_Base)};

		}

       

		p_monitorCompRef.start(

			f_imsIot_receive(

			{mw_SipRequest(mw_INVITE_Request_Base)},

			{},

			v_skip,

			"TP_IC_IBCF_100TRY_01",

			false,

			p_checkMessage

			)

		);

		p_monitorCompRef.done;

//		p_monitorCompRef.start(

//			f_imsIot_receive(

//			{mw_SipRequest(mw_INVITE_Request_Base)},

//			{},

//			v_skip,

//			"TP_IC_IBCF_100TRY_01",

//			false,

//			p_checkMessage

//			)

//		);

//		p_monitorCompRef.done;

            

		p_monitorCompRef.start(

			f_imsIot_receive(
@@ -521,19 +521,19 @@ group g_IBCF_2XXRESP { 
	/**

	  * @desc Starts monitor component behavior

	  * @param p_monitorCompRef Reference to monitor component

	  * @remark source function f_mtc_check_TP_IMS_5131_02_ic

	  * @remark source function f_mtc_check_TP_IMS_5115_04_ic

	  */

	function f_mtc_check_TP_IC_IBCF_2XXRESP_03(

	function f_mtc_check_TP_IC_IBCF_2XXRESP_02(

		ImsInterfaceMonitor p_monitorCompRef,

		boolean p_checkMessage 

	) runs on ImsTestCoordinator {



		p_monitorCompRef.start(

			f_imsIot_receive(

				{mw_SipResponse(mdw_TP_IC_IBCF_2XXRESP_03)},

				{mw_SipResponse(mdw_TP_IC_IBCF_2XXRESP_02(mw_SIP_URI_Base, mw_TEL_URI_Base))},

				{mw_SipResponse(mw_200OK_Base)},

				{0, omit},

				"TP_IC_IBCF_2XXRESP_03",

				"TP_IC_IBCF_2XXRESP_02",

				false,

				p_checkMessage

			)
@@ -544,19 +544,19 @@ group g_IBCF_2XXRESP { 
	/**

	  * @desc Starts monitor component behavior

	  * @param p_monitorCompRef Reference to monitor component

	  * @remark source function f_mtc_check_TP_IMS_5115_04_ic

	  * @remark source function f_mtc_check_TP_IMS_5131_02_ic

	  */

	function f_mtc_check_TP_IC_IBCF_2XXRESP_02(

	function f_mtc_check_TP_IC_IBCF_2XXRESP_03(

		ImsInterfaceMonitor p_monitorCompRef,

		boolean p_checkMessage 

	) runs on ImsTestCoordinator {



		p_monitorCompRef.start(

			f_imsIot_receive(

				{mw_SipResponse(mdw_TP_IC_IBCF_2XXRESP_02(mw_SIP_URI_Base, mw_TEL_URI_Base))},

				{mw_SipResponse(mdw_TP_IC_IBCF_2XXRESP_03)},

				{mw_SipResponse(mw_200OK_Base)},

				{0, omit},

				"TP_IC_IBCF_2XXRESP_02",

				"TP_IC_IBCF_2XXRESP_03",

				false,

				p_checkMessage

			)
@@ -947,7 +947,17 @@ group g_IBCF_CANCEL_OK { 
	function f_mtc_check_TP_IC_IBCF_CANCEL_OK_03(

		ImsInterfaceMonitor p_monitorCompRef

	) runs on ImsTestCoordinator {

		f_mtc_check_TP_IC_IBCF_CANCEL_OK_01(p_monitorCompRef)

		p_monitorCompRef.start(

		 f_imsIot_receive(

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

			 {},

			 {0,omit},

			 "TP_IC_IBCF_CANCEL_OK_03",

			 false,

			 false

		 )

		);

		p_monitorCompRef.done;

	}



} // end group g_IBCF_CANCEL_OK
@@ -1055,6 +1065,13 @@ group g_IBCF_487INVITE { 
			"TP_IC_IBCF_487INVITE_01", false, false )

	   );

	   p_monitorCompRef.done;



	p_monitorCompRef.start(

	 f_imsIot_receive(

		 { mw_SipResponse ( mw_Response_Base ( c_statusLine487, ?, ? ) ) }, { }, { 0, omit },

		 "TP_IC_IBCF_487INVITE_01", false, false )

	);

	p_monitorCompRef.done;

   } // End of function 



   /**
@@ -1109,6 +1126,18 @@ group g_IBCF_487INVITE_ACK { 
		 )

		);

	   p_monitorCompRef.done;



	   p_monitorCompRef.start(

		f_imsIot_receive(

		   {mw_SipRequest(mdw_TP_IC_IBCF_4XXINVITE_ACK_01(?, ?, ?))},

		   {},

		   {0, omit},

		   "TP_IC_IBCF_487INVITE_ACK_01",

		   false,

		   p_checkMessage

		)

	   );

	  p_monitorCompRef.done;

	   } //function 



	/**
@@ -1136,6 +1165,18 @@ group g_IBCF_487INVITE_ACK { 
		 )

		);

	   p_monitorCompRef.done;



	   p_monitorCompRef.start(

		f_imsIot_receive(

		   {mw_SipRequest(mdw_TP_IC_IBCF_4XXINVITE_ACK_01(?, ?, ?))},

		   {},

		   {0, omit},

		   "TP_IC_IBCF_487INVITE_ACK_02",

		   false,

		   p_checkMessage

		)

	   );

	  p_monitorCompRef.done;

	   } //function 



} // end group g_IBCF_487INVITE_ACK
@@ -1167,6 +1208,20 @@ group g_IBCF_486INVITE_ACK { 
		 )

		);

	   p_monitorCompRef.done;



	   //TODO: from/to                

	   p_monitorCompRef.start(

		f_imsIot_receive(

		   {mw_SipRequest(mdw_TP_IC_IBCF_4XXINVITE_ACK_01(?, ?, ?))},

		   {},

		   {0, omit},

		   "TP_IC_IBCF_486INVITE_ACK_01",

		   false,

		   p_checkMessage

		)

	   );

	  p_monitorCompRef.done;



	   } //function 



	/**
@@ -1194,6 +1249,20 @@ group g_IBCF_486INVITE_ACK { 
		 )

		);

	   p_monitorCompRef.done;



	   //TODO: from/to                

	   p_monitorCompRef.start(

		f_imsIot_receive(

		   {mw_SipRequest(mdw_TP_IC_IBCF_4XXINVITE_ACK_01(?, ?, ?))},

		   {},

		   {0, omit},

		   "TP_IC_IBCF_486INVITE_ACK_02",

		   false,

		   p_checkMessage

		)

	   );

	  p_monitorCompRef.done;

	  

	   } //function 



} // end group g_IBCF_486INVITE_ACK
@@ -1215,7 +1284,7 @@ group g_IBCF_SUBSCRIBE { 
			var charstring v_EpiresSubscribe;

			p_monitorCompRef.start(

				f_imsIot_receive(

					{mw_SipRequest(mdw_TP_IMS_5044_01_ic(?, v_eutAUri, v_UEB_PublicId))},

					{mw_SipRequest(mdw_TP_IC_IBCF_SUBSCRIBE_01(?, v_eutAUri, v_UEB_PublicId))},

					{mw_SipRequest(mw_SUBSCRIBE_Request_Base)},

					{0, omit},

					"TP_IC_IBCF_SUBSCRIBE_01",
@@ -1484,6 +1553,18 @@ group g_IBCF_REGISTER { 
        );

        p_monitorCompRef.done;

        

		p_monitorCompRef.start(

		f_imsIot_receive(

			{mw_SipRequest(mdw_TP_IC_IBCF_REGISTER_EXPIRES_03(?,?))}, //TODO: P_CSCF_B ,IMS_B 

			{mw_SipRequest(mw_REGISTER_Request_Base)},

			{0, omit},

			"TP_IC_IBCF_REGISTER_04",

			false,

			p_checkMessage

			)

		);

		p_monitorCompRef.done;

		

        // @remark source function f_mtc_check_TP_IMS_5092_01_ic

        var charstring v_EUT_A_Addr := f_GetEUTPcscfAddress(PX_EUT_A);

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

ttcn/AtsImsIot/AtsImsIot_Templates_IC.ttcn

+1 −33
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ module AtsImsIot_Templates_IC 
					*

				}               

			},

			pAccessNetworkInfo := omit,

//			pAccessNetworkInfo := omit,

			pChargingVector :=  mw_PChargingVector({

				{id := "icid-value", paramValue := *}, 

				*
@@ -758,38 +758,6 @@ module AtsImsIot_Templates_IC 
	} // end group g_IBCF





	group g_SCSCF {



	group g_SCSCF_INVITE {



		/**

		  * @desc INVITE Request checking TP_IC_SCSCF_INVITE_03

		  * @remark source template mdw_TP_IMS_5097_04_ic

		  */

		template INVITE_Request mdw_TP_IC_SCSCF_INVITE_03(in template (present) SipUrl p_requestUri)

		 modifies mw_INVITE_Request_Base := {

		  requestLine := {

			method := INVITE_E,

			requestUri := p_requestUri,

			sipVersion := c_sipNameVersion

		  },

		  msgHeader := {        

			pChargingVector := {

				fieldName := P_CHARGING_VECTOR_E,

				chargeParams := {

					*,

					complement({id := "access-network-charging-info", paramValue := ?}),

					*

				}

			}

                        

		  }

		}



	} // end group g_SCSCF_INVITE



	} // end group g_SCSCF



    group g_AuxiliaryInformationElementTemplates {



		/**