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

Update SIP ACK & BYE function/templates for GM and MW/PS interfaces

parent b5e4bcad
Loading
Loading
Loading
Loading
+141 −81
Original line number Diff line number Diff line
@@ -1901,20 +1901,30 @@ module AtsImsIot_TP_behavior_GM {
         */
        function f_mtc_check_TP_GM_PCSCF_BYE_01(
                                                in SipInterfaceMonitor p_monitorCompRef,
                                                in boolean p_checkMessage := true,
                                                in boolean p_forward_to_mtc := false
                                                in boolean p_checkMessage := false,
                                                in SipMessage p_sip
                                                ) runs on ImsTestCoordinator {
            if (isvalue(p_monitorCompRef)) {
                // Check the BYE
                p_monitorCompRef.start(
                                       f_Iot_Sip_receive(
                    { mw_SipRequest(mw_BYE_Request_Base) }, //FIXME
                    {},
                                                         { mw_SipRequest(mw_TP_GM_PCSCF_BYE_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_GM_PCSCF_BYE_01",
                    p_forward_to_mtc,
                                                         "TP_GM_PCSCF_BYE_01 - Request",
                                                         false,
                                                         p_checkMessage
                                                         )
                                        );
                p_monitorCompRef.done;
            }
        } // End of function f_mtc_check_TP_GM_PCSCF_BYE_01
        
        /**
@@ -1946,20 +1956,30 @@ module AtsImsIot_TP_behavior_GM {
         */
        function f_mtc_check_TP_GM_PCSCF_BYE_02(
                                                in SipInterfaceMonitor p_monitorCompRef,
                                                in boolean p_checkMessage := true,
                                                in boolean p_forward_to_mtc := false
                                                in boolean p_checkMessage := false,
                                                in SipMessage p_sip
                                                ) runs on ImsTestCoordinator {
            if (isvalue(p_monitorCompRef)) {
                // Check the BYE
                p_monitorCompRef.start(
                                       f_Iot_Sip_receive(
                    { mw_SipRequest(mw_BYE_Request_Base) },
                    {},
                                                         { mw_SipRequest(mw_TP_GM_PCSCF_BYE_02(
                                                                                               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_GM_PCSCF_BYE_02",
                    p_forward_to_mtc,
                                                         "TP_GM_PCSCF_BYE_02 - Request",
                                                         false,
                                                         p_checkMessage
                                                         )
                                        );
                p_monitorCompRef.done;
            }
        } // End of function f_mtc_check_TP_GM_PCSCF_BYE_02
        
        /**
@@ -1991,74 +2011,114 @@ module AtsImsIot_TP_behavior_GM {
         */
        function f_mtc_check_TP_GM_PCSCF_BYE_03(
                                                in SipInterfaceMonitor p_monitorCompRef,
                                                in boolean p_checkMessage := true,
                                                in boolean p_forward_to_mtc := false
                                                in boolean p_checkMessage := false,
                                                in SipMessage p_sip
                                                ) runs on ImsTestCoordinator {
            if (isvalue(p_monitorCompRef)) {
                // Check the BYE
                p_monitorCompRef.start(
                                       f_Iot_Sip_receive(
                    { mw_SipRequest(mw_BYE_Request_Base) },
                    {},
                                                         { mw_SipRequest(mw_TP_GM_PCSCF_BYE_03(
                                                                                               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_GM_PCSCF_BYE_03",
                    p_forward_to_mtc,
                                                         "TP_GM_PCSCF_BYE_03 - Request",
                                                         false,
                                                         p_checkMessage
                                                         )
                                        );
                p_monitorCompRef.done;
            }
        } // End of function f_mtc_check_TP_GM_PCSCF_BYE_03
        
        function f_mtc_check_TP_GM_PCSCF_BYE_04( // FIXME RMI To be reviewed
        function f_mtc_check_TP_GM_PCSCF_BYE_04(
                                                in SipInterfaceMonitor p_monitorCompRef,
                                                in boolean p_checkMessage := true,
                                                in boolean p_forward_to_mtc := false
                                                in boolean p_checkMessage := false,
                                                in SipMessage p_sip
                                                ) runs on ImsTestCoordinator {
            if (isvalue(p_monitorCompRef)) {
                // Check the BYE
                p_monitorCompRef.start(
                                       f_Iot_Sip_receive(
                    { mw_SipRequest(mw_BYE_Request_Base) },
                    {},
                                                         { mw_SipRequest(mw_TP_GM_PCSCF_BYE_04(
                                                                                               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_GM_PCSCF_BYE_04",
                    p_forward_to_mtc,
                                                         "TP_GM_PCSCF_BYE_04 - Request",
                                                         false,
                                                         p_checkMessage
                                                         )
                                        );
                p_monitorCompRef.done;
            }
        } // End of function f_mtc_check_TP_GM_PCSCF_BYE_04
        
        function f_mtc_check_TP_GM_PCSCF_BYE_05( // FIXME RMI To be reviewed
        function f_mtc_check_TP_GM_PCSCF_BYE_05(
                                                in SipInterfaceMonitor p_monitorCompRef,
                                                in boolean p_checkMessage := true,
                                                in boolean p_forward_to_mtc := false
                                                in boolean p_checkMessage := false,
                                                in SipMessage p_sip
                                                ) runs on ImsTestCoordinator {
            if (isvalue(p_monitorCompRef)) {
                // Check the BYE
                p_monitorCompRef.start(
                                       f_Iot_Sip_receive(
                    { mw_SipRequest(mw_BYE_Request_Base) },
                    {},
                                                         { mw_SipRequest(mw_TP_GM_PCSCF_BYE_05(
                                                                                               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_GM_PCSCF_BYE_05",
                    p_forward_to_mtc,
                                                         "TP_GM_PCSCF_BYE_05 - Request",
                                                         false,
                                                         p_checkMessage
                                                         )
                                        );
                p_monitorCompRef.done;
            } 
        } // End of function f_mtc_check_TP_GM_PCSCF_BYE_05
        
        function f_mtc_check_TP_GM_PCSCF_BYE_06( // FIXME RMI To be reviewed
        function f_mtc_check_TP_GM_PCSCF_BYE_06(
                                                in SipInterfaceMonitor p_monitorCompRef,
                                                in boolean p_checkMessage := true,
                                                in boolean p_forward_to_mtc := false
                                                in boolean p_checkMessage := false,
                                                in SipMessage p_sip
                                                ) runs on ImsTestCoordinator {
            if (isvalue(p_monitorCompRef)) {
                // Check the BYE
                p_monitorCompRef.start(
                                       f_Iot_Sip_receive(
                    { mw_SipRequest(mw_BYE_Request_Base) },
                    {},
                                                         { mw_SipRequest(mw_TP_GM_PCSCF_BYE_06(
                                                                                               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_GM_PCSCF_BYE_06",
                    p_forward_to_mtc,
                                                         "TP_GM_PCSCF_BYE_06 - Request",
                                                         false,
                                                         p_checkMessage
                                                         )
                                        );
                p_monitorCompRef.done;
            }
        } // End of function f_mtc_check_TP_GM_PCSCF_BYE_06
        
    } // End of group imsBye
+141 −81

File changed.

Preview size limit exceeded, changes collapsed.

+73 −0
Original line number Diff line number Diff line
@@ -363,6 +363,79 @@ module AtsImsIot_Templates_GM {
                                                             ) modifies mw_TP_GM_PCSCF_ACK_01 := {
        } // End of template mw_TP_GM_PCSCF_ACK_04
        
        template (present) BYE_Request mw_TP_GM_PCSCF_BYE_01( // TODO To be enforced
                                                             template (present) CallId p_callId := ?,
                                                             template (present) CSeq p_cSeq := ?,
                                                             template (present) SipUrl p_ack_uri := ?,
                                                             template (present) From p_from := ?,
                                                             template (present) To p_to := ?
                                                             ) modifies mw_BYE_Request_Base := {
            requestLine := {
                method := BYE_E,
                requestUri := p_ack_uri, // @TODO
                sipVersion := c_sipNameVersion
            },
            msgHeader := {
                cSeq := p_cSeq,
                callId := p_callId,
                fromField := p_from,
                toField := p_to,
                route := {
                    fieldName := ROUTE_E,
                    routeBody := {
                        *, 
                        ?,
                        *
                    }
                }
            }
        } // End of template mw_TP_GM_PCSCF_BYE_01
        
        template (present) BYE_Request mw_TP_GM_PCSCF_BYE_02( // TODO To be enforced
                                                             template (present) CallId p_callId := ?,
                                                             template (present) CSeq p_cSeq := ?,
                                                             template (present) SipUrl p_ack_uri := ?,
                                                             template (present) From p_from := ?,
                                                             template (present) To p_to := ?
                                                             ) modifies mw_TP_GM_PCSCF_BYE_01 := {
        } // End of template mw_TP_GM_PCSCF_BYE_02
        
        template (present) BYE_Request mw_TP_GM_PCSCF_BYE_03( // TODO To be enforced
                                                             template (present) CallId p_callId := ?,
                                                             template (present) CSeq p_cSeq := ?,
                                                             template (present) SipUrl p_ack_uri := ?,
                                                             template (present) From p_from := ?,
                                                             template (present) To p_to := ?
                                                             ) modifies mw_TP_GM_PCSCF_BYE_01 := {
        } // End of template mw_TP_GM_PCSCF_BYE_03
        
        template (present) BYE_Request mw_TP_GM_PCSCF_BYE_04( // TODO To be enforced
                                                             template (present) CallId p_callId := ?,
                                                             template (present) CSeq p_cSeq := ?,
                                                             template (present) SipUrl p_ack_uri := ?,
                                                             template (present) From p_from := ?,
                                                             template (present) To p_to := ?
                                                             ) modifies mw_TP_GM_PCSCF_BYE_01 := {
        } // End of template mw_TP_GM_PCSCF_BYE_04
        
        template (present) BYE_Request mw_TP_GM_PCSCF_BYE_05( // TODO To be enforced
                                                             template (present) CallId p_callId := ?,
                                                             template (present) CSeq p_cSeq := ?,
                                                             template (present) SipUrl p_ack_uri := ?,
                                                             template (present) From p_from := ?,
                                                             template (present) To p_to := ?
                                                             ) modifies mw_TP_GM_PCSCF_BYE_01 := {
        } // End of template mw_TP_GM_PCSCF_BYE_05
        
        template (present) BYE_Request mw_TP_GM_PCSCF_BYE_06( // TODO To be enforced
                                                             template (present) CallId p_callId := ?,
                                                             template (present) CSeq p_cSeq := ?,
                                                             template (present) SipUrl p_ack_uri := ?,
                                                             template (present) From p_from := ?,
                                                             template (present) To p_to := ?
                                                             ) modifies mw_TP_GM_PCSCF_BYE_01 := {
        } // End of template mw_TP_GM_PCSCF_BYE_06
        
    } // End of group g_gmA
    
} // End of module AtsImsIot_Templates_GM 
 No newline at end of file
+72 −0
Original line number Diff line number Diff line
@@ -427,6 +427,78 @@ module AtsImsIot_Templates_MW {
                                                             ) modifies mw_TP_MW_PCSCF_ACK_01 := {
        } // End of template mw_TP_MW_PCSCF_ACK_04
        
        template (present) BYE_Request mw_TP_MW_PCSCF_BYE_01( // TODO To be enforced
                                                             template (present) CallId p_callId := ?,
                                                             template (present) CSeq p_cSeq := ?,
                                                             template (present) SipUrl p_ack_uri := ?,
                                                             template (present) From p_from := ?,
                                                             template (present) To p_to := ?
                                                             ) modifies mw_BYE_Request_Base := {
            requestLine := {
                method := BYE_E,
                requestUri := p_ack_uri, // @TODO
                sipVersion := c_sipNameVersion
            },
            msgHeader := {
                callId := p_callId,
                fromField := p_from,
                toField := p_to,
                route := {
                    fieldName := ROUTE_E,
                    routeBody := {
                        *, 
                        ?,
                        *
                    }
                }
            }
        } // End of template mw_TP_MW_PCSCF_BYE_01
        
        template (present) BYE_Request mw_TP_MW_PCSCF_BYE_02( // TODO To be enforced
                                                             template (present) CallId p_callId := ?,
                                                             template (present) CSeq p_cSeq := ?,
                                                             template (present) SipUrl p_ack_uri := ?,
                                                             template (present) From p_from := ?,
                                                             template (present) To p_to := ?
                                                             ) modifies mw_TP_MW_PCSCF_BYE_01 := {
        } // End of template mw_TP_MW_PCSCF_BYE_02
        
        template (present) BYE_Request mw_TP_MW_PCSCF_BYE_03( // TODO To be enforced
                                                             template (present) CallId p_callId := ?,
                                                             template (present) CSeq p_cSeq := ?,
                                                             template (present) SipUrl p_ack_uri := ?,
                                                             template (present) From p_from := ?,
                                                             template (present) To p_to := ?
                                                             ) modifies mw_TP_MW_PCSCF_BYE_01 := {
        } // End of template mw_TP_MW_PCSCF_BYE_03
        
        template (present) BYE_Request mw_TP_MW_PCSCF_BYE_04( // TODO To be enforced
                                                             template (present) CallId p_callId := ?,
                                                             template (present) CSeq p_cSeq := ?,
                                                             template (present) SipUrl p_ack_uri := ?,
                                                             template (present) From p_from := ?,
                                                             template (present) To p_to := ?
                                                             ) modifies mw_TP_MW_PCSCF_BYE_01 := {
        } // End of template mw_TP_MW_PCSCF_BYE_04
        
        template (present) BYE_Request mw_TP_MW_PCSCF_BYE_05( // TODO To be enforced
                                                             template (present) CallId p_callId := ?,
                                                             template (present) CSeq p_cSeq := ?,
                                                             template (present) SipUrl p_ack_uri := ?,
                                                             template (present) From p_from := ?,
                                                             template (present) To p_to := ?
                                                             ) modifies mw_TP_MW_PCSCF_BYE_01 := {
        } // End of template mw_TP_MW_PCSCF_BYE_05
        
        template (present) BYE_Request mw_TP_MW_PCSCF_BYE_06( // TODO To be enforced
                                                             template (present) CallId p_callId := ?,
                                                             template (present) CSeq p_cSeq := ?,
                                                             template (present) SipUrl p_ack_uri := ?,
                                                             template (present) From p_from := ?,
                                                             template (present) To p_to := ?
                                                             ) modifies mw_TP_MW_PCSCF_BYE_01 := {
        } // End of template mw_TP_MW_PCSCF_BYE_06
        
    } // End of group g_pcscf
    
    group g_scscf {