Commit 4db13574 authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

Author update and minor updates

parent 30ce9615
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -649,13 +649,13 @@ Package TP_GM {
        Expected behaviour
        Expected behaviour
            ensure that { 
            ensure that { 
                when { 
                when { 
                    the IMS_P_CSCF_A entity sends a 200_Ok containing
                    the IMS_E_CSCF entity sends a 200_Ok containing
                        From indicating value PX_PSAP_SIP_URI,
                        From indicating value PX_PSAP_SIP_URI,
                        To indicating value PX_UE_A_SIP_URI,
                        To indicating value PX_UE_A_SIP_URI,
                        CallId indicating value PX_PSAP_CALLID,
                        CallId indicating value PX_PSAP_CALLID,
                        Via indicating value PX_PSAP_VIA,
                        Via indicating value PX_PSAP_VIA,
                        Route indicating value PX_PSAP_SERVICE_ROUTE;
                        Route indicating value PX_PSAP_SERVICE_ROUTE;
                    to the IMS_E_CSCF entity
                    to the IMS_P_CSCF_A entity
                }
                }
                then {
                then {
                    the IMS_P_CSCF_A entity sends a 200_Ok containing
                    the IMS_P_CSCF_A entity sends a 200_Ok containing
@@ -671,7 +671,7 @@ Package TP_GM {
                }
                }
            }
            }
        
        
    } // End of TP_GM_PCSCF_ECO_200OK_01
    } // End of TP_GM_PCSCF_ECO_200OK_BYE_01
    
    
    Test Purpose {
    Test Purpose {
        
        
+2 −2
Original line number Original line Diff line number Diff line
/*
/**
 *	@author 	STF 574
 *	@author 	STF 574, TTF 010
 *  @version    $Id$
 *  @version    $Id$
 *	@desc		This module provides the module parameter
 *	@desc		This module provides the module parameter
 */
 */
+5 −5
Original line number Original line Diff line number Diff line
@@ -2907,13 +2907,13 @@ module AtsImsIot_TP_behavior_GM {
		 * Expected behaviour
		 * Expected behaviour
		 * ensure that {
		 * ensure that {
		 *     when {
		 *     when {
		 *         the IMS_P_CSCF_A entity sends a 200_Ok containing
		 *         the IMS_E_CSCF entity sends a 200_Ok containing
		 *              From indicating value PX_UE_B_SIP_URI,
		 *              From indicating value PX_UE_B_SIP_URI,
		 *              To indicating value PX_UE_A_SIP_URI,
		 *              To indicating value PX_UE_A_SIP_URI,
		 *              CallId indicating value PX_UE_B_CALLID,
		 *              CallId indicating value PX_UE_B_CALLID,
		 *              Via indicating value PX_UE_B_VIA,
		 *              Via indicating value PX_UE_B_VIA,
		 *              Route indicating value PX_UE_B_SERVICE_ROUTE;
		 *              Route indicating value PX_UE_B_SERVICE_ROUTE;
		 *          from the IMS_E_CSCF entity
		 *          to the IMS_P_CSCF_A entity
		 *     }
		 *     }
		 *     then {
		 *     then {
		 *          the IMS_P_CSCF_A entity sends a 200_Ok containing
		 *          the IMS_P_CSCF_A entity sends a 200_Ok containing
@@ -3704,13 +3704,13 @@ module AtsImsIot_TP_behavior_GM {
		 * Expected behaviour
		 * Expected behaviour
		 * ensure that {
		 * ensure that {
		 *     when {
		 *     when {
		 *         the IMS_P_CSCF_A entity sends a 200_Ok containing
		 *         the IMS_E_CSCF entity sends a 200_Ok containing
		 *              From indicating value PX_UE_B_SIP_URI,
		 *              From indicating value PX_UE_B_SIP_URI,
		 *              To indicating value PX_UE_A_SIP_URI,
		 *              To indicating value PX_UE_A_SIP_URI,
		 *              CallId indicating value PX_UE_B_CALLID,
		 *              CallId indicating value PX_UE_B_CALLID,
		 *              Via indicating value PX_UE_B_VIA,
		 *              Via indicating value PX_UE_B_VIA,
		 *              Route indicating value PX_UE_B_SERVICE_ROUTE;
		 *              Route indicating value PX_UE_B_SERVICE_ROUTE;
		 *          from the IMS_E_CSCF entity
		 *          to the IMS_P_CSCF_A entity
		 *     }
		 *     }
		 *     then {
		 *     then {
		 *         the IMS_P_CSCF_A entity sends a 200_Ok containing
		 *         the IMS_P_CSCF_A entity sends a 200_Ok containing
@@ -3723,7 +3723,7 @@ module AtsImsIot_TP_behavior_GM {
		 *             not PChargingFunctionAddresses,
		 *             not PChargingFunctionAddresses,
		 *             not PPreferredIdentity
		 *             not PPreferredIdentity
		 *             ;
		 *             ;
		 *         to the IMS_S_CSCF_A entity
		 *         to the UE_A entity
		 *         }
		 *         }
		 *     }
		 *     }
		 */
		 */
+2 −2
Original line number Original line Diff line number Diff line
/*
/**
 *  @author     STF 574
 *  @author     STF 574, TTF 010
 *  @version    $Id$
 *  @version    $Id$
 *  @desc       This module provides the TP behaviour functions at GX interface
 *  @desc       This module provides the TP behaviour functions at GX interface
 */
 */
+3 −65
Original line number Original line Diff line number Diff line
/**
/**
 *  @author     STF 574
 *  @author     STF 574, TTF 010
 *  @version    $Id$
 *  @version    $Id$
 *  @desc       This module provides the TP behaviour functions at Mw interface at P-CSCF/I-CSCF or P-CSCF/S-CSCF if I-CSCF not used
 *  @desc       This module provides the TP behaviour functions at Mw interface at P-CSCF/I-CSCF or P-CSCF/S-CSCF if I-CSCF not used
 */
 */
@@ -2965,41 +2965,7 @@ module AtsImsIot_TP_behavior_MW_PS {
                                                         },
                                                         },
                                                         { mw_SipResponse(mw_200OK_Base) },
                                                         { mw_SipResponse(mw_200OK_Base) },
                                                         { 0, omit },
                                                         { 0, omit },
                                                         "TP_MW_ECSCF_ECO_200OK_01",
                                                         "TP_MW_PCSCF_ECO_200OK_01",
                                                         false,
                                                         p_checkMessage
                                                         )
                                        );
                p_monitorCompRef.done;
                
            }
        } // End of function f_mtc_check_TP_MW_PCSCF_ECO_200OK_01
        
        function f_mtc_check_TP_MW_PCSCF_ECO_200OK_01(
                                                      in SipInterfaceMonitor p_monitorCompRef,
                                                      in boolean p_checkMessage := false,
                                                      in SipMessage p_sip
                                                      ) runs on ImsTestCoordinator {
            if (isvalue(p_monitorCompRef)) {
                var ImsUserInfo v_psapInfo := f_getSipUserId(PX_PSAP);
                
                // Check the 200 OK
                p_monitorCompRef.start(
                                       f_Iot_Sip_receive(
                                                         { mw_SipResponse(mw_200OK(
                                                                                   p_sip.request.msgHeader.cSeq,
                                                                                   p_sip.request.msgHeader.callId,
                                                                                   p_sip.request.msgHeader.fromField,
                                                                                   (
                                                                                      mw_To_NameAddr_TelUrl({quotedString:=v_psapInfo.publicId}),
                                                                                      mw_To_AddrUnion_TelUrl(v_psapInfo.publicId),
                                                                                      p_sip.request.msgHeader.toField
                                                                                    )
                                                                                   )) 
                                                         },
                                                         { mw_SipResponse(mw_200OK_Base) },
                                                         { 0, omit },
                                                         "TP_MW_ECSCF_ECO_200OK_01",
                                                         false,
                                                         false,
                                                         p_checkMessage
                                                         p_checkMessage
                                                         )
                                                         )
@@ -3213,35 +3179,7 @@ module AtsImsIot_TP_behavior_MW_PS {
                                                         },
                                                         },
                                                         { mw_SipRequest(mw_ACK_Request_Base) },
                                                         { mw_SipRequest(mw_ACK_Request_Base) },
                                                         { 0, omit },
                                                         { 0, omit },
                                                         "TP_MW_ECSCF_ECO_ACK_01 - Request",
                                                         "TP_MW_PCSCF_ECO_ACK_01 - Request",
                                                         false,
                                                         p_checkMessage
                                                         )
                                        );
                p_monitorCompRef.done;
            }
        } // End of function f_mtc_check_TP_MW_PCSCF_ECO_ACK_01
        
        function f_mtc_check_TP_MW_PCSCF_ECO_ACK_01(
                                                    in SipInterfaceMonitor p_monitorCompRef,
                                                    in boolean p_checkMessage := false,
                                                    in SipMessage p_sip
                                                    ) runs on ImsTestCoordinator {
            if (isvalue(p_monitorCompRef)) {
                // Check the ACK
                p_monitorCompRef.start(
                                       f_Iot_Sip_receive(
                                                         { mw_SipRequest(mw_TP_MW_ECSCF_ACK_01(
                                                                                               p_sip.request.msgHeader.callId,
                                                                                               p_sip.request.msgHeader.cSeq,
                                                                                               -, // FIXME To be set
                                                                                               p_sip.request.msgHeader.fromField,
                                                                                               p_sip.request.msgHeader.toField
                                                                                               )) 
                                                         },
                                                         { mw_SipRequest(mw_ACK_Request_Base) },
                                                         { 0, omit },
                                                         "TP_MW_ECSCF_ECO_ACK_01 - Request",
                                                         false,
                                                         false,
                                                         p_checkMessage
                                                         p_checkMessage
                                                         )
                                                         )
Loading