Commit 0667bd2e authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

Diameter Rx update due to validation of INT_INI group of TDs

parent 38ca9142
Loading
Loading
Loading
Loading
+77 −18
Original line number Diff line number Diff line
@@ -200,6 +200,21 @@ module AtsImsIot_Diameter_Templates {
                aVP_Data   := p_avpData
            }

            template Service_Info_Status_AVP mw_serviceInfoStatus (template (present) Service_Info_Type p_avpData) :={
                aVP_Header := mw_aVP_Header_any_Code(c_service_Info_Status_AVP_Code),//<AVP header: 527 ....>
                aVP_Data   := p_avpData
            }

            template Rx_Request_Type_AVP mw_rxRequestType (template (present) Rx_Request_Type p_avpData) :={
                aVP_Header := mw_aVP_Header_any_Code(c_rx_Request_Type_AVP_Code),//<AVP header: 527 ....>
                aVP_Data   := p_avpData
            }

            template Framed_IP_Address_AVP mw_framedIPAddress (template (present) octetstring p_avpData) :={
                aVP_Header := mw_aVP_Header_any_Code(c_framed_IP_Address_AVP_Code),//<AVP header: 8 ....>
                aVP_Data   := p_avpData
            }
            
        } //end group RxHeaderFields
        group GxHeaderFields{

@@ -383,6 +398,34 @@ module AtsImsIot_Diameter_Templates {
            
        } //end group S6aHeaderFields
        
        
        
        group ShHeaderFields{
            
            template User_Identity_AVP mw_userIdentity_publicIdentity(template (present) Public_Identity_AVP p_publicIdentity) :=
            {
                aVP_Header := mw_aVP_Header_any_Code(c_user_Identity_AVP_Code),
                public_Identity_AVP  := p_publicIdentity,
                mSISDN_AVP           := *,
                aVP_Type   := *
            }
            
            template User_Identity_AVP mw_userIdentity_msisdn(template (present) MSISDN_AVP p_msisdn) :=
            {
                aVP_Header := mw_aVP_Header_any_Code(c_user_Identity_AVP_Code),
                public_Identity_AVP  := *,
                mSISDN_AVP           := p_msisdn,
                aVP_Type   := *
            }
            
            template Public_Identity_AVP mw_publicIdentity(template (present) UTF8String p_avpData) :=
            {
                aVP_Header := mw_aVP_Header_any_Code(c_public_Identity_AVP_Code),
                aVP_Data   := p_avpData
            }
            
        } //end group ShHeaderFields
        
        group S9HeaderFields{

            template Subses_Enforcement_Info_AVP mw_subses_Enforcement_Info(Subsession_Operation_AVP p_subsession_Operation) := {
@@ -512,13 +555,13 @@ module AtsImsIot_Diameter_Templates {
            }
            group CxRequestMessageTemplates{

                template MAR_MSG mw_MAR modifies mw_MAR_basic := {
                template MAR_MSG mw_MAR(template (present) Public_Identity_AVP p_publicIdentity := ?) modifies mw_MAR_basic := {
                    header := mw_diameterHeaderReq_dummy(MAR_E, c_applId3GPPCxDx),
                    mAR_Body :={
                        vendor_Specific_Application_Id := ?,
                        auth_Session_State := mw_authSessionState_noStateMaintained,
                        user_Name := ?,
                        public_Identity := ?,   //required only in TS129 229
                        public_Identity := p_publicIdentity,
                        sIP_Number_Auth_Items := ?,
                        sIP_Auth_Data_Item := ?,
                        server_Name := ?
@@ -535,81 +578,81 @@ module AtsImsIot_Diameter_Templates {
                    }
                }

                template SAR_MSG mw_SAR_Registration modifies mw_SAR_basic := {
                template SAR_MSG mw_SAR_Registration(template (present) Public_Identity_AVP p_publicIdentity := ?) modifies mw_SAR_basic := {
                    header := mw_diameterHeaderReq_dummy(SAR_E, c_applId3GPPCxDx),
                    sAR_Body :={
                        vendor_Specific_Application_Id := ?,
                        auth_Session_State := mw_authSessionState_noStateMaintained,
                        public_Identity := ?,
                        public_Identity := {p_publicIdentity},
                        server_Name := ?,
                        server_Assignment_Type := mw_serverAssignmentType(REGISTRATION_E),
                        user_Data_Already_Available := ?
                    }
                }

                template SAR_MSG mw_SAR_UnregisteredUser modifies mw_SAR_basic := {
                template SAR_MSG mw_SAR_UnregisteredUser(template (present) Public_Identity_AVP p_publicIdentity := ?) modifies mw_SAR_basic := {
                    header := mw_diameterHeaderReq_dummy(SAR_E, c_applId3GPPCxDx),
                    sAR_Body :={
                        vendor_Specific_Application_Id := ?,
                        auth_Session_State := mw_authSessionState_noStateMaintained,
                        public_Identity := ?,
                        public_Identity := {p_publicIdentity},
                        server_Name := ?,
                        server_Assignment_Type := mw_serverAssignmentType(UNREGISTERED_USER_E),
                        user_Data_Already_Available := ?
                    }
                }

                template SAR_MSG mw_SAR_UserDeregistration modifies mw_SAR_basic := {
                template SAR_MSG mw_SAR_UserDeregistration(template (present) Public_Identity_AVP p_publicIdentity := ?) modifies mw_SAR_basic := {
                    header := mw_diameterHeaderReq_dummy(SAR_E, c_applId3GPPCxDx),
                    sAR_Body :={
                        vendor_Specific_Application_Id := ?,
                        auth_Session_State := mw_authSessionState_noStateMaintained,
                        public_Identity := ?,
                        public_Identity := {p_publicIdentity},
                        server_Name := ?,
                        server_Assignment_Type := mw_serverAssignmentType(USER_DEREGISTRATION_E),
                        user_Data_Already_Available := ?
                    }
                }

                template UAR_MSG mw_UAR_Registration modifies mw_UAR_basic := {
                template UAR_MSG mw_UAR_Registration(template (present) Public_Identity_AVP p_publicIdentity := ?) modifies mw_UAR_basic := {
                    header := mw_diameterHeaderReq_dummy(UAR_E, c_applId3GPPCxDx),
                    uAR_Body :={
                        vendor_Specific_Application_Id := ?,
                        auth_Session_State := mw_authSessionState_noStateMaintained,
                        user_Name := ?,
                        public_Identity := ?,
                        public_Identity := p_publicIdentity,
                        visited_Network_Identifier := ?,
                        user_Authorization_Type := mw_userAuthorizationType(REGISTRATION)
                    }
                }

                template UAR_MSG mw_UAR modifies mw_UAR_basic := {
                template UAR_MSG mw_UAR(template (present) Public_Identity_AVP p_publicIdentity := ?) modifies mw_UAR_basic := {
                    header := mw_diameterHeaderReq_dummy(UAR_E, c_applId3GPPCxDx),
                    uAR_Body :={
                        vendor_Specific_Application_Id := ?,
                        auth_Session_State := mw_authSessionState_noStateMaintained,
                        user_Name := ?, 
                        public_Identity := ?
                        public_Identity := p_publicIdentity
                    }
                }

                template UAR_MSG mw_UAR_unknownPrivateId modifies mw_UAR_basic := {
                template UAR_MSG mw_UAR_unknownPrivateId(template (present) Public_Identity_AVP p_publicIdentity := ?) modifies mw_UAR_basic := {
                    header := mw_diameterHeaderReq_dummy(UAR_E, c_applId3GPPCxDx),
                    uAR_Body :={
                        vendor_Specific_Application_Id := ?,
                        auth_Session_State := mw_authSessionState_noStateMaintained,
                        user_Name := ?,//UNKNOWN PRIVATE USER IDENTITY
                        public_Identity := ?
                        public_Identity := p_publicIdentity
                    }
                }

                template UAR_MSG mw_UAR_deRegistration modifies mw_UAR_basic := {
                template UAR_MSG mw_UAR_deRegistration(template (present) Public_Identity_AVP p_publicIdentity := ?) modifies mw_UAR_basic := {
                    header := mw_diameterHeaderReq_dummy(UAR_E, c_applId3GPPCxDx),
                    uAR_Body :={
                        vendor_Specific_Application_Id := ?,
                        auth_Session_State := mw_authSessionState_noStateMaintained,
                        user_Name := ?,
                        public_Identity := ?,
                        public_Identity := p_publicIdentity,
                        visited_Network_Identifier := ?,
                        user_Authorization_Type := mw_userAuthorizationType(DE_REGISTRATION)
                    }
@@ -775,6 +818,22 @@ module AtsImsIot_Diameter_Templates {
            }
            group RxRequestMessageTemplates{

                template AAR_MSG mw_AAR_RequestType_ServiceInfoStatus_FramedIPv4(
                    template (present) Rx_Request_Type_AVP p_rxRequestType         := ?,
                    template (present) Service_Info_Status_AVP p_serviceInfoStatus := ?,
                    template (present) Framed_IP_Address_AVP p_framedIPAddress     := ?,
                    template (present) Specific_Action_AVP p_specificAction        := ?
                ) modifies mw_AAR_basic := {
                    aAR_Body :={
                        media_Component_Description := ?,
                        specific_Action := {p_specificAction},
                        framed_IP_Address := p_framedIPAddress,
                        rx_Request_Type := p_rxRequestType,
                        service_Info_Status := p_serviceInfoStatus
                        //framed_IPv6_Address := *,
                    }
                }

                template AAR_MSG mw_AAR_MediaComponent_specificActionLossOfBearer modifies mw_AAR_basic := {
                    aAR_Body :={
                        media_Component_Description := {mw_mediaComponentDescription_SubComponentFlowStatusEnabled},
@@ -1038,11 +1097,11 @@ module AtsImsIot_Diameter_Templates {
        group ShMessageTemplates{
            group ShRequestMessageTemplates{

                template UDR_MSG mw_UDR_userData modifies mw_UDR_dummy := {
                template UDR_MSG mw_UDR_userData_publicIdentity(template (present) UTF8String p_avpData) modifies mw_UDR_dummy := {
                    uDR_Body :={
                        vendor_Specific_Application_Id := ?,
                        auth_Session_State := mw_authSessionState_noStateMaintained,
                        user_Identity := ?,
                        user_Identity := mw_userIdentity_publicIdentity(mw_publicIdentity(p_avpData)),
                        data_Reference := ?
                    }
                }
+3 −3
Original line number Diff line number Diff line
@@ -132,10 +132,10 @@ module AtsImsIot_TD_DRG{
                    
                    f_mtc_check_TP_CX_HSS_RTA_01(f_getCxInterface(PX_DIAMETER_CX_SINGLE_INTERFACE));// Event 1, 8
                    
                    //f_mtc_check_TP_MW_PCSCF_NOTIFY_01(vc_vxlte_monitor_components.mwPS, false, true); // Event 2
                    //f_mtc_check_TP_GM_PCSCF_NOTIFY_01(vc_vxlte_monitor_components.gmA, false); // Events 3
                    f_mtc_check_TP_MW_PCSCF_NOTIFY_01(vc_vxlte_monitor_components.mwPS); // Event 2
                    //f_mtc_check_TP_GM_PCSCF_NOTIFY_01(vc_vxlte_monitor_components.gmA); // Events 3
                    //f_mtc_check_TP_GM_PCSCF_200OK_01(vc_vxlte_monitor_components.gmA, false); // Events 4
                    //f_mtc_check_TP_MW_PCSCF_200OK_01(vc_vxlte_monitor_components.mwPS, false, true); // Event 5
                    //f_mtc_check_TP_MW_PCSCF_200OK_01(vc_vxlte_monitor_components.mwPS); // Event 5
                    //f_mtc_check_TP_MW_PCSCF_NOTIFY_02(vc_vxlte_monitor_components.mwPS, false, true); // Event 6, 7
                    
                    f_mtc_check_TP_RX_PCSCF_STR_08(vc_vxlte_monitor_components.rx);// Event 9
+549 −536

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ module AtsImsIot_TD_REG{
                    f_mtc_check_TP_CX_HSS_SAA_01(vc_vxlte_monitor_components.cxSH);// Event 16, 17
                    
                    f_mtc_check_TP_SH_HSS_UDA_01(vc_vxlte_monitor_components.sh);// Event 16, 17
                    f_mtc_check_TP_ISC_SCSCF_REGISTER_01(vc_vxlte_monitor_components.isc, true); // Event 18, 21
                    f_mtc_check_TP_ISC_SCSCF_REGISTER_01(vc_vxlte_monitor_components.isc); // Event 18, 21
                    
                    f_mtc_check_TP_GM_PCSCF_SUBSCRIBE_01(vc_vxlte_monitor_components.gmA, true); // Events 25, 28
                    f_mtc_check_TP_MW_PCSCF_SUBSCRIBE_01(vc_vxlte_monitor_components.mwPS, true); // Events 26, 27
+22 −6
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ module AtsImsIot_TP_behavior_CX
    import from AtsImsIot_Diameter_Templates all;
    import from AtsImsIot_TestSystem { type DiameterInterfaceMonitor, ImsTestCoordinator; }
    
    // LibIms
    import from LibIms_UpperTester all;

group g_HSS {
    

@@ -90,10 +93,12 @@ group g_HSS {
        in boolean p_forward_to_mtc := false
    ) runs on ImsTestCoordinator {
        if (isvalue(p_monitorCompRef)){
            var ImsUserInfo v_userInfoA := f_getSipUserId(PX_EUT_A);
            var charstring v_publicIdentity := "sip:"&v_userInfoA.publicId&"@"&v_userInfoA.domain;
            p_monitorCompRef.start (
                f_Iot_Diameter_receive(
                    {
                        DIAMETER_MSG:{mAR_MSG := mw_MAR}
                        DIAMETER_MSG:{mAR_MSG := mw_MAR(mw_publicIdentity(v_publicIdentity))}
                    },
                    {
                        DIAMETER_MSG:{mAR_MSG := mw_MAR_basic}
@@ -270,10 +275,12 @@ group g_HSS {
        in boolean p_forward_to_mtc := false
    ) runs on ImsTestCoordinator {
        if (isvalue(p_monitorCompRef)){
            var ImsUserInfo v_userInfoA := f_getSipUserId(PX_EUT_A);
            var charstring v_publicIdentity := "sip:"&v_userInfoA.publicId&"@"&v_userInfoA.domain;
            p_monitorCompRef.start (
                f_Iot_Diameter_receive(
                    {
                        DIAMETER_MSG:{sAR_MSG := mw_SAR_Registration/*mw_SAR_UnregisteredUser*/} //TODO_Check TP
                        DIAMETER_MSG:{sAR_MSG := mw_SAR_Registration(mw_publicIdentity(v_publicIdentity))}
                    },
                    {
                        DIAMETER_MSG:{sAR_MSG := mw_SAR_basic}
@@ -360,10 +367,12 @@ group g_HSS {
        in boolean p_forward_to_mtc := false
    ) runs on ImsTestCoordinator {
        if (isvalue(p_monitorCompRef)){
            var ImsUserInfo v_userInfoA := f_getSipUserId(PX_EUT_A);
            var charstring v_publicIdentity := "sip:"&v_userInfoA.publicId&"@"&v_userInfoA.domain;
            p_monitorCompRef.start (
                f_Iot_Diameter_receive(
                    {
                        DIAMETER_MSG:{sAR_MSG := mw_SAR_UserDeregistration}
                        DIAMETER_MSG:{sAR_MSG := mw_SAR_UserDeregistration(mw_publicIdentity(v_publicIdentity))}
                    },
                    {
                        DIAMETER_MSG:{sAR_MSG := mw_SAR_basic}
@@ -455,10 +464,13 @@ group g_HSS {
        in boolean p_forward_to_mtc := false
    ) runs on ImsTestCoordinator {
        if (isvalue(p_monitorCompRef)){
            var ImsUserInfo v_userInfoA := f_getSipUserId(PX_EUT_A);
            var charstring v_publicIdentity := "sip:"&v_userInfoA.publicId&"@"&v_userInfoA.domain;
            //"sip:"&v_userInfoA.publicId&@&v_userInfoA.domain
            p_monitorCompRef.start (
              f_Iot_Diameter_receive(
                  {
                      DIAMETER_MSG:{uAR_MSG := mw_UAR_Registration}
                      DIAMETER_MSG:{uAR_MSG := mw_UAR_Registration(mw_publicIdentity(v_publicIdentity))}
                  },
                  {
                      DIAMETER_MSG:{uAR_MSG := mw_UAR_basic}
@@ -533,10 +545,12 @@ group g_HSS {
        in boolean p_forward_to_mtc := false
    ) runs on ImsTestCoordinator {
        if (isvalue(p_monitorCompRef)){
            var ImsUserInfo v_userInfoA := f_getSipUserId(PX_EUT_A);
            var charstring v_publicIdentity := "sip:"&v_userInfoA.publicId&"@"&v_userInfoA.domain;
            p_monitorCompRef.start (
                f_Iot_Diameter_receive(
                {
                    DIAMETER_MSG:{uAR_MSG := mw_UAR}
                    DIAMETER_MSG:{uAR_MSG := mw_UAR(mw_publicIdentity(v_publicIdentity))}
                },
                {
                    DIAMETER_MSG:{uAR_MSG := mw_UAR_basic}},
@@ -685,10 +699,12 @@ group g_HSS {
        in boolean p_forward_to_mtc := false
    ) runs on ImsTestCoordinator {
        if (isvalue(p_monitorCompRef)){
            var ImsUserInfo v_userInfoA := f_getSipUserId(PX_EUT_A);
            var charstring v_publicIdentity := "sip:"&v_userInfoA.publicId&"@"&v_userInfoA.domain;
            p_monitorCompRef.start (
                f_Iot_Diameter_receive(
                    {
                        DIAMETER_MSG:{uAR_MSG := mw_UAR_deRegistration}
                        DIAMETER_MSG:{uAR_MSG := mw_UAR_deRegistration(mw_publicIdentity(v_publicIdentity))}
                    },
                    {
                        DIAMETER_MSG:{uAR_MSG := mw_UAR_basic}
Loading