Commit b0c915a8 authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

Conflicts resolved.

parents 6825013b 51688c2c

ttcn/AtsImsIot/AtsImsIot_TD_INI.ttcn

+20 −51
Original line number Original line Diff line number Diff line
@@ -75,9 +75,11 @@ module AtsImsIot_TD_INI{ 
                        // Test body

                        // Test body

                        //f_mtc_userInitiateCall (v_ueA, v_userTelInfoB);

                        //f_mtc_userInitiateCall (v_ueA, v_userTelInfoB);

                        

                        



                        f_mtc_check_TP_GM_PCSCF_INVITE_01(vc_vxlte_monitor_components.gmA, false); // Event 1

                        f_mtc_check_TP_GM_PCSCF_INVITE_01(vc_vxlte_monitor_components.gmA, false); // Event 1

                        f_mtc_check_TP_GM_PCSCF_100Trying_01(vc_vxlte_monitor_components.gmA, false);

                        f_mtc_check_TP_GM_PCSCF_100Trying_01(vc_vxlte_monitor_components.gmA, false);





                        

                        f_mtc_check_TP_RX_PCSCF_AAR_03(vc_vxlte_monitor_components.rx);// Event 2

                        f_mtc_check_TP_RX_PCSCF_AAR_03(vc_vxlte_monitor_components.rx);// Event 2

                        f_mtc_check_TP_GX_PCRF_RAR_01(vc_vxlte_monitor_components.gx); // Event 3

                        f_mtc_check_TP_GX_PCRF_RAR_01(vc_vxlte_monitor_components.gx); // Event 3

                        f_mtc_check_TP_GX_PGW_RAA_02(vc_vxlte_monitor_components.gx);  // Event 4

                        f_mtc_check_TP_GX_PGW_RAA_02(vc_vxlte_monitor_components.gx);  // Event 4
@@ -95,11 +97,13 @@ module AtsImsIot_TD_INI{ 
                        

                        

                        f_mtc_check_TP_MW_PCSCF_180RINGING_01(vc_vxlte_monitor_components.mwPS, false); // Event 11

                        f_mtc_check_TP_MW_PCSCF_180RINGING_01(vc_vxlte_monitor_components.mwPS, false); // Event 11





                        

                        f_mtc_check_TP_RX_PCSCF_AAR_04(vc_vxlte_monitor_components.rx);// Event 12

                        f_mtc_check_TP_RX_PCSCF_AAR_04(vc_vxlte_monitor_components.rx);// Event 12

                        f_mtc_check_TP_GX_PCRF_RAR_01(vc_vxlte_monitor_components.gx); // Event 13

                        f_mtc_check_TP_GX_PCRF_RAR_01(vc_vxlte_monitor_components.gx); // Event 13

                        f_mtc_check_TP_GX_PGW_RAA_02(vc_vxlte_monitor_components.gx);  // Event 14

                        f_mtc_check_TP_GX_PGW_RAA_02(vc_vxlte_monitor_components.gx);  // Event 14

                        f_mtc_check_TP_RX_PCRF_AAA_02(vc_vxlte_monitor_components.rx); // Event 15

                        f_mtc_check_TP_RX_PCRF_AAA_02(vc_vxlte_monitor_components.rx); // Event 15

                        

                        



                        f_mtc_check_TP_GM_PCSCF_180RINGING_01(vc_vxlte_monitor_components.gmA, false); // Event 16

                        f_mtc_check_TP_GM_PCSCF_180RINGING_01(vc_vxlte_monitor_components.gmA, false); // Event 16

                        

                        

                        f_mtc_userCheckRinging(v_ueB);

                        f_mtc_userCheckRinging(v_ueB);
@@ -121,6 +125,7 @@ module AtsImsIot_TD_INI{ 




                        f_mtc_check_TP_GM_PCSCF_ACK_01(vc_vxlte_monitor_components.gmA, false); // Event 26 

                        f_mtc_check_TP_GM_PCSCF_ACK_01(vc_vxlte_monitor_components.gmA, false); // Event 26 

                        f_mtc_check_TP_MW_PCSCF_ACK_01(vc_vxlte_monitor_components.mwPS, false); // Event 27

                        f_mtc_check_TP_MW_PCSCF_ACK_01(vc_vxlte_monitor_components.mwPS, false); // Event 27

                        

                        f_mtc_check_TP_IC_IBCF_ACK_01(vc_vxlte_monitor_components.ic, false); // ACK – Event 29

                        f_mtc_check_TP_IC_IBCF_ACK_01(vc_vxlte_monitor_components.ic, false); // ACK – Event 29





                        f_mtc_userCheckCallEstablished(v_ueA); // Event 30

                        f_mtc_userCheckCallEstablished(v_ueA); // Event 30
@@ -223,48 +228,14 @@ module AtsImsIot_TD_INI{ 
                        f_mtc_check_TP_GM_PCSCF_ACK_01(vc_vxlte_monitor_components.gmB, true, true); // Event 29 

                        f_mtc_check_TP_GM_PCSCF_ACK_01(vc_vxlte_monitor_components.gmB, true, true); // Event 29 





                

                

                        f_mtc_userCheckCallEstablished(v_ueA); // Event 30

                        f_mtc_userCheckCallEstablished(v_ueB); // Event 30

                

                

                        

                        // Postamble

//                        //f_mtc_userInitiateCall (v_ueB, v_userTelInfoA);

                        f_mtc_EndCall(v_ueA);

//                

                        f_PO_user_home_deregistration(v_ueA);

//                        f_mtc_check_TP_GM_PCSCF_INVITE_02(vc_vxlte_monitor_components.gmB, true, true); // Event 8

                        f_PO_user_home_deregistration(v_ueB);

//                        f_mtc_check_TP_MW_PCSCF_INVITE_02(vc_vxlte_monitor_components.mwPS, true, true); // Event 3

                        //f_cf_int_call_down(v_config);

//                

//                        f_mtc_check_TP_GM_PCSCF_100Trying_02(vc_vxlte_monitor_components.gmB, true, true);

//                        f_mtc_check_TP_MW_PCSCF_100Trying_02(vc_vxlte_monitor_components.mwPS, true, true);

//                

  //                        f_mtc_check_TP_GM_PCSCF_180RINGING_02(vc_vxlte_monitor_components.gmB, true); // Event 9

  //                        f_mtc_check_TP_MW_PCSCF_180RINGING_02(vc_vxlte_monitor_components.mwPS, true); // Event 14

//                

//                        f_mtc_userCheckRinging(v_ueA);

//                        f_mtc_userCheckPeerIsRinging(v_ueB);

//                        f_mtc_userAnswerCall(v_ueA);

//                

//                        f_mtc_check_TP_GM_PCSCF_200OK_02(vc_vxlte_monitor_components.gmB, true); // Event 18

//                        f_mtc_check_TP_MW_PCSCF_200OK_02(vc_vxlte_monitor_components.mwPS, true); // Event 23

//                

    //                        f_mtc_check_TP_GM_PCSCF_ACK_01(vc_vxlte_monitor_components.gmB, true, true); // Event 29 

    //                        f_mtc_check_TP_MW_PCSCF_ACK_01(vc_vxlte_monitor_components.mwPS, true, true); // Event 28

//

	//                        f_mtc_check_TP_IC_IBCF_INVITE_01(vc_vxlte_monitor_components.ic); // INVITE Event 1

	//                        f_mtc_check_TP_IC_IBCF_INVITE_02(vc_vxlte_monitor_components.ic); // INVITE Event 1

	//                        f_mtc_check_TP_IC_IBCF_INVITE_03(vc_vxlte_monitor_components.ic); // INVITE ENUM Event 1

//                        f_mtc_check_TP_IC_IBCF_ACK_01(vc_vxlte_monitor_components.ic); // ACK – Event 26

    //                        f_mtc_check_TP_IC_IBCF_180RESP_01(vc_vxlte_monitor_components.ic); // 180 Ringing – Event 16

    //                        f_mtc_check_TP_IC_IBCF_180RESP_02(vc_vxlte_monitor_components.ic); // 180 Ringing – Event 16

    //                        f_mtc_check_TP_IC_IBCF_1XXRESP_01(vc_vxlte_monitor_components.ic); // 180 Ringing – Event 16

    //                        f_mtc_check_TP_IC_IBCF_2XXRESP_01(vc_vxlte_monitor_components.ic); // 200 OK – Event 25

    //                        f_mtc_check_TP_IC_IBCF_2XXRESP_02(vc_vxlte_monitor_components.ic); // 200 OK – Event 25

    //                        f_mtc_check_TP_IC_IBCF_2XXRESP_03(vc_vxlte_monitor_components.ic); // 200 OK – Event 25

//                

//                        f_mtc_userCheckCallEstablished(v_ueA); // Event 30

//                        f_mtc_userCheckCallEstablished(v_ueB); // Event 30

//                

//                        // Postamble

//                        f_mtc_EndCall(v_ueA);

//                        f_PO_user_home_deregistration(v_ueA);

//                        f_PO_user_home_deregistration(v_ueB);

//                        //f_cf_int_call_down(v_config);





                        //unmap/disconnect component ports

                        //unmap/disconnect component ports

                        f_cf_user_down ( v_ueB );

                        f_cf_user_down ( v_ueB );
@@ -347,8 +318,6 @@ module AtsImsIot_TD_INI{ 
                        f_mtc_check_TP_GM_PCSCF_ACK_01(vc_vxlte_monitor_components.gmA); // Event 14

                        f_mtc_check_TP_GM_PCSCF_ACK_01(vc_vxlte_monitor_components.gmA); // Event 14

                        f_mtc_check_TP_MW_PCSCF_ACK_01(vc_vxlte_monitor_components.mwPS); // Event 15                                       

                        f_mtc_check_TP_MW_PCSCF_ACK_01(vc_vxlte_monitor_components.mwPS); // Event 15                                       

                         

                         

//                        f_mtc_userCheckNewMediaStream(v_ueB);

//                        f_mtc_userCheckNewMediaStream(v_ueA);

						f_mtc_userCheckCallEstablished(v_ueA); // Event 18

						f_mtc_userCheckCallEstablished(v_ueA); // Event 18

						f_mtc_userCheckCallEstablished(v_ueB); // Event 18

						f_mtc_userCheckCallEstablished(v_ueB); // Event 18
@@ -419,7 +388,7 @@ module AtsImsIot_TD_INI{ 
						f_mtc_check_TP_MW_SCSCF_RE_INVITE_02(vc_vxlte_monitor_components.mwIS); // Event 4

						f_mtc_check_TP_MW_SCSCF_RE_INVITE_02(vc_vxlte_monitor_components.mwIS); // Event 4

                        f_mtc_check_TP_MW_SCSCF_RE_INVITE_03(vc_vxlte_monitor_components.mwIB); // Event 5

                        f_mtc_check_TP_MW_SCSCF_RE_INVITE_03(vc_vxlte_monitor_components.mwIB); // Event 5





                        //f_mtc_check_TP_GM_PCSCF_200OK_02(vc_vxlte_monitor_components.gmB); // Event 6

                        f_mtc_check_TP_GM_PCSCF_200OK_02(vc_vxlte_monitor_components.gmB); // Event 6

                        

                        

						//TP_RX_PCSCF_AAR_10 (AAR – Event 7)

						//TP_RX_PCSCF_AAR_10 (AAR – Event 7)

						//TP_GX_PCRF_RAR_01 (RAR – Event 8)

						//TP_GX_PCRF_RAR_01 (RAR – Event 8)