Commit ad38ffc4 authored by poglitsch's avatar poglitsch
Browse files

corrections

parent 53d6e1d2

AtsImsIot/AtsImsIot_Behavior.ttcn

+32 −45
Original line number Diff line number Diff line
@@ -109,22 +109,13 @@ group checksTC_IMS_MESS_0001{ 
    		ImsInterfaceMonitor p_monitorCompRef, boolean p_checkMessage

    	) runs on ImsTestCoordinator {

    		var charstring v_EUT_A_Addr := f_GetEUTPcscfAddress(PX_EUT_A);

    		p_monitorCompRef.start(

        		f_imsIot_receive (

                    {},

                    {mw_SipRequest(mdw_TP_IMS_5011_01f_mw)},

                    {0, omit},

                    "TP_IMS_5011_01",

                    false,

                    true

        		)

        	);

    		p_monitorCompRef.done;

    		   

    		p_monitorCompRef.start(

    			f_imsIot_receive(

    				{mw_SipRequest(mdw_TP_IMS_5011_01p_mw(v_EUT_A_Addr))},

    				{mw_SipRequest(mw_REGISTER_Request_Base)},

    				{

						mw_SipRequest(mdw_TP_IMS_5011_01f_mw),

    					mw_SipRequest(mw_REGISTER_Request_Base)

    				},

    				{0, omit},

    				"TP_IMS_5011_01",

    				false,
@@ -186,25 +177,14 @@ group checksTC_IMS_MESS_0001{ 
		) runs on ImsTestCoordinator {

			var charstring v_EUT_A_Addr := f_GetEUTPcscfAddress(PX_EUT_A);    		



			p_monitorCompRef.start(

				f_imsIot_receive(

					{},

					{mw_SipRequest(mdw_TP_IMS_5011_02f_mw)},

					{0, omit},

					"TP_IMS_5011_02",

					true,

					true

				)

			);

			p_monitorCompRef.done;



			p_monitorCompRef.start(

    			f_imsIot_receive(

    				{mw_SipRequest(mdw_TP_IMS_5011_02p_mw(v_EUT_A_Addr))},

    				{mw_SipRequest(mw_REGISTER_Request_Base)},

    				{mw_SipRequest(mdw_TP_IMS_5011_02f_mw),

    				mw_SipRequest(mw_REGISTER_Request_Base)},

    				{0, omit},

    				"TP_IMS_5011_02",

    				true,

    				false,

    				p_checkMessage

    			)

			);
@@ -225,7 +205,7 @@ group checksTC_IMS_MESS_0001{ 
					{mw_SipRequest(mw_REGISTER_Request_Base)},

					{0, omit},

					"TP_IMS_5089_01 (when)",

					true,

					false,

					p_checkMessage

				)

			);
@@ -245,7 +225,7 @@ group checksTC_IMS_MESS_0001{ 
                {mw_SipResponse (mw_401Unauthorized_Base)},

                {0, omit},

                "TP_IMS_5089_01",

                true,

                false,

				p_checkMessage

            )

           );
@@ -287,7 +267,7 @@ group checksTC_IMS_MESS_0001{ 
        		{mw_SipRequest(mw_REGISTER_Request_Base)},

        		{0, omit},

        		"TP_IMS_5092_01 (when)",

        		true,

        		false,

				p_checkMessage

        		)

        	);
@@ -310,7 +290,7 @@ group checksTC_IMS_MESS_0001{ 
        			{mw_SipResponse (mw_200OK_Base)},

        			{0, omit},

        			"TP_IMS_5092_01",

        			true,

        			false,

					p_checkMessage

    			)

    		);
