Commit 24c6312e authored by wattelet's avatar wattelet
Browse files

EPC TCs errors correction

parent a4c3456b
Loading
Loading
Loading
Loading
+47 −34
Original line number Diff line number Diff line
@@ -5462,7 +5462,7 @@ group checksTC_IMS_SHARE_0009 {
            ImsInterfaceMonitor p_monitorCompRef
        ) runs on ImsTestCoordinator {
            p_monitorCompRef.start (
				f_receiveDiameterMsg ( mw_ASR_dummy , "TP_EPC_6005_01", true )
				f_receiveDiameterMsg ( { aSR_MSG := mw_ASR_dummy } , "TP_EPC_6005_01", true )
            );
			p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_EPC_6005_01
@@ -5490,7 +5490,7 @@ group checksTC_IMS_SHARE_0009 {
            ImsInterfaceMonitor p_monitorCompRef
        ) runs on ImsTestCoordinator {
            p_monitorCompRef.start (
                f_receiveDiameterMsg ( mw_ASR_dummy , "TP_EPC_6005_02", true )
                f_receiveDiameterMsg ( { aSR_MSG := mw_ASR_dummy } , "TP_EPC_6005_02", true )
            );
			p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_EPC_6005_02
@@ -5523,15 +5523,15 @@ group checksTC_IMS_SHARE_0009 {
            ImsInterfaceMonitor p_monitorCompRef
        ) runs on ImsTestCoordinator {
            p_monitorCompRef.start (
                f_receiveDiameterMsg ( mw_ASA_dummy , "TP_EPC_6006_01", true )
                f_receiveDiameterMsg ( { aSA_MSG := mw_ASA_dummy } , "TP_EPC_6006_01", true )
            );
            p_monitorCompRef.done;
            p_monitorCompRef.start (
            	f_receiveDiameterMsg ( mw_STR_dummy , "TP_EPC_6006_01", true )
            	f_receiveDiameterMsg ( { sTR_MSG := mw_STR_dummy } , "TP_EPC_6006_01", true )
            );
			p_monitorCompRef.done;
            p_monitorCompRef.start (
                f_receiveDiameterMsg ( mw_STA_dummy , "TP_EPC_6009_01", true )
                f_receiveDiameterMsg ( { sTA_MSG := mw_STA_dummy } , "TP_EPC_6009_01", true )
            );
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_EPC_6006_01
@@ -5564,11 +5564,11 @@ group checksTC_IMS_SHARE_0009 {
            ImsInterfaceMonitor p_monitorCompRef
        ) runs on ImsTestCoordinator {
            p_monitorCompRef.start (
                f_receiveDiameterMsg ( mw_ASA_dummy , "TP_EPC_6006_02", true )
                f_receiveDiameterMsg ( { aSA_MSG := mw_ASA_dummy } , "TP_EPC_6006_02", true )
            );
            p_monitorCompRef.done;
            p_monitorCompRef.start (
                f_receiveDiameterMsg ( mw_STR_dummy , "TP_EPC_6006_02", true )
                f_receiveDiameterMsg ( { sTR_MSG := mw_STR_dummy } , "TP_EPC_6006_02", true )
            );
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_EPC_6006_02
@@ -5597,7 +5597,7 @@ group checksTC_IMS_SHARE_0009 {
            ImsInterfaceMonitor p_monitorCompRef
        ) runs on ImsTestCoordinator {
            p_monitorCompRef.start (
                f_receiveDiameterMsg ( mw_STA_dummy , "TP_EPC_6009_01", true )
                f_receiveDiameterMsg ( { sTA_MSG := mw_STA_dummy } , "TP_EPC_6009_01", true )
            );
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_EPC_6009_01
@@ -5768,11 +5768,11 @@ group checksTC_IMS_SHARE_0009 {
            );
            p_monitorCompRef.done;
            p_monitorCompRef_B.start (
                f_receiveDiameterMsg ( mw_STR_dummy , "TP_EPC_6012_02", true )
                f_receiveDiameterMsg ( { sTR_MSG := mw_STR_dummy } , "TP_EPC_6012_02", true )
            );
            p_monitorCompRef_B.done;
            p_monitorCompRef_B.start (
                f_receiveDiameterMsg ( mw_STA_dummy , "TP_EPC_6012_02", true )
                f_receiveDiameterMsg ( { sTA_MSG := mw_STA_dummy } , "TP_EPC_6012_02", true )
            );
            p_monitorCompRef_B.done;
        } // End of function f_mtc_check_TP_EPC_6012_02
@@ -5813,7 +5813,7 @@ group checksTC_IMS_SHARE_0009 {
            ImsInterfaceMonitor p_monitorCompRef
        ) runs on ImsTestCoordinator {
            p_monitorCompRef.start (
                f_receiveDiameterMsg ( mw_AAR_dummy , "TP_EPC_6013_01", true )
                f_receiveDiameterMsg ( { aAR_MSG := mw_AAR_dummy } , "TP_EPC_6013_01", true )
            );
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_EPC_6013_01
@@ -5825,11 +5825,10 @@ group checksTC_IMS_SHARE_0009 {
         * The check operation allows read access to the top element of incoming port queues without removing the top element from the queue.
         */
        function f_mtc_check_TP_EPC_6014_01(
            ImsInterfaceMonitor p_monitorCompRef,
            boolean p_checkMessage
            ImsInterfaceMonitor p_monitorCompRef
        ) runs on ImsTestCoordinator {
            p_monitorCompRef.start (
                f_receiveDiameterMsg ( mw_AAA_dummy , "TP_EPC_6014_01", true )
                f_receiveDiameterMsg ( { aAA_MSG := mw_AAA_dummy } , "TP_EPC_6014_01", true )
            );
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_EPC_6014_01
@@ -5876,7 +5875,7 @@ group checksTC_IMS_SHARE_0009 {
            ImsInterfaceMonitor p_monitorCompRef
        ) runs on ImsTestCoordinator {
            p_monitorCompRef.start (
                f_receiveDiameterMsg ( mw_AAA_dummy , "TP_EPC_6016_02" , false )
                f_receiveDiameterMsg ( { aAA_MSG := mw_AAA_dummy } , "TP_EPC_6016_02" , false )
            );
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_EPC_6016_02
@@ -5902,7 +5901,8 @@ group checksTC_IMS_SHARE_0009 {
         */
        function f_mtc_check_TP_EPC_6017_01(
            ImsInterfaceMonitor p_monitorCompRef,
            boolean p_checkMessage
            boolean p_checkMessage,
            ImsInterfaceMonitor p_monitorCompRef_B
        ) runs on ImsTestCoordinator {
        	p_monitorCompRef.start(
            	f_imsIot_receive (
@@ -5911,13 +5911,10 @@ group checksTC_IMS_SHARE_0009 {
            	)
           	);
           	p_monitorCompRef.done;
           	p_monitorCompRef.start(
            	f_imsIot_receive (
                	{ mw_SipResponse ( mw_Response_Base ( c_statusLine200, ?, ? ) ) }, { }, { 0, omit },
                	"TP_EPC_6017_01", false, false
            	)
           	p_monitorCompRef_B.start(
	            f_receiveDiameterMsg ( { sTR_MSG := mw_STR_dummy } , "TP_EPC_6017_01", true )
           	);
           	p_monitorCompRef.done;
           	p_monitorCompRef_B.done;
        } // End of function f_mtc_check_TP_EPC_6017_01
        
        /**
@@ -5933,10 +5930,13 @@ group checksTC_IMS_SHARE_0009 {
            boolean p_checkMessage
        ) runs on ImsTestCoordinator {
            p_monitorCompRef.start(
                f_receiveDiameterMsg ( mw_STR_dummy , "TP_EPC_6018_01", true )
                f_imsIot_receive (
                    { mw_SipRequest ( mw_REGISTER_Request_Base ) }, { }, { 0, omit },
                    "TP_EPC_6018_01", false, p_checkMessage
                )
            );
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_EPC_60178_01
        } // End of function f_mtc_check_TP_EPC_6018_01
        
        /**
         * Starts monitor component behavior for TP_EPC_6019_01
@@ -5951,7 +5951,10 @@ group checksTC_IMS_SHARE_0009 {
            boolean p_checkMessage
        ) runs on ImsTestCoordinator {
            p_monitorCompRef.start(
                f_receiveDiameterMsg ( mw_STA_dummy , "TP_EPC_6019_01", true )
                f_imsIot_receive (
                    { mw_SipResponse ( mw_200OK_Base ) }, { }, { 0, omit },
                    "TP_EPC_6019_01", false, p_checkMessage
                )
            );
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_EPC_6019_01
@@ -6008,7 +6011,7 @@ group checksTC_IMS_SHARE_0009 {
           ImsInterfaceMonitor p_monitorCompRef
       ) runs on ImsTestCoordinator {
           p_monitorCompRef.start (
               f_receiveDiameterMsg ( mw_STR_dummy , "TP_EPC_6022_01", true )
               f_receiveDiameterMsg ( { sTR_MSG := mw_STR_dummy } , "TP_EPC_6022_01", true )
           );
           p_monitorCompRef.done;
       } // End of function f_mtc_check_TP_EPC_6022_01
@@ -6037,9 +6040,16 @@ group checksTC_IMS_SHARE_0009 {
         */
        function f_mtc_check_TP_EPC_6024_01(
            ImsInterfaceMonitor p_monitorCompRef,
            boolean p_checkMessage
        	IotEquipmentUser p_ue
        ) runs on ImsTestCoordinator {
            // TODO 
            f_mtc_triggerUserCommand ( p_ue, "Trigger administrative de-registration for UE");
            p_monitorCompRef.start(
                f_imsIot_receive(
                    { mw_SipRequest ( mw_NOTIFY_Request_Base ( ? ) ) }, { }, { 0, omit },
                    "TP_EPC_6024_01", false, false
                )
            );
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_EPC_6024_01

         /**
@@ -6049,12 +6059,15 @@ group checksTC_IMS_SHARE_0009 {
         * The check operation allows read access to the top element of incoming port queues without removing the top element from the queue.
         */
        function f_mtc_check_TP_EPC_6025_01(
            ImsInterfaceMonitor p_monitorCompRef,
            boolean p_checkMessage
            ImsInterfaceMonitor p_monitorCompRef
        ) runs on ImsTestCoordinator {
            // TODO 
            p_monitorCompRef.start (
                f_receiveDiameterMsg ( { sTR_MSG := mw_STR_dummy } , "TP_EPC_6025_01", true )
            );
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_EPC_6025_01
         /**

         * Starts monitor component behavior for TP_EPC_6026_01
         * @param p_monitorCompRef Reference to monitor component
         * @param p_checkMessage indicate if the incomming message should only be checked (port.check) or consumed (port.receive). 
+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ module AtsImsIot_Functions {
	import from LibIot_TestInterface { type InterfaceMonitor, TestCoordinator, EquipmentUser; }
 	import from LibIot_Functions { function f_getE2EVerdict; }
	import from LibIot_TypesAndValues { type DefaultList; }
    import from DIAMETER_Types {type Diameter_Msg;}
    import from LibDiameter_TypesAndValues {type DIAMETER_MSG;}
 	
 	group ue {
 		
@@ -2587,7 +2587,7 @@ module AtsImsIot_Functions {
		* @param p_msg The Diameter message
		* @param p_log The Log message
		*/
	 	function f_receiveDiameterMsg (	InterfaceMonitor p_monitor, in template (present) Diameter_Msg p_diameter,
	 	function f_receiveDiameterMsg (	in template (present) DIAMETER_MSG p_diameter,
	 									in charstring p_log, in boolean p_bool )
	 	runs on ImsInterfaceMonitor {
            timer	t_local	:= PX_MAX_MSG_WAIT;
+1291 −1288
Original line number Diff line number Diff line
@@ -248,10 +248,11 @@ module AtsImsIot_TestCases_EPC {
            
            // test body
            f_mtc_userRadioEnabled ( v_ueA, false, true );
            f_mtc_check_TP_EPC_6017_01 ( v_config.gmA, false );
            f_mtc_check_TP_EPC_6017_01 ( v_config.mw, false , v_config.rx );
			f_mtc_check_TP_EPC_6009_01 ( v_config.rx );
            f_mtc_check_TP_EPC_6009_02 ( v_ueA, v_config.gmA );
            f_mtc_check_TP_EPC_6018_01 ( v_config.rx );
            f_mtc_check_TP_EPC_6019_01 ( v_config.rx );
            f_mtc_check_TP_EPC_6018_01 ( v_config.gmA, false );
            f_mtc_check_TP_EPC_6019_01 ( v_config.gmA, false );
            
            // postamble
            f_PO_user_home_deregistration ( v_ueB );
@@ -301,11 +302,11 @@ module AtsImsIot_TestCases_EPC {
            // test body
            f_mtc_check_TP_EPC_6020_01 ( v_config.sgi, true );
            f_mtc_userRadioEnabled ( v_ueA, false, true );
            f_mtc_check_TP_EPC_6021_01 ( v_config.mx, false );
            f_mtc_check_TP_EPC_6021_01 ( v_config.mxA, false );
            f_mtc_check_TP_EPC_6022_01 ( v_config.rx );
            f_mtc_check_TP_EPC_6009_01 ( v_config.rx );
            f_mtc_check_TP_EPC_6023_01 ( v_config.sgi, false );
            f_mtc_check_TP_EPC_6012_02 ( v_config.mx , v_config.rx );
            f_mtc_check_TP_EPC_6012_02 ( v_config.mxA , v_config.rx );
			f_mtc_check_TP_EPC_6003_02 ( v_config.sgi, false );
            

@@ -351,9 +352,10 @@ module AtsImsIot_TestCases_EPC {
            f_mtc_userRegistration ( v_ueB, v_userInfoB );
            
            // test body
            f_mtc_check_TP_EPC_6024_01 ( v_config.mw, false );
			f_mtc_check_TP_EPC_6025_01 ( v_config.gmA, false );
			f_mtc_check_TP_EPC_6009_02 ( v_config.gmA, false );
            f_mtc_check_TP_EPC_6024_01 ( v_config.mw, v_ueA );
			f_mtc_check_TP_EPC_6025_01 ( v_config.rx );
			f_mtc_check_TP_EPC_6009_01 ( v_config.rx );
			f_mtc_check_TP_EPC_6009_02 ( v_ueA, v_config.gmA );
            f_mtc_check_TP_EPC_6018_01 ( v_config.gmA, false );
			f_mtc_check_TP_EPC_6019_01 ( v_config.gmA, false );

@@ -399,7 +401,8 @@ module AtsImsIot_TestCases_EPC {
            
            // test body
            f_mtc_check_TP_EPC_6026_01 ( v_config.gmA, false );
			f_mtc_check_TP_EPC_6009_02 ( v_config.gmA, false );
			f_mtc_check_TP_EPC_6009_01 ( v_config.rx );
			f_mtc_check_TP_EPC_6009_02 ( v_ueA, v_config.gmA );
			f_mtc_check_TP_EPC_6019_01 ( v_config.gmA, false );

            // postamble
@@ -1268,8 +1271,8 @@ module AtsImsIot_TestCases_EPC {
                
                // test body
                f_mtc_check_TP_EPC_6004_02 ( v_config.gmA, false );
                f_mtc_check_TP_EPC_6005_01 ( v_config.gmA, false );
                f_mtc_check_TP_EPC_6006_01 ( v_config.gmA, false );
                f_mtc_check_TP_EPC_6005_01 ( v_config.gmA );
                f_mtc_check_TP_EPC_6006_01 ( v_config.gmA );
                f_mtc_check_TP_EPC_6010_01 ( v_config.gmA, false );
                f_mtc_check_TP_EPC_6003_02 ( v_config.gmA, false );

+4 −2
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ module AtsImsIot_TestConfiguration {
        const charstring c_rx := "Rx"; // See ETSI TS 103 029 V3.1.1 clause 5.4.2
        //* interface monitor name Mw
        const charstring c_mw := "Mw";
        //* interface monitor name Mx
        const charstring c_mx := "Mx";
		//* interface monitor name Sgi
		const charstring c_sgi := "Sgi";
	}
@@ -1134,7 +1136,7 @@ module AtsImsIot_TestConfiguration {
				
            p_config.sgi.start(f_cf_setFilter(
                valueof (m_SetFilterReq(
                    e_ip,
                    e_sip,
                    {f_getInterfaceInfo("Sgi", PX_PRODUCTS[PX_EUT_A])}
                )
            )));
+89 −88
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ module AtsImsIot_TestSystem {
		ImsInterfaceMonitor rx, // See ETSI TS 103 029 V3.1.1 clause 5.4.2
        ImsInterfaceMonitor mxA,	
        ImsInterfaceMonitor mw,	
        ImsInterfaceMonitor sgi,	
		ImsInterfaceMonitor gmB optional // See ETSI TS 103 029 V3.1.1 clause 5.4.1.1
	}
}
 No newline at end of file