Commit 19882a0e authored by ringst's avatar ringst
Browse files

TC_IMS_REG_0001 ready for review

parent ad72e6f3
Loading
Loading
Loading
Loading
+152 −127
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ group checksTC_IMS_REG_0001 {
    	 * @param p_monitorCompRef Reference to monitor component
    	 */
        function f_mtc_check_TP_IMS_5011_01_gm(
	    	ImsInterfaceMonitor p_monitorCompRef
        	ImsInterfaceMonitor p_monitorCompRef, boolean p_checkMessage
        ) runs on ImsTestCoordinator {
    	   
           p_monitorCompRef.start(
@@ -313,7 +313,7 @@ group checksTC_IMS_REG_0001 {
                {0, omit},
                "TP_IMS_5011_01",
                false,
                false
    			p_checkMessage
            )
           );
           p_monitorCompRef.done;
@@ -324,13 +324,26 @@ group checksTC_IMS_REG_0001 {
    	 * 		 on the Mw-interface
    	 * @param p_monitorCompRef Reference to monitor component
    	 */
    	 
    	function f_mtc_check_TP_IMS_5011_01_mw(
    		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_01_mw(v_EUT_A_Addr))},
                    {},
                    {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)},
    				{0, omit},
    				"TP_IMS_5011_01",
@@ -346,7 +359,7 @@ group checksTC_IMS_REG_0001 {
        * @param p_monitorCompRef Reference to monitor component
        */		
    	function f_mtc_check_TP_IMS_5089_01_gm_when (
        	ImsInterfaceMonitor p_monitorCompRef
        	ImsInterfaceMonitor p_monitorCompRef, boolean p_checkMessage
        ) runs on ImsTestCoordinator {
    		p_monitorCompRef.start(
    			f_imsIot_receive(
@@ -355,7 +368,7 @@ group checksTC_IMS_REG_0001 {
    				{0, omit},
    				"TP_IMS_5089_01_gm_when",
    				false,
					false
    				p_checkMessage
    			)
    		);
    		p_monitorCompRef.done;
@@ -368,7 +381,7 @@ group checksTC_IMS_REG_0001 {
        * @param p_monitorCompRef Reference to monitor component
        */
    	function f_mtc_check_TP_IMS_5011_02_gm(
			ImsInterfaceMonitor p_monitorCompRef
    		ImsInterfaceMonitor p_monitorCompRef, boolean p_checkMessage
    	) runs on ImsTestCoordinator {
    	   
    		p_monitorCompRef.start(
@@ -378,7 +391,7 @@ group checksTC_IMS_REG_0001 {
    				{0, omit},
    				"TP_IMS_5011_02_gm",
    				false,
					false
    				p_checkMessage
    			)
    		);
    		p_monitorCompRef.done;
@@ -392,9 +405,22 @@ group checksTC_IMS_REG_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_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_02_mw(v_EUT_A_Addr))},
    				{mw_SipRequest(mdw_TP_IMS_5011_02p_mw(v_EUT_A_Addr))},
    				{mw_SipRequest(mw_REGISTER_Request_Base)},
    				{0, omit},
    				"TP_IMS_5011_02",
@@ -411,7 +437,7 @@ group checksTC_IMS_REG_0001 {
        * @param p_monitorCompRef Reference to monitor component
        */
    	function f_mtc_check_TP_IMS_5089_01_mw_when(
    		ImsInterfaceMonitor p_monitorCompRef
    		ImsInterfaceMonitor p_monitorCompRef, boolean p_checkMessage
    	) runs on ImsTestCoordinator {
			p_monitorCompRef.start(
				f_imsIot_receive(
@@ -420,7 +446,7 @@ group checksTC_IMS_REG_0001 {
					{0, omit},
					"TP_IMS_5089_01 (when)",
					true,
					false
					p_checkMessage
				)
			);
    		p_monitorCompRef.done;
@@ -431,7 +457,7 @@ group checksTC_IMS_REG_0001 {
		 * @param p_monitorCompRef Reference to monitor component
		 */
	    function f_mtc_check_TP_IMS_5089_01_mw_then(
	    	ImsInterfaceMonitor p_monitorCompRef
	    	ImsInterfaceMonitor p_monitorCompRef, boolean p_checkMessage
	    ) runs on ImsTestCoordinator {
          p_monitorCompRef.start(
            f_imsIot_receive(
@@ -440,7 +466,7 @@ group checksTC_IMS_REG_0001 {
                {0, omit},
                "TP_IMS_5089_01",
                true,
                false
				p_checkMessage
            )
           );
           p_monitorCompRef.done;
@@ -453,7 +479,7 @@ group checksTC_IMS_REG_0001 {
    	* @param p_monitorCompRef Reference to monitor component
    	*/
    	function f_mtc_check_TP_IMS_5092_01_gm(
    		ImsInterfaceMonitor p_monitorCompRef
    		ImsInterfaceMonitor p_monitorCompRef, boolean p_checkMessage
    	) runs on ImsTestCoordinator {
    		p_monitorCompRef.start(
			f_imsIot_receive(
@@ -462,7 +488,7 @@ group checksTC_IMS_REG_0001 {
        		{0, omit},
        		"TP_IMS_5092_01_gm",
        		false,
        		false
				p_checkMessage
    			)
    		);
   			p_monitorCompRef.done;
@@ -473,7 +499,7 @@ group checksTC_IMS_REG_0001 {
		* @param p_monitorCompRef Reference to monitor component
		*/
        function f_mtc_check_TP_IMS_5092_01_mw_when(
        	ImsInterfaceMonitor p_monitorCompRef
        	ImsInterfaceMonitor p_monitorCompRef, boolean p_checkMessage
        ) runs on ImsTestCoordinator {
        	p_monitorCompRef.start(
        	f_imsIot_receive(
@@ -482,7 +508,7 @@ group checksTC_IMS_REG_0001 {
        		{0, omit},
        		"TP_IMS_5092_01 (when)",
        		true,
        		false
				p_checkMessage
        		)
        	);
			p_monitorCompRef.done;
@@ -517,7 +543,7 @@ group checksTC_IMS_REG_0001 {
		* @param p_monitorCompRef Reference to monitor component
		*/
    	function f_mtc_check_TP_IMS_5044_01_mw_when(
    		ImsInterfaceMonitor p_monitorCompRef
    		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;
@@ -528,7 +554,7 @@ group checksTC_IMS_REG_0001 {
					{0, omit},
					"TP_IMS_5044_01 (when)",
					true,
					false
					p_checkMessage
				)
			);
			p_monitorCompRef.done;
@@ -571,13 +597,12 @@ group checksTC_IMS_REG_0001 {
    		}
    	}

		// @TODO
		/**
        * @desc Starts monitor component behavior for TP_IMS_5096_01
        * @param p_monitorCompRef Reference to monitor component
        */
		function f_mtc_check_TP_IMS_5096_01_mw_when(
			ImsInterfaceMonitor p_monitorCompRef
			ImsInterfaceMonitor p_monitorCompRef, boolean p_checkMessage
		) runs on ImsTestCoordinator  return Request {
    		var SipMessage v_sip;
    		p_monitorCompRef.start(
@@ -587,7 +612,7 @@ group checksTC_IMS_REG_0001 {
    				{0, omit},
    				"TP_IMS_5096_01 (when)",
    				true,
    				false
					p_checkMessage
    			)
    		);
    		p_monitorCompRef.done;
@@ -600,7 +625,7 @@ group checksTC_IMS_REG_0001 {
		 * @desc Starts monitor component behavior for TP_IMS_5096_01
		 */
	    function f_mtc_check_TP_IMS_5096_01_mw(
	    	ImsInterfaceMonitor p_monitorCompRef, Request p_Subscribe
	    	ImsInterfaceMonitor p_monitorCompRef, Request p_Subscribe, boolean p_checkMessage
	    ) runs on ImsTestCoordinator
	    {
		   var SipMessage v_sip;
@@ -613,7 +638,7 @@ group checksTC_IMS_REG_0001 {
                {0, omit},
                "TP_IMS_5096_01",
                true,
                false
				p_checkMessage
            )
           );
           p_monitorCompRef.done;
+40 −23
Original line number Diff line number Diff line
@@ -87,19 +87,15 @@ 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 REGISTER_Request mdw_TP_IMS_5011_01p_mw ( charstring p_EUTHostname ) modifies mw_REGISTER_Request_Base := {
      msgHeader := {
        path := mw_PathDef (p_EUTHostname), 
        require :=  mw_Require ({"path", *}), 
		pChargingVector := {
			fieldName := P_CHARGING_VECTOR_E,
			chargeParams := {
    			*,
				{id := "icid-value", paramValue := ?},
    			*,
				{id := "orig-ioi", paramValue := ?},
    			*,
    			complement({id := "term-ioi", paramValue := ?}),
				*
			}
		},
@@ -109,6 +105,23 @@ module AtsImsIot_Templates {
        pVisitedNetworkID := mw_PVisitedNetworkIDAny
      }
    }
    
	/**
	* 
	* @desc REGISTER Request checking TP_IMS_5011_01.
	*/
	template REGISTER_Request mdw_TP_IMS_5011_01f_mw modifies mw_REGISTER_Request_Base := {
		msgHeader := {
			pChargingVector := {
				fieldName := P_CHARGING_VECTOR_E,
				chargeParams := {
					{id := "term-ioi", paramValue := ?},
					*
				}
			}
		}
	}    
    
   /**
     * 
     * @desc REGISTER Request checking TP_IMS_5134_01.
@@ -123,15 +136,13 @@ 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 REGISTER_Request mdw_TP_IMS_5011_02_mw ( charstring p_EUTHostname  ) modifies mw_REGISTER_Request_Base := {
    template REGISTER_Request mdw_TP_IMS_5011_02p_mw ( charstring p_EUTHostname  ) modifies mw_REGISTER_Request_Base := {
      msgHeader := {
        path := mw_PathDef (p_EUTHostname),
        require :=  mw_Require ({"path", *}), 
        pChargingVector :=  mw_PChargingVector({
            {id := "icid-value", paramValue := *}, 
            {id := "orig-ioi", paramValue := *}, 
            {id := "term-ioi", paramValue := *}, 
            {id := "icid-value", paramValue := ?}, 
            {id := "orig-ioi", paramValue := ?}, 
            *
          }),
        authorization := m_Authorization(mw_credentialIntegrityYes), 
@@ -140,6 +151,20 @@ module AtsImsIot_Templates {
        pVisitedNetworkID := mw_PVisitedNetworkIDAny
      }
    }

	/**
	* 
	* @desc REGISTER Request checking TP_IMS_5011_02.
	*/    
	template REGISTER_Request mdw_TP_IMS_5011_02f_mw modifies mw_REGISTER_Request_Base := {
		msgHeader := { 
			pChargingVector :=  mw_PChargingVector({
				{id := "term-ioi", paramValue := ?}, 
				*
			})
		}
	}    
    
	/**
	* 
	* @desc REGISTER Request checking TP_IMS_5089_01.
@@ -171,7 +196,7 @@ module AtsImsIot_Templates {
				fieldName := P_ASSOCIATED_URI_E, 
				nameAddrList := ?
			},
			pChargingVector :=  mw_PChargingVector({ 
			pChargingVector :=  mw_PChargingVector({  // @TODO indicating operator_identifier of IMS_? (IUT_?)?
							{id := "term-ioi", paramValue := ?}, 
							*
			}),
@@ -601,13 +626,6 @@ module AtsImsIot_Templates {
    	template SipUrl p_SCSCF_SIP_URI
    ) modifies mw_MESSAGE_Request_Base := {
        msgHeader := {
            route := {
                fieldName := ROUTE_E,
                routeBody := {
                	complement(mw_routeBody(p_SCSCF_SIP_URI)),
                	*
                }
            },
            pChargingVector := {
                fieldName := P_CHARGING_VECTOR_E,
                chargeParams := {
@@ -615,8 +633,7 @@ module AtsImsIot_Templates {
                    {id := "access-network-charging-info", paramValue := ?},
                    *
                }
            },
            pAccessNetworkInfo := omit
            }
        }
    }
    
+16 −14
Original line number Diff line number Diff line
@@ -57,25 +57,27 @@ module AtsImsIot_TestCases_REG {
		// test body
		f_mtc_userTriggerRegistration(v_ueB, f_getAnyValidUser(PX_EUT_B)); // Test Sequence Step 1
		
		f_mtc_check_TP_IMS_5011_01_gm(v_gmA); // Check1 when
		f_mtc_check_TP_IMS_5011_01_mw(v_mw, true); // Check1 then @TODO fields need to be checked (pChargingVector, mw_credentialIntegrityNo)
		// @TODO check mw_credentialIntegrityNo, mw_credentialIntegrityYes
		
		f_mtc_check_TP_IMS_5089_01_gm_when(v_gmA); // Check4 when (Gm)
		f_mtc_check_TP_IMS_5089_01_mw_when(v_mw); // Check4 when (Mw) @TODO fields need to be checked (mw_credentialIntegrityNo)
		f_mtc_check_TP_IMS_5089_01_mw_then(v_mw); // Check4 then @TODO fields in mw_WwwAuthenticate
		f_mtc_check_TP_IMS_5011_01_gm(v_gmA, false); // Check1 when
		f_mtc_check_TP_IMS_5011_01_mw(v_mw, true); // Check1 then 
				
		f_mtc_check_TP_IMS_5011_02_gm(v_gmA); // Check2 when (Gm)
		f_mtc_check_TP_IMS_5011_02_mw(v_mw, true);  // Check2 then (Mw) @TODO fields need to be checked (pChargingVector, mw_credentialIntegrityYes)
		f_mtc_check_TP_IMS_5089_01_gm_when(v_gmA, false); // Check4 when (Gm)
		f_mtc_check_TP_IMS_5089_01_mw_when(v_mw, false); // Check4 when (Mw) 
		f_mtc_check_TP_IMS_5089_01_mw_then(v_mw, false); // Check4 then @TODO check mw_WwwAuthenticate
		
		f_mtc_check_TP_IMS_5092_01_gm(v_gmA); // Check5 when (Gm)
		f_mtc_check_TP_IMS_5092_01_mw_when(v_mw); // Check5 when (Mw) @TODO fields need to be checked (mw_credentialIntegrityNo)		
		f_mtc_check_TP_IMS_5092_01_mw(v_mw, true); // Check5 then @TODO fields need to be checked (pChargingVector)
		f_mtc_check_TP_IMS_5011_02_gm(v_gmA, false); // Check2 when (Gm)
		f_mtc_check_TP_IMS_5011_02_mw(v_mw, true);  // Check2 then (Mw)
		
		v_200OK_Step8 := f_mtc_check_TP_IMS_5044_01_mw_when(v_mw); // Check3 when
		f_mtc_check_TP_IMS_5092_01_gm(v_gmA, false); // Check5 when (Gm)
		f_mtc_check_TP_IMS_5092_01_mw_when(v_mw, false); // Check5 when (Mw)		
		f_mtc_check_TP_IMS_5092_01_mw(v_mw, true); // Check5 then
		
		v_200OK_Step8 := f_mtc_check_TP_IMS_5044_01_mw_when(v_mw, false); // Check3 when
		f_mtc_check_TP_IMS_5044_01_mw(v_mw, v_200OK_Step8, true); // Check3 then
		
		v_Subscribe_Step10 := f_mtc_check_TP_IMS_5096_01_mw_when(v_mw); // Check6 when 
		f_mtc_check_TP_IMS_5096_01_mw(v_mw, v_Subscribe_Step10); // Check6 then
		v_Subscribe_Step10 := f_mtc_check_TP_IMS_5096_01_mw_when(v_mw, false); // Check6 when 
		f_mtc_check_TP_IMS_5096_01_mw(v_mw, v_Subscribe_Step10, false); // Check6 then
		
		// Test Sequence Step 2
		f_mtc_userCheckRegistration(v_ueB, f_getAnyValidUser(PX_EUT_B));
@@ -353,7 +355,7 @@ module AtsImsIot_TestCases_REG {
		// test body
		f_mtc_userTriggerRegistration(v_ueB, f_getAnyValidUser(PX_EUT_B)); 
		
		f_mtc_check_TP_IMS_5011_01_gm(v_gmA);
		f_mtc_check_TP_IMS_5011_01_gm(v_gmA, false);
		
		f_mtc_check_TP_IMS_5134_01_mw(v_mw); // Check1 
		f_mtc_check_TP_IMS_5405_01_mw(v_mw); // Check2