Commit 39650ec4 authored by wattelet's avatar wattelet
Browse files

EPC TCs update

parent d3fafa86

ttcn/AtsImsIot/AtsImsIot_Behavior.ttcn

+7 −1
Original line number Diff line number Diff line
@@ -5676,7 +5676,13 @@ group checksTC_IMS_SHARE_0009 { 
            ImsInterfaceMonitor p_monitorCompRef,

            boolean p_checkMessage

        ) runs on ImsTestCoordinator {

            // TODO 

        	p_monitorCompRef.start(

            	f_imsIot_receive(

                 { mw_SipRequest ( mw_BYE_Request_Base( ? ) ) }, { }, { 0, omit },

                 "TP_EPC_6010_01", false, p_checkMessage

            	)

            );

            p_monitorCompRef.done;

        } // End of function f_mtc_check_TP_EPC_6010_01

        

        /**

ttcn/AtsImsIot/AtsImsIot_TestCases_EPC.ttcn3

+33 −32
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ module AtsImsIot_TestCases_EPC { 
            // map/connect component ports

            f_cf_adapter_up ( );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueB );

            f_cf_epc_call_up ( v_config );

            

            // preamble
@@ -100,14 +100,15 @@ module AtsImsIot_TestCases_EPC { 
            

            // test body

			f_mtc_check_TP_EPC_6004_01 ( 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_02 ( v_config.gmA, false );

			f_mtc_check_TP_EPC_6006_02 ( v_config.gmA, false );

			f_mtc_check_TP_EPC_6009_01 ( v_config.gmA, false );

			f_mtc_check_TP_EPC_6010_01 ( v_config.gmA, false );

			f_mtc_check_TP_EPC_6011_01 ( v_config.gmA, false );

			f_mtc_check_TP_EPC_6003_02 ( v_config.gmA, false );

			f_mtc_check_TP_EPC_6005_01 ( v_config.rx, false );	// EPC-PCRF -> P-CSCF Diameter ASR (rx) SIP session

			f_mtc_check_TP_EPC_6006_01 ( v_config.rx, false );	// P-CSCF -> EPC-PCRF Diameter ASA + STR (rx) SIP session

																// EPC-PCRF -> P-CSCF Diameter STA (rx) SIP session

			f_mtc_check_TP_EPC_6010_01 ( v_config.gmB, false );	// P-CSCF -> UE A SIP BYE (gmB)

			f_mtc_check_TP_EPC_6005_02 ( v_config.rx, false );	// EPC-PCRF -> P-CSCF Diameter ASR (rx) SIP registration

			f_mtc_check_TP_EPC_6006_02 ( v_config.rx, false );	// P-CSCF -> EPC-PCRF Diameter ASA + STR (rx) SIP registration

			f_mtc_check_TP_EPC_6009_01 ( v_config.rx, false );	// EPC-PCRF -> P-CSCF Diameter STA (rx) SIP registration

			f_mtc_check_TP_EPC_6011_01 ( v_config.gmA, false );	// P-CSCF -> S-CSCF SIP REGISTER (mw)

			f_mtc_check_TP_EPC_6003_02 ( v_config.gmA, false );	// No SGi channels

            

            // postamble

            f_PO_user_home_deregistration ( v_ueB );
@@ -141,7 +142,7 @@ module AtsImsIot_TestCases_EPC { 
            // map/connect component ports

            f_cf_adapter_up ( );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueB );

            f_cf_epc_call_up ( v_config );

            

            // preamble
@@ -184,7 +185,7 @@ module AtsImsIot_TestCases_EPC { 
            // map/connect component ports

            f_cf_adapter_up ( );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueB );

            f_cf_epc_call_up ( v_config );

            

            // preamble
@@ -227,7 +228,7 @@ module AtsImsIot_TestCases_EPC { 
            // map/connect component ports

            f_cf_adapter_up ( );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueB );

            f_cf_epc_call_up ( v_config );

            

            // preamble
@@ -275,7 +276,7 @@ module AtsImsIot_TestCases_EPC { 
            // map/connect component ports

            f_cf_adapter_up ( );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueB );

            f_cf_epc_call_up ( v_config );

            

            // preamble
@@ -324,7 +325,7 @@ module AtsImsIot_TestCases_EPC { 
            // map/connect component ports

            f_cf_adapter_up ( );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueB );

            f_cf_epc_call_up ( v_config );

            

            // preamble
@@ -369,7 +370,7 @@ module AtsImsIot_TestCases_EPC { 
            // map/connect component ports

            f_cf_adapter_up ( );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueA );

            f_cf_user_up ( v_ueB );

            f_cf_epc_call_up ( v_config );

            

            // preamble
@@ -418,7 +419,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -469,7 +470,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -515,7 +516,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -564,7 +565,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -615,7 +616,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -662,7 +663,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -713,7 +714,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -763,7 +764,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -813,7 +814,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -863,7 +864,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -912,7 +913,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -957,7 +958,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -1005,7 +1006,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -1054,7 +1055,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -1103,7 +1104,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -1152,7 +1153,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble
@@ -1203,7 +1204,7 @@ module AtsImsIot_TestCases_EPC { 
                // map/connect component ports

                f_cf_adapter_up ( );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueA );

                f_cf_user_up ( v_ueB );

                f_cf_epc_call_up ( v_config );

            

                // preamble

ttcn/AtsImsIot/AtsImsIot_TestConfiguration.ttcn

+10 −3
Original line number Diff line number Diff line
@@ -1089,11 +1089,11 @@ module AtsImsIot_TestConfiguration { 
				

            f_cf_monitor_up(p_config.gmA);

            f_cf_monitor_up(p_config.rx);

            f_cf_monitor_up(p_config.mxA);

            if(isvalue(p_config.gmB)) {

                f_cf_monitor_up(p_config.gmB);

            }



            // TODO UE IP address and port is missing

            p_config.gmA.start(f_cf_setFilter(

                valueof (m_SetFilterReq(

                    e_sip,
@@ -1104,12 +1104,19 @@ module AtsImsIot_TestConfiguration { 
				

            p_config.rx.start(f_cf_setFilter(

                valueof (m_SetFilterReq(

                    e_sip,

                    e_diameter,

                    {f_getInterfaceInfo("Rx", PX_PRODUCTS[PX_EUT_A])}

                )

            )));

            p_config.rx.done;

				

            p_config.mxA.start(f_cf_setFilter(

                valueof (m_SetFilterReq(

                    e_sip,

                    {f_getInterfaceInfo("Mx", PX_PRODUCTS[PX_EUT_A])}

                )

            )));

            p_config.mxA.done;

				

            if(isvalue(p_config.gmB)) {

                    p_config.gmB.start(f_cf_setFilter(
@@ -1166,11 +1173,11 @@ module AtsImsIot_TestConfiguration { 
			

			f_cf_monitor_down(p_config.gmA);

            f_cf_monitor_down(p_config.rx);

            f_cf_monitor_down(p_config.mxA);

			if(isvalue(p_config.gmB)) {

				f_cf_monitor_down(p_config.gmB);

			}

    	} // end of function f_cf_epc_call_down



	}

	

	function f_getInterfaceInfoList(

ttcn/AtsImsIot/AtsImsIot_TestSystem.ttcn

+7 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ module AtsImsIot_TestSystem { 
	import from AtsImsIot_TypesAndValues {type SipMessage, NAPTRmessage;}

	import from LibIot_TestInterface {type EquipmentAccessPort;}

	import from LibIot_TestInterface all;

    import from DIAMETER_Types {type Diameter_Msg;}



	/**

	* @desc 	interfaces to the SUT
@@ -22,6 +23,7 @@ module AtsImsIot_TestSystem { 
	type component ImsInterfaceMonitor extends InterfaceMonitor {

			port	DataPort				dPort;

        	port	NaptrPort				naptrPort;

        	port	DiameterPort			rxPort;

			port	ImsCoordinationPort		icpPort;

	}

	/**
@@ -42,7 +44,10 @@ module AtsImsIot_TestSystem { 
			in  Request, Response, SEND_request, RECEIVE_response; // SIP

		}

        type port NaptrPort message {

            inout NAPTRmessage; 

            in NAPTRmessage; 

        }

	    type port DiameterPort message {

          	in Diameter_Msg;

		}

	}
@@ -75,6 +80,7 @@ module AtsImsIot_TestSystem { 
	type record CF_EPC_CALL {

		ImsInterfaceMonitor gmA, // See ETSI TS 103 029 V3.1.1 clause 5.4.1.1

		ImsInterfaceMonitor rx, // See ETSI TS 103 029 V3.1.1 clause 5.4.2

        ImsInterfaceMonitor mxA,	

		ImsInterfaceMonitor gmB optional // See ETSI TS 103 029 V3.1.1 clause 5.4.1.1

	}

}
 
 No newline at end of file

ttcn/LibIot/LibIot_TypesAndValues.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -195,7 +195,8 @@ module LibIot_TypesAndValues { 
    

    type enumerated ProtocolFilter {

    	e_sip,

    	e_dns

    	e_dns,

    	e_diameter

    }

    

    type record SetFilterReq {