Commit 169e8ade authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

Merge branch 'TTF010' of https://forge.etsi.org/rep/int/vxlte/emergency-iop into TTF010

parents 2a42b564 0593f0d8

ttcn/AtsImsIot/AtsImsIot_Emergency.ttcn

+15 −4
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ module AtsImsIot_Emergency { 
                    }

                } // End of TC TC_VoLTE_ECO_INT_ATT_01





                // function f_validate_uar(in octetstring p_uar) {

                //     var bitstring v_conv := oct2bit(p_uar);

                //     var UAR_MSG v_msg;
@@ -2733,6 +2732,13 @@ module AtsImsIot_Emergency { 
                        // 480 Temporary Unavailable

                        f_mtc_check_TP_IC_IBCF_480TEMPAV_01(vc_vxlte_monitor_components.ic, -, v_sip); // INVITE Event 18 (NOTE: comment out if ISC simulated by Ic)



                        f_mtc_check_TP_MX_ECSCF_ECO_INVITE_01(vc_vxlte_monitor_components.mwEB, -, v_sip); // Event 11

                        f_mtc_check_TP_MX_ECSCF_ECO_100Trying_01(vc_vxlte_monitor_components.mwEB, -, v_sip);



                        f_mtc_check_TP_IC_IBCF_INVITE_01(vc_vxlte_monitor_components.ic); // INVITE Event 12 (NOTE: comment out if ISC simulated by Ic)



                        // 480 Temporary Unavailable

                        f_mtc_check_TP_IC_IBCF_480TEMPAV_01(vc_vxlte_monitor_components.ic, -, v_sip); // INVITE Event 12 (NOTE: comment out if ISC simulated by Ic)

                        f_mtc_check_TP_MW_PCSCF_ECO_480INVITE_01(vc_vxlte_monitor_components.mwPE, -, v_sip); // Event 23



                        f_mtc_check_TP_RX_PCSCF_STR_01(vc_vxlte_monitor_components.rx); // Event 24
@@ -2959,6 +2965,7 @@ module AtsImsIot_Emergency { 
                                                              PX_DIAMETER_GX_INTERFACENAME

                                                              }))

                    {



                        var SipMessage v_sip;



                        f_cf_createVxLteMonitor();
@@ -2966,7 +2973,9 @@ module AtsImsIot_Emergency { 
                        // map/connect component ports

                        f_cf_adapter_up ( );

                        f_cf_user_up ( v_ueA );



                        f_cf_user_up ( v_psap );



                        f_cf_VxLteMonitor_Up();



                        // Preamble
@@ -2976,6 +2985,7 @@ module AtsImsIot_Emergency { 
                        } else {

                            // TODO Check OPTIONS from PSAP to E-CSCF

                        }



                        f_mtc_check_precond_TD_VoLTE_ECO_INT_REJ_03();



                        // Test body
@@ -3335,6 +3345,7 @@ module AtsImsIot_Emergency { 
					}

					f_cf_adapter_down ( );





				} // End of TC TD_VoLTE_NGC_INT_INF_01_03



				group f_TD_VoLTE_NGC_INT_INF_01 {

ttcn/AtsImsIot/AtsImsIot_TP_behavior_GM.ttcn

+3 −1
Original line number Diff line number Diff line
@@ -732,6 +732,7 @@ module AtsImsIot_TP_behavior_GM { 
			}

		} // End of function f_mtc_check_TP_GM_PCSCF_ECO_REGISTER_03



        

		function f_mtc_check_TP_GM_PCSCF_REGISTER_04( // FIXME RMI To be reviewed

													 in SipInterfaceMonitor p_monitorCompRef,

													 in boolean p_checkMessage := false
@@ -2778,6 +2779,7 @@ module AtsImsIot_TP_behavior_GM { 
			}

		} // End of function f_mtc_check_TP_GM_PCSCF_183SESSION_PROGRESS_02



        

		function f_mtc_check_TP_GM_PCSCF_183SESSION_PROGRESS_03(

																in SipInterfaceMonitor p_monitorCompRef,

																in boolean p_checkMessage := false,

ttcn/AtsImsIot/AtsImsIot_TP_behavior_MW_EC.ttcn

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
// /**

//  *  @author     TTF T010

//  *  @version    $Id$

//  *  @desc       This module provides the TP behaviour functions at Mw interface at P-CSCF/E-CSCF

//  */



// module AtsImsIot_TP_behavior_MW_EC { // TODO: To be removed



//     // LibIms

//     import from LibIms_Templates all;

//     import from LibIms_UpperTester all;

//     // LibIot

//     import from LibIot_TypesAndValues all;

//     import from LibIot_Functions all;

//     import from LibIot_TestInterface all;

//     import from LibIot_PIXITS all;

//     // LibSip

//     import from LibSip_SIPTypesAndValues all;

//     import from LibSip_Templates all;

//     import from LibSip_Common all;

//     import from LibSip_SDPTypes all;

//     // LibMsrp

//     import from LibMsrp_TypesAndValues all;

//     import from LibMsrp_Functions all;

//     import from LibMsrp_Templates all;

//     // AtsImsIot

//     import from AtsImsIot_TestSystem all;

//     import from AtsImsIot_Templates_MW all;

//     import from AtsImsIot_Templates all;

//     import from AtsImsIot_TypesAndValues all;

//     import from AtsImsIot_Functions all;



// } // End of module AtsImsIot_TP_behavior_MW_EC
 
 No newline at end of file

ttcn/AtsImsIot/AtsImsIot_TP_behavior_MX.ttcn

+47 −1
Original line number Diff line number Diff line 
<<<<<<< HEAD

=======

<<<<<<<< HEAD:ttcn/AtsImsIot/AtsImsIot_TP_behavior_MX.ttcn

>>>>>>> 0593f0d89e43a3f1703bce34b66025c749549138

/**

 *  @author     STF 574

 *  @version    $Id$
@@ -270,7 +274,10 @@ module AtsImsIot_TP_behavior_MX { 
                p_monitorCompRef.done;

            }

        } // End of function f_mtc_check_TP_MX_ECSCF_ECO_100Trying_01

<<<<<<< HEAD

 

=======

>>>>>>> 0593f0d89e43a3f1703bce34b66025c749549138

        

    } // End of group ims100Trying
@@ -821,6 +828,7 @@ module AtsImsIot_TP_behavior_MX { 


    } // End of group ims3xxAny



<<<<<<< HEAD

    group imsINFO{  

		

		/**
@@ -977,3 +985,41 @@ module AtsImsIot_TP_behavior_MX { 




} // End of module AtsImsIot_TP_behavior_MX

=======

} // End of module AtsImsIot_TP_behavior_MX

========

// /**

//  *  @author     TTF T010

//  *  @version    $Id$

//  *  @desc       This module provides the TP behaviour functions at Mw interface at P-CSCF/E-CSCF

//  */



// module AtsImsIot_TP_behavior_MW_EC { // TODO: To be removed



//     // LibIms

//     import from LibIms_Templates all;

//     import from LibIms_UpperTester all;

//     // LibIot

//     import from LibIot_TypesAndValues all;

//     import from LibIot_Functions all;

//     import from LibIot_TestInterface all;

//     import from LibIot_PIXITS all;

//     // LibSip

//     import from LibSip_SIPTypesAndValues all;

//     import from LibSip_Templates all;

//     import from LibSip_Common all;

//     import from LibSip_SDPTypes all;

//     // LibMsrp

//     import from LibMsrp_TypesAndValues all;

//     import from LibMsrp_Functions all;

//     import from LibMsrp_Templates all;

//     // AtsImsIot

//     import from AtsImsIot_TestSystem all;

//     import from AtsImsIot_Templates_MW all;

//     import from AtsImsIot_Templates all;

//     import from AtsImsIot_TypesAndValues all;

//     import from AtsImsIot_Functions all;



// } // End of module AtsImsIot_TP_behavior_MW_EC

>>>>>>>> 0593f0d89e43a3f1703bce34b66025c749549138:ttcn/AtsImsIot/AtsImsIot_TP_behavior_MW_EC.ttcn

>>>>>>> 0593f0d89e43a3f1703bce34b66025c749549138

ttcn/AtsImsIot/AtsImsIot_TP_behavior_MI.ttcn

+1 −1

File changed.

Contains only whitespace changes.

ttcn/AtsImsIot/AtsImsIot_Templates_GM.ttcn

+1 −1

File changed.

Contains only whitespace changes.