Commit 60089b5c authored by Yann Garcia's avatar Yann Garcia
Browse files

Update MwPS interface

parent 5c85a1d0
Loading
Loading
Loading
Loading
+64 −25
Original line number Diff line number Diff line
@@ -611,11 +611,12 @@ module AtsImsIot_TP_behavior_GM {
         * Expected behaviour
         * ensure that {
         *     when {
         *         the UE_A entity hasAchieveInitialINVITE
         *         the IMS_P_CSCF_A entity receives a 100_Trying
         *         from the UE_A entity
         *     }
         *     then {
         *         the IMS_P_CSCF_A entity sends a 100_Trying
         *         to the UE_A entity
         *         the IMS_P_CSCF_A entity forwards the 100_Trying
         *         to the IMS_S_CSCF_A entity
         *         }
         *     }
         */
@@ -916,7 +917,7 @@ module AtsImsIot_TP_behavior_GM {
    group imsAck {
        
        /**
         * @desc Verify that the P-CSCF successfully processes a ACK provisional response on initial INVITE (Terminating Leg).
         * @desc Verify that the P-CSCF successfully processes a ACK provisional response on initial INVITE (Originating Leg).
         * Initial conditions with {
         *     the UE_A entity isAttachedTo the EPC_A and
         *     the UE_B entity isAttachedTo the EPC_B and
@@ -927,14 +928,7 @@ module AtsImsIot_TP_behavior_GM {
         * Expected behaviour
         * ensure that {
         *     when {
         *         the UE_B entity sends an ACK containing
         *             From indicating value PX_UE_A_SIP_URI,
         *             To indicating value PX_UE_B_SIP_URI,
         *             CallId indicating value PX_UE_A_CALLID,
         *             Via indicating value PX_UE_A_VIA,
         *             Route indicating value PX_UE_A_SERVICE_ROUTE
         *             ;
         *         to the IMS_P_CSCF_B entity
         *         the UE_A entity hasAchieveInitialINVITE
         *     }
         *     then {
         *         the IMS_P_CSCF_A entity receives an ACK containing
@@ -947,6 +941,7 @@ module AtsImsIot_TP_behavior_GM {
         *         from the UE_A entity
         *         }
         *         }
         *     }
         */
        function f_mtc_check_TP_GM_PCSCF_ACK_01(
                                                in ImsInterfaceMonitor p_monitorCompRef,
@@ -978,18 +973,17 @@ module AtsImsIot_TP_behavior_GM {
         * Expected behaviour
         * ensure that {
         *     when {
         *         the UE_A entity hasAchieveInitialINVITE
         *         the UE_B entity hasAchieveInitialINVITE
         *     }
         *     then {
         *         the IMS_P_CSCF_A entity receives an ACK containing
         *             From indicating value PX_UE_A_SIP_URI,
         *             To indicating value PX_UE_B_SIP_URI,
         *             CallId indicating value PX_UE_A_CALLID,
         *             Via indicating value PX_UE_A_VIA,
         *             Route indicating value PX_UE_A_SERVICE_ROUTE
         *         the UE_B entity receives an ACK containing
         *             From indicating value PX_UE_B_SIP_URI,
         *             To indicating value PX_UE_A_SIP_URI,
         *             CallId indicating value PX_UE_B_CALLID,
         *             Via indicating value PX_UE_B_VIA,
         *             Route indicating value PX_UE_B_SERVICE_ROUTE
         *             ;
         *         from the UE_A entity
         *         }
         *         from the IMS_P_CSCF_B entity
         *     }
         */
        function f_mtc_check_TP_GM_PCSCF_ACK_02(
@@ -1042,7 +1036,7 @@ module AtsImsIot_TP_behavior_GM {
         *     }
         */
        function f_mtc_check_TP_GM_PCSCF_BYE_01(
                                                  ImsInterfaceMonitor p_monitorCompRef,
                                                in ImsInterfaceMonitor p_monitorCompRef,
                                                in boolean p_checkMessage := true,
                                                in boolean p_forward_to_mtc := false
                                                ) runs on ImsTestCoordinator {
@@ -1059,6 +1053,51 @@ module AtsImsIot_TP_behavior_GM {
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_GM_PCSCF_BYE_01
        
        /**
         * @desc Verify that the P-CSCF successfully processes a BYE (Terminating Leg).
         * Initial conditions with {
         *     the UE_A entity isAttachedTo the EPC_A and
         *     the UE_B entity isAttachedTo the EPC_B and
         *     the UE_A entity isRegisteredTo the IMS_A and
         *     the UE_B entity isRegisteredTo the IMS_B and
         *     the UE_A entity previouslyEstablishedCallWith the UE_B
         * }
         * 
         * Expected behaviour
         * ensure that {
         *     when {
         *         the UE_B entity isRequestedToSend a BYE
         *     }
         *     then {
         *         the IMS_P_CSCF_B entity receives a BYE containing
         *             From indicating value PX_UE_B_SIP_URI,
         *             To indicating value PX_UE_A_SIP_URI,
         *             CallId indicating value PX_UE_B_CALLID,
         *             Via indicating value PX_UE_B_VIA,
         *             Route indicating value PX_UE_B_SERVICE_ROUTE
         *             ;
         *         from the UE_B entity
         *         }
         *     }
         */
        function f_mtc_check_TP_GM_PCSCF_BYE_02(
                                                in ImsInterfaceMonitor p_monitorCompRef,
                                                in boolean p_checkMessage := true,
                                                in boolean p_forward_to_mtc := false
                                                ) runs on ImsTestCoordinator {
            p_monitorCompRef.start(
                f_imsIot_receive(
                    { mw_SipRequest(mw_BYE_Request_Base) },
                    {},
                    { 0, omit },
                    "TP_GM_PCSCF_BYE_02",
                    p_forward_to_mtc,
                    p_checkMessage
                )
            );
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_GM_PCSCF_BYE_02
        
    } // End of group imsBye
    
} // End of module AtsImsIot_TP_behavior_GM
 No newline at end of file
+119 −42
Original line number Diff line number Diff line
@@ -702,17 +702,17 @@ module AtsImsIot_TP_behavior_MW_PS {
         *             Via indicating value PX_UE_B_VIA,
         *             Route indicating value PX_UE_B_SERVICE_ROUTE
         *         ;
         *         to the IMS_P_CSCF_B entity
         *         to the IMS_P_CSCF_A entity
         *     }
         *     then {
         *         the IMS_P_CSCF_B entity receives a 100_Trying containing
         *         the IMS_P_CSCF_A entity forwards the 100_Trying containing
         *             From indicating value PX_UE_B_SIP_URI,
         *             To indicating value PX_UE_A_SIP_URI,
         *             CallId indicating value PX_UE_B_CALLID,
         *             Via indicating value PX_UE_B_VIA,
         *             Route indicating value PX_UE_B_SERVICE_ROUTE
         *         ;
         *         from the UE_B entity
         *         from the IMS_S_CSCF_A entity
         *         }
         *     }
         */
@@ -750,20 +750,24 @@ module AtsImsIot_TP_behavior_MW_PS {
         * Expected behaviour
         * ensure that {
         *     when {
         *         the UE_A entity hasAchieveInitialINVITE
         *         the IMS_P_CSCF_A entity receives a 180_Ringing containing
         *             From indicating value PX_UE_A_SIP_URI,
         *             To indicating value PX_UE_B_SIP_URI,
         *             CallId indicating value PX_UE_A_CALLID,
         *             Via indicating value PX_UE_A_VIA,
         *             Route indicating value PX_UE_A_SERVICE_ROUTE
         *             ;
         *         from the IMS_S_CSCF_A entity
         *     }
         *     then {
         *         the IMS_P_CSCF_A entity receives a 180_Ringing containing
         *         the IMS_P_CSCF_A entity sends a 180_Ringing containing
         *             From indicating value PX_UE_A_SIP_URI,
         *             To indicating value PX_UE_B_SIP_URI,
         *             CallId indicating value PX_UE_A_CALLID,
         *             Via indicating value PX_UE_A_VIA,
         *             Route indicating value PX_UE_A_SERVICE_ROUTE,
         *             not PChargingVector,
         *             not PChargingFunctionAddresses,
         *             not PPreferredIdentity
         *             Route indicating value PX_UE_A_SERVICE_ROUTE
         *             ;
         *         from the UE_A entity
         *         to the UE_A entity
         *         }
         *     }
         */
@@ -786,7 +790,7 @@ module AtsImsIot_TP_behavior_MW_PS {
        } // End of function f_mtc_check_TP_MW_PCSCF_180RINGING_01
        
        /**
         * @desc Verify that the P-CSCF successfully processes a 180 (Ringing) provisional response on initial INVITE (Terminating Leg).
         * @desc Verify that the P-CSCF successfully processes a 180 (Ringing) provisional response on initial INVITE (Terminating Leg)..
         * Initial conditions with {
         *     the UE_A entity isAttachedTo the EPC_A and
         *     the UE_B entity isAttachedTo the EPC_B and
@@ -797,21 +801,18 @@ module AtsImsIot_TP_behavior_MW_PS {
         * Expected behaviour
         * ensure that {
         *     when {
         *         the UE_B entity sends a 180_Ringing containing
         *         the IMS_P_CSCF_B entity receives a 180_Ringing containing
         *             From indicating value PX_UE_B_SIP_URI,
         *             To indicating value PX_UE_A_SIP_URI,
         *             CallId indicating value PX_UE_B_CALLID,
         *             Via indicating value PX_UE_B_VIA,
         *             Route indicating value PX_UE_B_SERVICE_ROUTE,
         *             not PChargingVector,
         *             not PChargingFunctionAddresses,
         *             not PPreferredIdentity
         *             Route indicating value PX_UE_B_SERVICE_ROUTE
         *             ;
         *         to the IMS_P_CSCF_B entity
         *         from the UE_B entity
         *         
         *     }
         *     then {
         *         the IMS_P_CSCF_B entity receives a 180_Ringing containing
         *         the IMS_P_CSCF_B entity sends a 180_Ringing containing
         *             From indicating value PX_UE_B_SIP_URI,
         *             To indicating value PX_UE_A_SIP_URI,
         *             CallId indicating value PX_UE_B_CALLID,
@@ -821,7 +822,7 @@ module AtsImsIot_TP_behavior_MW_PS {
         *             not PChargingFunctionAddresses,
         *             not PPreferredIdentity
         *             ;
         *         from the UE_B entity
         *         to the IMS_S_CSCF_B entity
         *         }
         *     }
         */
@@ -859,10 +860,7 @@ module AtsImsIot_TP_behavior_MW_PS {
         * Expected behaviour
         * ensure that {
         *     when {
         *         the UE_A entity hasAchieveInitialINVITE
         *     }
         *     then {
         *         the IMS_P_CSCF_A entity sends a 200_Ok containing
         *         the IMS_P_CSCF_A entity receives a 200_Ok containing
         *             From indicating value PX_UE_A_SIP_URI,
         *             To indicating value PX_UE_B_SIP_URI,
         *             CallId indicating value PX_UE_A_CALLID,
@@ -872,7 +870,20 @@ module AtsImsIot_TP_behavior_MW_PS {
         *             not PChargingFunctionAddresses,
         *             not PPreferredIdentity
         *             ;
         *         to the UE_A entity
         *             from the UE_A entity
         *     }
         *     then {
         *         the IMS_P_CSCF_A entity sends a 200_Ok containing
         *             From indicating value PX_UE_A_SIP_URI,
         *             To indicating value PX_UE_B_SIP_URI,
         *             CallId indicating value PX_UE_A_CALLID,
         *             Via indicating value PX_UE_A_VIA,
         *             Route indicating value PX_UE_A_SERVICE_ROUTE,
         *             PChargingVector,
         *             PChargingFunctionAddresses,
         *             PPreferredIdentity
         *             ;
         *         to the IMS_S_CSCF_A entity
         *         }
         *     }
         */
@@ -906,17 +917,17 @@ module AtsImsIot_TP_behavior_MW_PS {
         * Expected behaviour
         * ensure that {
         *     when {
         *         the UE_B entity sends a 200_Ok containing
         *         the IMS_P_CSCF_A entity receives a 200_Ok containing
         *             From indicating value PX_UE_B_SIP_URI,
         *             To indicating value PX_UE_A_SIP_URI,
         *             CallId indicating value PX_UE_B_CALLID,
         *             Via indicating value PX_UE_B_VIA,
         *             Route indicating value PX_UE_B_SERVICE_ROUTE,
         *             not PChargingVector,
         *             not PChargingFunctionAddresses,
         *             not PPreferredIdentity
         *             PChargingVector,
         *             PChargingFunctionAddresses,
         *             PPreferredIdentity
         *             ;
         *         from the IMS_P_CSCF_B entity
         *         from the IMS_S_CSCF_A entity
         *     }
         *     then {
         *         the IMS_P_CSCF_A entity sends a 200_Ok containing
@@ -929,7 +940,7 @@ module AtsImsIot_TP_behavior_MW_PS {
         *             not PChargingFunctionAddresses,
         *             not PPreferredIdentity
         *             ;
         *         from the UE_B entity
         *         from the UE_A entity
         *         }
         *     }
         */
@@ -962,7 +973,7 @@ module AtsImsIot_TP_behavior_MW_PS {
    group imsAck {
        
        /**
         * @desc Verify that the P-CSCF successfully processes a ACK provisional response on initial INVITE (Terminating Leg).
         * @desc Verify that the P-CSCF successfully processes a ACK provisional response on initial INVITE (Originating Leg).
         * Initial conditions with {
         *     the UE_A entity isAttachedTo the EPC_A and
         *     the UE_B entity isAttachedTo the EPC_B and
@@ -973,24 +984,24 @@ module AtsImsIot_TP_behavior_MW_PS {
         * Expected behaviour
         * ensure that {
         *     when {
         *         the UE_B entity sends an ACK containing
         *         the IMS_P_CSCF_A entity receives an ACK containing
         *             From indicating value PX_UE_A_SIP_URI,
         *             To indicating value PX_UE_B_SIP_URI,
         *             CallId indicating value PX_UE_A_CALLID,
         *             Via indicating value PX_UE_A_VIA,
         *             Route indicating value PX_UE_A_SERVICE_ROUTE
         *             ;
         *         to the IMS_P_CSCF_B entity
         *         from the UE_A entity
         *     }
         *     then {
         *         the IMS_P_CSCF_A entity receives an ACK containing
         *         the IMS_P_CSCF_A entity sends an ACK containing
         *             From indicating value PX_UE_A_SIP_URI,
         *             To indicating value PX_UE_B_SIP_URI,
         *             CallId indicating value PX_UE_A_CALLID,
         *             Via indicating value PX_UE_A_VIA,
         *             Route indicating value PX_UE_A_SERVICE_ROUTE
         *             ;
         *         from the UE_A entity
         *         from the IMS_S_CSCF_A entity
         *         }
         *     }
         */
@@ -1013,7 +1024,7 @@ module AtsImsIot_TP_behavior_MW_PS {
        } // End of function f_mtc_check_TP_MW_PCSCF_ACK_01
        
        /**
         * @desc Verify that the P-CSCF successfully processes a ACK provisional response on initial INVITE (Originating Leg).
         * @desc Verify that the P-CSCF successfully processes a ACK provisional response on initial INVITE (Terminating Leg).
         * Initial conditions with {
         *     the UE_A entity isAttachedTo the EPC_A and
         *     the UE_B entity isAttachedTo the EPC_B and
@@ -1024,17 +1035,24 @@ module AtsImsIot_TP_behavior_MW_PS {
         * Expected behaviour
         * ensure that {
         *     when {
         *         the UE_A entity hasAchieveInitialINVITE
         *         the IMS_P_CSCF_B entity sends an ACK containing
         *             From indicating value PX_UE_A_SIP_URI,
         *             To indicating value PX_UE_B_SIP_URI,
         *             CallId indicating value PX_UE_A_CALLID,
         *             Via indicating value PX_UE_A_VIA,
         *             Route indicating value PX_UE_A_SERVICE_ROUTE
         *             ;
         *         to the IMS_S_CSCF_B entity
         *     }
         *     then {
         *         the IMS_P_CSCF_A entity receives an ACK containing
         *         the IMS_P_CSCF_A entity sends an ACK containing
         *             From indicating value PX_UE_A_SIP_URI,
         *             To indicating value PX_UE_B_SIP_URI,
         *             CallId indicating value PX_UE_A_CALLID,
         *             Via indicating value PX_UE_A_VIA,
         *             Route indicating value PX_UE_A_SERVICE_ROUTE
         *             ;
         *         from the UE_A entity
         *         from the UE_B entity
         *         }
         *     }
         */
@@ -1073,9 +1091,6 @@ module AtsImsIot_TP_behavior_MW_PS {
         * Expected behaviour
         * ensure that {
         *     when {
         *         the UE_A entity isRequestedToSend a BYE
         *     }
         *     then {
         *         the IMS_P_CSCF_A entity receives a BYE containing
         *             From indicating value PX_UE_A_SIP_URI,
         *             To indicating value PX_UE_B_SIP_URI,
@@ -1085,6 +1100,16 @@ module AtsImsIot_TP_behavior_MW_PS {
         *             ;
         *         from the UE_A entity
         *     }
         *     then {
         *         the IMS_P_CSCF_A entity send a BYE containing
         *             From indicating value PX_UE_A_SIP_URI,
         *             To indicating value PX_UE_B_SIP_URI,
         *             CallId indicating value PX_UE_A_CALLID,
         *             Via indicating value PX_UE_A_VIA,
         *             Route indicating value PX_UE_A_SERVICE_ROUTE
         *             ;
         *         from the IMS_S_CSCF_A entity
         *         }
         *     }
         */
        function f_mtc_check_TP_MW_PCSCF_BYE_01(
@@ -1105,6 +1130,58 @@ module AtsImsIot_TP_behavior_MW_PS {
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_MW_PCSCF_BYE_01
        
        /**
         * @desc Verify that the P-CSCF successfully processes a BYE (Terminating Leg).
         * Initial conditions with {
         *     the UE_A entity isAttachedTo the EPC_A and
         *     the UE_B entity isAttachedTo the EPC_B and
         *     the UE_A entity isRegisteredTo the IMS_A and
         *     the UE_B entity isRegisteredTo the IMS_B and
         *     the UE_A entity previouslyEstablishedCallWith the UE_B
         * }
         * 
         * Expected behaviour
         * ensure that {
         *     when {
         *         the IMS_P_CSCF_B entity receives a BYE containing
         *             From indicating value PX_UE_B_SIP_URI,
         *             To indicating value PX_UE_A_SIP_URI,
         *             CallId indicating value PX_UE_B_CALLID,
         *             Via indicating value PX_UE_B_VIA,
         *             Route indicating value PX_UE_B_SERVICE_ROUTE
         *             ;
         *         from the UE_B entity
         *     }
         *     then {
         *         the IMS_P_CSCF_B entity send a BYE containing
         *             From indicating value PX_UE_B_SIP_URI,
         *             To indicating value PX_UE_A_SIP_URI,
         *             CallId indicating value PX_UE_B_CALLID,
         *             Via indicating value PX_UE_B_VIA,
         *             Route indicating value PX_UE_B_SERVICE_ROUTE
         *             ;
         *         from the IMS_S_CSCF_B entity
         *         }
         *     }
         */
        function f_mtc_check_TP_MW_PCSCF_BYE_02(
                                                  ImsInterfaceMonitor p_monitorCompRef,
                                                  in boolean p_checkMessage := true,
                                                  in boolean p_forward_to_mtc := false
                                                  ) runs on ImsTestCoordinator {
            p_monitorCompRef.start(
                f_imsIot_receive(
                    { mw_SipRequest(mw_BYE_Request_Base) },
                    {},
                    { 0, omit },
                    "TP_MW_PCSCF_BYE_02",
                    p_forward_to_mtc,
                    p_checkMessage
                )
            );
            p_monitorCompRef.done;
        } // End of function f_mtc_check_TP_MW_PCSCF_BYE_02
        
    } // End of group imsBye
    
} // End of module AtsImsIot_TP_behavior_MW_PS
+9 −1
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ module AtsImsIot_TestCases_CALL {
                f_cf_int_call_down(v_config);
                
                //unmap/disconnet component ports
                f_cf_VxLteMonitor_Down();
                f_cf_user_down(v_ueA);
                f_cf_user_down(v_ueB);
                f_cf_adapter_down();
@@ -185,6 +186,7 @@ module AtsImsIot_TestCases_CALL {
                f_cf_adapter_up();
                f_cf_user_up(v_ueA);
                f_cf_user_up(v_ueB);
                f_cf_VxLteMonitor_Up();
                
                // configuration
                f_cf_int_call_up(v_config);
@@ -208,7 +210,7 @@ module AtsImsIot_TestCases_CALL {
                f_mtc_check_TP_MW_PCSCF_200OK_01(v_gmA/*FIXME: mwPS*/); // Event 8
                
                f_mtc_check_TP_GM_PCSCF_ACK_01(v_gmA); // Event 14
                 f_mtc_check_TP_MW_PCSCF_ACK_01(v_gmA); // Event 15
                 f_mtc_check_TP_MW_PCSCF_ACK_01(v_gmA/*FIXME: mwPS*/); // Event 15
                 
               f_mtc_userCheckNewMediaStream(v_ueB);
                f_mtc_userCheckNewMediaStream(v_ueA);
@@ -220,6 +222,7 @@ module AtsImsIot_TestCases_CALL {
                f_cf_int_call_down(v_config);
                
                //unmap/disconnet component ports
                f_cf_VxLteMonitor_Down();
                f_cf_user_down(v_ueA);
                f_cf_user_down(v_ueB);
                f_cf_adapter_down();
@@ -250,6 +253,7 @@ module AtsImsIot_TestCases_CALL {
                f_cf_adapter_up();
                f_cf_user_up(v_ueA);
                f_cf_user_up(v_ueB);
                f_cf_VxLteMonitor_Up();
                
                // configuration
                f_cf_int_call_up(v_config);
@@ -267,8 +271,11 @@ module AtsImsIot_TestCases_CALL {
                
                // test body
                f_mtc_check_TP_GM_PCSCF_RE_INVITE_02(v_gmB); // Event 5
                f_mtc_check_TP_MW_PCSCF_RE_INVITE_02(v_gmB/*FIXME: mwPS*/); // Event 4
                f_mtc_check_TP_GM_PCSCF_200OK_02(v_gmB); // Event 6
                f_mtc_check_TP_MW_PCSCF_200OK_02(v_gmB/*FIXME: mwPS*/); // Event 11
                f_mtc_check_TP_GM_PCSCF_ACK_02(v_gmB); // Event 17
                f_mtc_check_TP_MW_PCSCF_ACK_02(v_gmB/*FIXME: mwPS*/); // Event 16
                f_mtc_userCheckNewMediaStream(v_ueA);
                f_mtc_userCheckNewMediaStream(v_ueB);
                
@@ -279,6 +286,7 @@ module AtsImsIot_TestCases_CALL {
                f_cf_int_call_down(v_config);
                
                //unmap/disconnet component ports
                f_cf_VxLteMonitor_Down();
                f_cf_user_down(v_ueA);
                f_cf_user_down(v_ueB);
                f_cf_adapter_down();
Compare 7f6fd81a to 1968037e
Original line number Diff line number Diff line
Subproject commit 7f6fd81af0912a0d8bdf85bafede9e62b68b1628
Subproject commit 1968037e8c62d804047c534222ce547764c4b037