@@ -326,7 +306,7 @@ group checksTC_IMS_MESS_0001{ 
    		ImsInterfaceMonitor p_monitorCompRef, boolean p_checkMessage

    	) runs on ImsTestCoordinator return Response {

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

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

			var SipMessage v_sip := {response := valueof(m_Response_Dummy)};

			p_monitorCompRef.start(

					f_imsIot_receive(

					{mw_SipResponse(mw_200OK_Base)},
@@ -370,12 +350,15 @@ group checksTC_IMS_MESS_0001{ 
    		f_getSipMsgFromMonitor(p_monitorCompRef, v_sip);

    		// Check that the expires header is set to "a value greater than the one 

    		// in the Expires_header of the 200_response"

    		

    		if(ispresent(p_200OK.msgHeader.expires)) {

        		v_Epires200OK := p_200OK.msgHeader.expires.deltaSec;

        		v_EpiresSubscribe  := v_sip.request.msgHeader.expires.deltaSec;

    		if (char2int(v_EpiresSubscribe) > char2int(v_Epires200OK)) {

        		if (str2int(v_EpiresSubscribe) > str2int(v_Epires200OK)) {

        			f_setIotVerdictFAIL("TP_IMS_5044_01 - Expires_header of subscribe is NOT greater than the Expires_header of 200_response.");

        		}

    		} 	

    	}



		/**

        * @desc Starts monitor component behavior for TP_IMS_5096_01
@@ -428,7 +411,7 @@ group checksTC_IMS_MESS_0001{ 
           // lower expiry time than specified in the initial SUBSCRIBE"

		   v_Epires200OK := v_sip.response.msgHeader.expires.deltaSec;

		   v_EpiresSubscribe  := p_Subscribe.msgHeader.expires.deltaSec;          

           if (char2int(v_Epires200OK) <= char2int(v_EpiresSubscribe)) {

           if (str2int(v_Epires200OK) <= str2int(v_EpiresSubscribe)) {

			 f_setIotVerdictFAIL("TP_IMS_5096_01 - - Expires_header Expires_header of 200_response is NOT the same or lower than the Expires_header of subscribe.");

           }

	    }
@@ -1776,10 +1759,11 @@ 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);

    		   	    		

    		p_monitorCompRef.start(

    		 f_imsIot_receive(

    			{mw_SipResponse(mdw_TP_IMS_5055_01_mw(v_pcscfEutAUrl))},

    			{mw_SipResponse(mdw_TP_IMS_5055_01_mw(v_pcscfEutAUrl, v_UserEutAUrl))},

    			{mw_SipResponse(mw_180Ringing_Base)},

    			{0, omit},

    			"TP_IMS_5055_01",
@@ -1821,10 +1805,10 @@ 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);

    		p_monitorCompRef.start(

    		 f_imsIot_receive(

    			{mw_SipResponse(mdw_TP_IMS_5055_02_mw(v_pcscfEutAUrl))},

    			{mw_SipResponse(mdw_TP_IMS_5055_02_mw(v_pcscfEutAUrl, v_UserEutAUrl))},

    			{mw_SipResponse(mw_200OK_Base)},

    			{0, omit},

    			"TP_IMS_5055_02",
@@ -2214,7 +2198,7 @@ group checksTC_IMS_CALL_0009 { 
			boolean p_checkMessage

		) runs on ImsTestCoordinator  {

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

			var RouteBody_List p_recordRoute;

			var template RecordRoute p_recordRoute := omit;

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

			

			p_monitorCompRef.start(
@@ -2231,7 +2215,9 @@ group checksTC_IMS_CALL_0009 { 
			

			// get Record-route header from prev ACK

			f_getSipMsgFromMonitor(p_monitorCompRef, v_sip); 

			p_recordRoute := v_sip.request.msgHeader.recordRoute.routeBody;

			if(ispresent(v_sip.request.msgHeader.recordRoute)){

				p_recordRoute := v_sip.request.msgHeader.recordRoute;

			}

			

			

			p_monitorCompRef.start(
@@ -3244,6 +3230,7 @@ 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 SipMessage v_sip := {request := valueof(m_INVITE_Dummy)};

		   var Route v_Route;

		   var template Route vt_pcscfRoute := {
@@ -3255,8 +3242,8 @@ group checksTC_IMS_SS_0008 { 
					viaBody := {mw_ViaBody_interface(v_pcscfEutAUrl.hostPort), *}  };

           p_monitorCompRef.start(

            f_imsIot_receive(

                {mw_SipRequest(mdw_TP_IMS_5046_01_mw(v_pcscfEutAUrl))},

                {},

                {mw_SipRequest(mdw_TP_IMS_5046_01_mw(v_pcscfEutAUrl, v_UserEutBUrl))},

                {mw_SipRequest(mw_INVITE_Request_Base)},

                {0, omit},

                "TP_IMS_5046_01",

                true,