Commit 0411399f authored by pintar's avatar pintar
Browse files

latest version from validation session week 16

parent 87957680

CDIV/CDIV_TC_Functions.ttcn

+53 −21
Original line number Original line Diff line number Diff line
@@ -3067,17 +3067,29 @@ module CDIV_TC_Functions { 
        

        

            f_sendResponse(m_Response_Base(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via)); 

            f_sendResponse(m_Response_Base(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via)); 

                            

                            

        	f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof( m_MBody_SDP(vc_sdp_local))));

            // send 200 OK

            //vc_contact := valueof(m_Contact(m_SipUrl_NumberHostParam(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_TS_SCSCF_IPADDR,omit)));//f_initSipUrl(c_userProfile_UE1atSUThome)));

            f_sendResponse(m_Response_2xxonINVITE_UE(

                c_statusLine200,

                vc_callId,

                vc_cSeq,

                vc_caller_From,

                vc_caller_To,

                vc_via,

                vc_contact,

                f_route(),

                valueof(m_MBody_SDP(vc_sdp_local))

            )); 

       		

       		

       		f_awaitingACK(mw_ACK_Request_Base(vc_callId));

       		f_awaitingACK(mw_ACK_Request_Base(vc_callId));





            f_check_Conversation();



            f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());// sync point test body done

            f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());// sync point test body done

            

            

            action("Please trigger END of call");

            //await BYE and send 200 OK

            //await BYE and send 200 OK

            f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));

            f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));

            

            

            action("Please unREGISTER IMS client");

            // deregistration of UE

            // deregistration of UE

            f_IMS_postamble_awaitDeRegistration();

            f_IMS_postamble_awaitDeRegistration();

        }

        }
@@ -3104,17 +3116,28 @@ module CDIV_TC_Functions { 
                                                })            

                                                })            

            								  )); 

            								  )); 

        

        

            f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof( m_MBody_SDP(vc_sdp_local))));

            // send 200 OK

            f_sendResponse(m_Response_2xxonINVITE_UE(

                c_statusLine200,

                vc_callId,

                vc_cSeq,

                vc_caller_From,

                vc_caller_To,

                vc_via,

                vc_contact,

                f_route(),

                valueof(m_MBody_SDP(vc_sdp_local))

            )); 

            

            

            f_awaitingACK(mw_ACK_Request_Base(vc_callId));

            f_awaitingACK(mw_ACK_Request_Base(vc_callId));





            f_check_Conversation();



            f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());// sync point test body done

            f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());// sync point test body done

            

            

            action("Please trigger END of call");

            //await BYE and send 200 OK

            //await BYE and send 200 OK

            f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));

            f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));

            

            

            action("Please unREGISTER IMS client");

            // deregistration of UE

            // deregistration of UE

            f_IMS_postamble_awaitDeRegistration();

            f_IMS_postamble_awaitDeRegistration();

        }

        }
@@ -3137,22 +3160,21 @@ module CDIV_TC_Functions { 
        

        

            f_sendResponse(m_Response_Base(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via)); 

            f_sendResponse(m_Response_Base(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via)); 

        

        

            f_sendResponse(m_Response_history_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(),valueof( m_MBody_SDP(vc_sdp_local)), 

            f_sendResponse(m_Response_history_contact_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(),valueof( m_MBody_SDP(vc_sdp_local)), 

            										m_HistoryInfo(

            										m_HistoryInfo(

                                                        {m_HistoryInfoEntry(m_SipUrl_NumberHostParam_woPort(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,omit),{"1"},omit),

                                                        {m_HistoryInfoEntry(m_SipUrl_NumberHostParam_woPort(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,omit),{"1"},omit),

                                                         m_HistoryInfoEntry(m_SipUrl_NumberHostParam_woPort(PX_IMS_SUT_UE3_PUBLIC_USER,PX_IMS_SUT_UE3_HOME_DOMAIN,{mw_Cause_num(v_CauseValList[PX_TC_VA-1])}),{"1.1"},omit)    

                                                         m_HistoryInfoEntry(m_SipUrl_NumberHostParam_woPort(PX_IMS_SUT_UE3_PUBLIC_USER,PX_IMS_SUT_UE3_HOME_DOMAIN,{mw_Cause_num(v_CauseValList[PX_TC_VA-1])}),{"1.1"},omit)    

                                                    })

                                                    }), vc_contact

            										));

            										));

       		

       		

            f_awaitingACK(mw_ACK_Request_Base(vc_callId));

            f_awaitingACK(mw_ACK_Request_Base(vc_callId));





            f_check_Conversation();



            f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());// sync point test body done

            f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());// sync point test body done

		

		

            action("Please trigger END of call");

            //await BYE and send 200 OK

            //await BYE and send 200 OK

            f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));

            f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));



            action("Please unREGISTER IMS client");

            // deregistration of UE

            // deregistration of UE

            f_IMS_postamble_awaitDeRegistration();

            f_IMS_postamble_awaitDeRegistration();

        }

        }
