Commit e63f2744 authored by ringst's avatar ringst
Browse files

changes after compiling with MessageMagic

parent 6216a79c

AtsImsIot/AtsImsIot_Behavior.ttcn

+5 −15
Original line number Diff line number Diff line
@@ -624,14 +624,12 @@ group checksTC_IMS_0005 { 
    	function f_mtc_check_TP_IMS_5088_01_mw(InterfaceMonitor p_monitorCompRef) 

    		runs on TestCoordinator {

    		

        	var CallId v_callId; // TODO what it the call id? not initialized

        		

			var charstring v_hostname;

			f_getHostname(PX_EUT_A, "pcscf", v_hostname); // needs recheck	

        		

        	p_monitorCompRef.start(

    			f_imsIot_receive(

    						{mw_SipRequest(mdw_TP_IMS_5088_01_mw(v_callId, mw_SipUrl_Host(v_hostname)))}, // TODO getHostname(PCSCF) how to hande the callid?

    						{mw_SipRequest(mdw_TP_IMS_5088_01_mw(?, mw_SipUrl_Host(v_hostname)))}, // TODO getHostname(PCSCF) how to hande the callid?

    						{mw_SipRequest(mw_MESSAGE_Request_Base(?))},

    						"TP_IMS_5088_01_mw",

    						"NOTIFY response",
@@ -650,15 +648,13 @@ group checksTC_IMS_0005 { 
    	function f_mtc_check_TP_IMS_5093_01_UE_mw(InterfaceMonitor p_monitorCompRef) 

    		runs on TestCoordinator {

    		

    		var CallId v_callId; // TODO what it the call id? not initialized !!!

    		

    		var charstring v_hostname;

    		var integer PX_UE_B := 1; // TODO this is just temporary, UE PIXIT needs to be determined

    		f_getUEHostname(PX_UE_B, v_hostname); // TODO needs recheck, maybe in more detail with userOrTelephoneSubscriber etc

    

    		p_monitorCompRef.start(

    			f_imsIot_receive(

    				{mw_SipRequest(mdw_TP_IMS_5093_01_UE_mw(v_callId, mw_SIP_URI(v_hostname)))}, // TODO getHostname(PCSCF) how to hande the callid?

    				{mw_SipRequest(mdw_TP_IMS_5093_01_UE_mw(?, mw_SIP_URI(v_hostname)))}, // TODO getHostname(PCSCF) how to hande the callid?

    				{mw_SipRequest(mw_MESSAGE_Request_Base(?))},

    				"TP_IMS_5093_01_mw",

    				"NOTIFY request",
@@ -676,14 +672,12 @@ group checksTC_IMS_0005 { 
    	function f_mtc_check_TP_IMS_5093_01_IMS_mw(InterfaceMonitor p_monitorCompRef) 

    		runs on TestCoordinator {

    		

    		var CallId v_callId; // TODO what it the call id? not initialized !!!

    		

    		var charstring v_hostname;

    		f_getHostname(PX_EUT_A, "pcscf", v_hostname); // needs recheck

    

    		p_monitorCompRef.start(

    			f_imsIot_receive(

    				{mw_SipRequest(mdw_TP_IMS_5093_01_IMS_mw(v_callId, mw_SIP_URI(v_hostname)))}, // TODO getHostname(PCSCF) how to hande the callid?

    				{mw_SipRequest(mdw_TP_IMS_5093_01_IMS_mw(?, mw_SIP_URI(v_hostname)))}, // TODO getHostname(PCSCF) how to hande the callid?

    				{mw_SipRequest(mw_MESSAGE_Request_Base(?))},

    				"TP_IMS_5093_01_mw",

    				"NOTIFY request",
@@ -703,15 +697,13 @@ group checksTC_IMS_0005 { 
		function f_mtc_check_TP_IMS_5094_01_UE(InterfaceMonitor p_monitorCompRef) 

			runs on TestCoordinator {

    		

			var CallId v_callId; // TODO what it the call id? not initialized !!!

    		

			var charstring v_hostname;

			var integer PX_UE_B := 1; // TODO this is just temporary, UE PIXIT needs to be determined

			f_getUEHostname(PX_UE_B, v_hostname); // TODO needs recheck, maybe in more detail with userOrTelephoneSubscriber etc

    

			p_monitorCompRef.start(

				f_imsIot_receive(

					{mw_SipRequest(mdw_TP_IMS_5094_01_UE(v_callId, mw_SIP_URI(v_hostname)))}, // TODO getHostname(PCSCF) how to hande the callid?

					{mw_SipRequest(mdw_TP_IMS_5094_01_UE(?, mw_SIP_URI(v_hostname)))}, // TODO getHostname(PCSCF) how to hande the callid?

					{mw_SipRequest(mw_MESSAGE_Request_Base(?))},

					"TP_IMS_5094_01_mw",

					"NOTIFY request",
@@ -729,14 +721,12 @@ group checksTC_IMS_0005 { 
		function f_mtc_check_TP_IMS_5094_01_IMS(InterfaceMonitor p_monitorCompRef) 

			runs on TestCoordinator {



			var CallId v_callId; // TODO what it the call id? not initialized !!!



			var charstring v_hostname;

			f_getHostname(PX_EUT_A, "pcscf", v_hostname); // needs recheck



			p_monitorCompRef.start(

				f_imsIot_receive(

					{mw_SipRequest(mdw_TP_IMS_5094_01_IMS_mw(v_callId, mw_SIP_URI(v_hostname)))}, // TODO getHostname(PCSCF) how to hande the callid?

					{mw_SipRequest(mdw_TP_IMS_5094_01_IMS_mw(?, mw_SIP_URI(v_hostname)))}, // TODO getHostname(PCSCF) how to hande the callid?

					{mw_SipRequest(mw_MESSAGE_Request_Base(?))},

					"TP_IMS_5094_01_mw",

					"NOTIFY request",

AtsImsIot/AtsImsIot_Templates.ttcn

+15 −15
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ module AtsImsIot_Templates { 
		* 

		* @desc Message Request containing a message body greater than 1500 bytes.

		*/

		template Request mdw_TP_IMS_4002_01(template CallId p_callId) modifies mw_MESSAGE_Request_Base := {

		template MESSAGE_Request mdw_TP_IMS_4002_01(template CallId p_callId) modifies mw_MESSAGE_Request_Base := {

			messageBody := {

				textplain := pattern "?#(1500,)" 

			}
@@ -49,7 +49,7 @@ module AtsImsIot_Templates { 
		 * @desc REGISTER Request containing secuity client header.

		 */

//    template REGISTER_Request mdw_TP_IMS_5011_01_gm modifies mw_REGISTER_Request_Base := {

    template Request mdw_TP_IMS_5011_01_gm modifies mw_REGISTER_Request_Base := {

    template REGISTER_Request mdw_TP_IMS_5011_01_gm modifies mw_REGISTER_Request_Base := {

      msgHeader := ?

    }
@@ -59,7 +59,7 @@ module AtsImsIot_Templates { 
     * @desc REGISTER Request checking TP_IMS_5011_01.

     */

    // template REGISTER_Request mdw_TP_IMS_5011_01_mw ( charstring p_EUTHostname ) modifies mw_REGISTER_Request_Base := {

    template Request mdw_TP_IMS_5011_01_mw ( charstring p_EUTHostname ) modifies mw_REGISTER_Request_Base := {

    template REGISTER_Request mdw_TP_IMS_5011_01_mw ( charstring p_EUTHostname ) modifies mw_REGISTER_Request_Base := {

      msgHeader := {

        path := mw_PathDef (p_EUTHostname),

        require :=  mw_Require ({"path", *}),
@@ -81,7 +81,7 @@ module AtsImsIot_Templates { 
     * @desc REGISTER Request checking TP_IMS_5011_02.

     */

    // template REGISTER_Request mdw_TP_IMS_5011_02_mw ( charstring p_EUTHostname  ) modifies mw_REGISTER_Request_Base := {

    template Request mdw_TP_IMS_5011_02_mw ( charstring p_EUTHostname  ) modifies mw_REGISTER_Request_Base := {

    template REGISTER_Request mdw_TP_IMS_5011_02_mw ( charstring p_EUTHostname  ) modifies mw_REGISTER_Request_Base := {

      msgHeader := {

        path := mw_PathDef (p_EUTHostname),

        require :=  mw_Require ({"path", *}),
@@ -137,7 +137,7 @@ module AtsImsIot_Templates { 
     * @desc SUBSCRIBE checking TP_IMS_5044_01.

     */

    // template SUBSCRIBE_Request mdw_TP_IMS_5044_01_mw(template SipUrl p_eutAUri, template SipUrl p_eutBUri)  

    template Request mdw_TP_IMS_5044_01_mw(template SipUrl p_eutAUri, 

    template SUBSCRIBE_Request mdw_TP_IMS_5044_01_mw(template SipUrl p_eutAUri, 

                                     template SipUrl p_eutBUri,

                                     template charstring p_EUTB_PublicId

                                     )
@@ -195,56 +195,56 @@ module AtsImsIot_Templates { 
			}

		}

    	

		template NOTIFY_Request mdw_TP_IMS_5088_01_mw(CallId p_callId, template SipUrl p_PCSCF_SIP_URI) modifies mw_NOTIFY_Request_Base := { 

		template NOTIFY_Request mdw_TP_IMS_5088_01_mw(template CallId p_callId, template SipUrl p_PCSCF_SIP_URI) modifies mw_NOTIFY_Request_Base := { 

			requestLine := { requestUri := p_PCSCF_SIP_URI }, // TODO check if this is the P-CSCF_SIP_URI

			msgHeader := { 

				event := {

					fieldName := EVENT_E, 

					eventType := pattern "*reg_event*", // TODO check content

					eventType := pattern "*reg*", // TODO check content

					eventParams := *},

				route := ? }, // TODO route header indicating the original Route_header from SUBSCRIBE 

			messageBody := ? // TODO 

		}

    	

        template NOTIFY_Request mdw_TP_IMS_5093_01_UE_mw(CallId p_callId, template SipUrl p_UE_SIP_URI) modifies mw_NOTIFY_Request_Base := { 

        template NOTIFY_Request mdw_TP_IMS_5093_01_UE_mw(template CallId p_callId, template SipUrl p_UE_SIP_URI) modifies mw_NOTIFY_Request_Base := { 

        	requestLine := { requestUri := p_UE_SIP_URI }, // TODO check if this is the UE_SIP_URI

        	msgHeader := { 

        		event := {

        			fieldName := EVENT_E, 

        			eventType := pattern "*reg_event*", // TODO check content

        			eventType := pattern "*reg*", // TODO check content

        			eventParams := *},

        		route := ? }, // TODO route header indicating the original Route_header from SUBSCRIBE 

        	messageBody := ? // TODO 

        }       

            

        template NOTIFY_Request mdw_TP_IMS_5093_01_IMS_mw(CallId p_callId, template SipUrl p_PCSCF_SIP_URI) modifies mw_NOTIFY_Request_Base := { 

        template NOTIFY_Request mdw_TP_IMS_5093_01_IMS_mw(template CallId p_callId, template SipUrl p_PCSCF_SIP_URI) modifies mw_NOTIFY_Request_Base := { 

        	requestLine := { requestUri := p_PCSCF_SIP_URI }, // TODO check if this is the P-CSCF_SIP_URI

        	msgHeader := { 

        		event := {

        			fieldName := EVENT_E, 

        			eventType := pattern "*reg_event*", // TODO check content

        			eventType := pattern "*reg*", // TODO check content

        			eventParams := *},

        		route := ? }, // TODO route header indicating the original Route_header from SUBSCRIBE 

        	messageBody := ? // TODO 

        }  

    	

		template NOTIFY_Request mdw_TP_IMS_5094_01_UE(CallId p_callId, template SipUrl p_UE_SIP_URI) modifies mw_NOTIFY_Request_Base := { 

		template NOTIFY_Request mdw_TP_IMS_5094_01_UE(template CallId p_callId, template SipUrl p_UE_SIP_URI) modifies mw_NOTIFY_Request_Base := { 

			requestLine := { requestUri := p_UE_SIP_URI }, // TODO check if this is the UE_SIP_URI

			msgHeader := { 

				event := {

					fieldName := EVENT_E, 

					eventType := pattern "*reg_event*", // TODO check content

					eventType := pattern "*reg*", // TODO check content

					eventParams := *},

				route := ? }, // TODO route header indicating the original Route_header from SUBSCRIBE 

			messageBody := ? // TODO 

		} 

            

		template NOTIFY_Request mdw_TP_IMS_5094_01_IMS_mw(CallId p_callId, template SipUrl p_PCSCF_SIP_URI) modifies mw_NOTIFY_Request_Base := { 

		template NOTIFY_Request mdw_TP_IMS_5094_01_IMS_mw(template CallId p_callId, template SipUrl p_PCSCF_SIP_URI) modifies mw_NOTIFY_Request_Base := { 

			requestLine := { requestUri := p_PCSCF_SIP_URI }, // TODO check if this is the P-CSCF_SIP_URI

			msgHeader := { 

				event := {

					fieldName := EVENT_E, 

					eventType := pattern "*reg_event*", // TODO check content

					eventType := pattern "*reg*", // TODO check content

					eventParams := *},

				route := ? }, // TODO route header indicating the original Route_header from SUBSCRIBE 

			messageBody := ? // TODO