Commit e5e66d9e authored by poglitsch's avatar poglitsch
Browse files

corrections

parent 94229bc5

AtsImsIot/AtsImsIot_Behavior.ttcn

+5 −3
Original line number Diff line number Diff line
@@ -3295,7 +3295,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 ImsUserInfo v_user := f_getAnyValidUser(PX_EUT_A);

			var ImsUserInfo v_user := f_getAnyValidUser(PX_EUT_B);

			var template SipUrl v_UserEutBUrl := mw_SipUrl_Host(v_user.domain);

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

		   var template Route v_Route := omit;
@@ -4087,8 +4087,10 @@ group checksTC_IMS_SS_0010 { 
	    		

	       p_monitorCompRef.start(

            f_imsIot_receive(

                {mw_SipRequest(mdw_TP_IMS_5106_02_mw(*,v_SCSCF_A_Uri))},

                {mw_SipRequest(mw_UPDATE_Request_Base(*))},

                {mw_SipRequest(mdw_TP_IMS_5106_02_p_mw(*,v_SCSCF_A_Uri))},

                {

					mw_SipRequest(mdw_TP_IMS_5106_02_f_mw(*,v_SCSCF_A_Uri)),

                	mw_SipRequest(mw_UPDATE_Request_Base(*))},

                {0, omit},

                "TP_IMS_5106_02",

                false,

AtsImsIot/AtsImsIot_Templates.ttcn

+39 −13
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ module AtsImsIot_Templates { 
    		routeBody := {mw_routeBody(p_pcscfEutAUri), *}       		

      	},

		pPreferredID := omit,

		pAssertedID := mw_PAssertedID(mw_PAssertedIDValue(p_userEutBUrl)),//TODO containing an address of UE_A!

		pAssertedID := mw_PAssertedID(mw_PAssertedIDValue(p_userEutBUrl)),

        pChargingVector :=  mw_PChargingVector({

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

            *
@@ -348,21 +348,34 @@ module AtsImsIot_Templates { 
	  * 

	  * @desc BYE Request checking TP_IMS_5052_01 on MW

	  */

	template BYE_Request mdw_TP_IMS_5052_01_mw(template CallId p_callId, template SipUrl p_pcscfEutAUri, template RecordRoute p_route)

	template BYE_Request mdw_TP_IMS_5052_01_p_mw(template CallId p_callId, template RecordRoute p_route)

	 modifies mw_BYE_Request_Base := {

	  msgHeader := {

		route := {

			fieldName := ROUTE_E,

			routeBody := *

		},

		recordRoute := p_route

	  }

	}



	template BYE_Request mdw_TP_IMS_5052_01_f_mw(

		template CallId p_callId, 

		template SipUrl p_pcscfEutAUri)

	modifies mw_BYE_Request_Base := {

		msgHeader := {

    		route := {

    			fieldName := ROUTE_E,

    			routeBody := {

    				*, 

				complement(mw_routeBody(p_pcscfEutAUri)),

    				mw_routeBody(p_pcscfEutAUri),

    				*

    			}

		},

		recordRoute := p_route

    		}

    	}

	}



    

	/**

	  * 

	  * @desc 180 Ringing Response checking TP_IMS_5055_01 on MW
@@ -1739,26 +1752,23 @@ module AtsImsIot_Templates { 
	/**

	  * @desc UPDATE Request checking TP_IMS_5106_02

	  */

	template UPDATE_Request mdw_TP_IMS_5106_02_mw(

	template UPDATE_Request mdw_TP_IMS_5106_02_p_mw(

		template CallId p_callId,

		template SipUrl p_SCSCF_URI

	) modifies mw_UPDATE_Request_Base := {

	  msgHeader := {        

		route := {

    		fieldName := ROUTE_E,

    		routeBody := {

    			complement(mw_routeBody(p_SCSCF_URI)),

    			*

    		}

    		routeBody := *

		},

      	recordRoute := {

    		fieldName := RECORD_ROUTE_E,

    		routeBody := {

    			*,

    			mw_routeBody(p_SCSCF_URI), 

    			*

    		}       		

      	},

      	pAccessNetworkInfo := omit,

        pChargingVector :=  mw_PChargingVector({

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

            *
@@ -1766,6 +1776,22 @@ module AtsImsIot_Templates { 
	  }

	}

	



    template UPDATE_Request mdw_TP_IMS_5106_02_f_mw(

    	template CallId p_callId,

    	template SipUrl p_SCSCF_URI

    ) modifies mw_UPDATE_Request_Base := {

        msgHeader := {        

        	route := {

        		fieldName := ROUTE_E,

        		routeBody := {

        			mw_routeBody(p_SCSCF_URI),

        			*

        		}

        	}

        }

    }



  	}//end group

	group HeaderTemplates {

AtsImsIot/AtsImsIot_TestCases_MESS.ttcn

+0 −2
Original line number Diff line number Diff line
@@ -255,8 +255,6 @@ module AtsImsIot_TestCases_MESS { 
		// test body

		f_mtc_userSendMessage(v_ueA, "test"); 

		

		f_mtc_check_TP_IMS_5050_01_gm(v_gmA, false); // TODO must be checked

		f_mtc_check_TP_IMS_5050_01_mw(v_mw, true);

		f_mtc_check_TP_IMS_5108_02_mw(v_mw); // TODO must be checked

		

		f_mtc_userCheckMessageReceipt(v_ueB);