@@ -3169,6 +3191,7 @@ module CDIV_TC_Functions { 
            f_gm_pcscf_preamble(p_CSeq);

            f_gm_pcscf_preamble(p_CSeq);

            f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

            f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

            

            

            LibIms_Steps.f_setHeadersMESSAGE(vc_cSeq, c_userProfile_UE2atSUThome);

            f_SendMESSAGE(m_MESSAGE_Request_CDIV (vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via,

            f_SendMESSAGE(m_MESSAGE_Request_CDIV (vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via,

            										m_HistoryInfo(

            										m_HistoryInfo(

                                                        {m_HistoryInfoEntry(m_SipUrl_NumberHostParam_woPort(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,omit),{"1"},omit),

                                                        {m_HistoryInfoEntry(m_SipUrl_NumberHostParam_woPort(PX_IMS_SUT_UE2_PUBLIC_USER,PX_IMS_SUT_UE2_HOME_DOMAIN,omit),{"1"},omit),
@@ -3178,6 +3201,9 @@ module CDIV_TC_Functions { 
            

            

            f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

            f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

            

            

            f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

            

            action("Please unREGISTER IMS client");

            // deregistration of UE

            // deregistration of UE

            f_IMS_postamble_awaitDeRegistration();

            f_IMS_postamble_awaitDeRegistration();

        }

        }
@@ -3204,6 +3230,9 @@ module CDIV_TC_Functions { 
                                            

                                            

            f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

            f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

			            							 

			            							 

            f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

			

            action("Please unREGISTER IMS client");           							 

            // deregistration of UE

            // deregistration of UE

            f_IMS_postamble_awaitDeRegistration();

            f_IMS_postamble_awaitDeRegistration();

        }

        }
@@ -3220,9 +3249,9 @@ module CDIV_TC_Functions { 
            f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

            f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

        

        

            //await SUBSCRIBE

            //await SUBSCRIBE

            f_awaitingSUBSCRIBE(mw_SUBSCRIBE_Request_mbody(mw_MBody_XML(mw_XmlBody_CDIVN(mw_comm_div_subs_info

            //f_awaitingSUBSCRIBE(mw_SUBSCRIBE_Request_mbody(mw_MBody_XML(mw_XmlBody_CDIVN(mw_comm_div_subs_info

                                            (v_ReasonValList[PX_TC_VA-1])))));

            //                               (v_ReasonValList[PX_TC_VA-1])))));

            f_sendResponse(m_Response_Base(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via));

            //f_sendResponse(m_Response_Base(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via));

            

            

            f_SendNOTIFY(m_NOTIFY_Request_CDIV(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via,

            f_SendNOTIFY(m_NOTIFY_Request_CDIV(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via,

            m_MBody_XML(m_XmlBody_CDIVN(m_comm_div_ntfy_info(v_ReasonValList[PX_TC_VA-1])))

            m_MBody_XML(m_XmlBody_CDIVN(m_comm_div_ntfy_info(v_ReasonValList[PX_TC_VA-1])))
@@ -3230,6 +3259,9 @@ module CDIV_TC_Functions { 
                                            

                                            

            f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

            f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

			            							 

			            							 

            f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

            

            action("Please unREGISTER IMS client");

            // deregistration of UE

            // deregistration of UE

            f_IMS_postamble_awaitDeRegistration();

            f_IMS_postamble_awaitDeRegistration();

        }

        }

CDIV/CDIV_Templates.ttcn

+9 −0
Original line number Original line Diff line number Diff line
@@ -205,6 +205,15 @@ group MessageTemplates{ 
            }

            }

    }

    }

    

    

    template Response m_Response_history_contact_mbody (StatusLine p_statusLine, CallId p_callId, CSeq p_cSeq,

    From p_from, To p_to, Via p_via,  template Route p_route, template RecordRoute p_recordroute, template MessageBody p_mb, template HistoryInfo p_historyInfo, Contact p_contact) modifies m_Response_mbody:=

    {

        msgHeader :={

            contact := p_contact,

            historyInfo := p_historyInfo

            }

    }

    

    template Response m_Response_history_pAsserted (StatusLine p_statusLine, CallId p_callId, CSeq p_cSeq,

    template Response m_Response_history_pAsserted (StatusLine p_statusLine, CallId p_callId, CSeq p_cSeq,

        From p_from, To p_to, Via p_via, Contact p_contact, 

        From p_from, To p_to, Via p_via, Contact p_contact, 

        template HistoryInfo p_historyInfo, template PAssertedID p_pAssertedID) modifies m_Response_Base:=

        template HistoryInfo p_historyInfo, template PAssertedID p_pAssertedID) modifies m_Response_Base:=