Commit 9d0f5451 authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

Updates due to validation on templates and all interfaces

parent 11036e0e
Loading
Loading
Loading
Loading
+1.04 KiB (21.3 KiB)

File changed.

No diff preview for this file type.

+167 −22
Original line number Diff line number Diff line
@@ -232,10 +232,10 @@ module AtsImsIot_Diameter_Templates {
                max_Requested_Bandwidth_DL    := *,
                guaranteed_Bitrate_UL         := *,
                guaranteed_Bitrate_DL         := *,
                bearer_Identifier             := ?,
                bearer_Identifier             := *,
                allocation_Retention_Priority := *,
                aPN_Aggregate_Max_Bitrate_UL  := ?,
                aPN_Aggregate_Max_Bitrate_DL  := ?,
                aPN_Aggregate_Max_Bitrate_UL  := *,
                aPN_Aggregate_Max_Bitrate_DL  := *,
                aVP_Type                      := *
            }
            
@@ -959,56 +959,85 @@ module AtsImsIot_Diameter_Templates {
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess)
                    }
                }
                
                template STA_MSG mw_STA_diamSuccess modifies mw_STA_basic := {
                    sTA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess)
                    }
                }
            }// end group RxRequestMessageTemplates
        }//end group RxMessageTemplates
        
        group GxMessageTemplates{
            group GxRequestBasicTemplates{

                template CCR_MSG mw_CCR_basic modifies mw_CCR_dummy := {
                    header := mw_diameterHeaderReq_dummy(CCR_E, c_applIdGx)
                }

                template RAR_MSG mw_RAR_Gx_basic modifies mw_RAR_dummy := {
                    header := mw_diameterHeaderReq_dummy(RAR_E, c_applIdGx)
                }
                
            }
            group GxRequestMessageTemplates{

                template CCR_MSG mw_CCR_RequestType(CC_Request_Ty_Type p_avpData) modifies mw_CCR_dummy := {
                template CCR_MSG mw_CCR_RequestType(CC_Request_Ty_Type p_avpData) modifies mw_CCR_basic := {
                    cCR_Body :={
                        cC_Request_Type := mw_cC_Request_Type(p_avpData)
                    }
                }
                
                template CCR_MSG mw_CCR_SubscriberIMSI_qosInformation_class5(CC_Request_Ty_Type p_avpData) modifies mw_CCR_dummy := {
                template CCR_MSG mw_CCR_SubscriberIMSI_qosInformation_class5(CC_Request_Ty_Type p_avpData) modifies mw_CCR_basic := {
                    cCR_Body :={
                        cC_Request_Type        := mw_cC_Request_Type(p_avpData),
                        subscription_Id        := {mw_subscription_Id(mw_subscription_Id_Type(END_USER_IMSI_E))},
                        iP_CAN_Type            := ?,
                        rat_Type               := ?,
                        called_Station_Id      := ?,
                        pDN_Connection_ID      := ?,
                        pDN_Connection_ID      := *,
                        framed_IP_Address      := ?,
                        //framed_IPv6_Prefix     := *,
                        bearer_Usage           := mw_bearer_Usage(IMS_SIGNALLING_E),
                        //bearer_Usage           := mw_bearer_Usage(IMS_SIGNALLING_E),
                        qoS_Information        := mw_qoS_Information,
                        default_EPS_Bearer_QoS := mw_default_EPS_Bearer_QoS_Class_5
                    }
                }

                template RAR_MSG mw_RAR_ChargingRuleInstall(template Charging_Rule_Install_AVP p_Charging_Rule_Install) modifies mw_RAR_dummy := {
                template RAR_MSG mw_RAR_ChargingRuleInstall(template Charging_Rule_Install_AVP p_Charging_Rule_Install) modifies mw_RAR_Gx_basic := {
                    rAR_Body :={
                        charging_Rule_Install := {p_Charging_Rule_Install}
                    }
                }

                template RAR_MSG mw_RAR_ChargingRuleRemove modifies mw_RAR_dummy := {
                template RAR_MSG mw_RAR_ChargingRuleRemove modifies mw_RAR_Gx_basic := {
                    rAR_Body :={
                        charging_Rule_Remove := {mw_chrgRuleRemove_Name}
                    }
                }
            
            }// end group GxRequestMessageTemplates
            
            group GxAnswerBasicTemplates{
                
                template CCA_MSG mw_CCA_basic modifies mw_CCA_dummy := {
                    header := mw_diameterHeaderAns_dummy(CCA_E, c_applIdGx)
                }
                
                template RAA_MSG mw_RAA_Gx_basic modifies mw_RAA_dummy := {
                    header := mw_diameterHeaderAns_dummy(RAA_E, c_applIdGx)
                }
            }
            
            group GxAnswertMessageTemplates{
                
                template CCA_MSG mw_CCA_resultCode modifies mw_CCA_dummy := {
                template CCA_MSG mw_CCA_resultCode modifies mw_CCA_basic := {
                    cCA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess)
                    }
                }
                
                template CCA_MSG mw_CCA_qosInformation_class5 modifies mw_CCA_dummy := {
                template CCA_MSG mw_CCA_qosInformation_class5 modifies mw_CCA_basic := {
                    cCA_Body :={
                        result_Code            := mw_resultCode(mw_resultCode_diameterSuccess),
                        qoS_Information        := {mw_qoS_Information},
@@ -1016,7 +1045,7 @@ module AtsImsIot_Diameter_Templates {
                    }
                }
                
                template RAA_MSG mw_RAA_resultCode modifies mw_RAA_dummy := {
                template RAA_MSG mw_RAA_resultCode modifies mw_RAA_Gx_basic := {
                    rAA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess)
                    }
@@ -1025,6 +1054,25 @@ module AtsImsIot_Diameter_Templates {
        }//end group GxMessageTemplates
        
        group S6aMessageTemplates{
            group S6aRequestBasicTemplates{

                template AIR_MSG mw_AIR_basic modifies mw_AIR_dummy := {
                    header := mw_diameterHeaderReq_dummy(AIR_E, c_applIdS6a)
                }

                template CLR_MSG mw_CLR_basic modifies mw_CLR_dummy := {
                    header := mw_diameterHeaderReq_dummy(CLR_E, c_applIdS6a)
                }

                template PUER_MSG mw_PUER_basic modifies mw_PUER_dummy := {
                    header := mw_diameterHeaderReq_dummy(PUER_E, c_applIdS6a)
                }

                template ULR_MSG mw_ULR_basic modifies mw_ULR_dummy := {
                    header := mw_diameterHeaderReq_dummy(ULR_E, c_applIdS6a)
                }
                
            }
            group S6aRequestMessageTemplates{

                template AIR_MSG mw_AIR modifies mw_AIR_dummy := {
@@ -1061,34 +1109,53 @@ module AtsImsIot_Diameter_Templates {

            
            }// end group S6aRequestMessageTemplates
            group S6aAnswerBasicTemplates{

                template AIA_MSG mw_AIA_basic modifies mw_AIA_dummy := {
                    header := mw_diameterHeaderAns_dummy(AIA_E, c_applIdS6a)
                }

                template CLA_MSG mw_CLA_basic modifies mw_CLA_dummy := {
                    header := mw_diameterHeaderAns_dummy(CLA_E, c_applIdS6a)
                }

                template PUEA_MSG mw_PUEA_basic modifies mw_PUEA_dummy := {
                    header := mw_diameterHeaderAns_dummy(PUEA_E, c_applIdS6a)
                }

                template ULA_MSG mw_ULA_basic modifies mw_ULA_dummy := {
                    header := mw_diameterHeaderAns_dummy(ULA_E, c_applIdS6a)
                }
                
            }
            group S6aAnswertMessageTemplates{
                
                template AIA_MSG mw_AIA_resultCode modifies mw_AIA_dummy := {
                template AIA_MSG mw_AIA_resultCode modifies mw_AIA_basic := {
                    aIA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess),
                        authentication_Info := ?
                    }
                }

                template CLA_MSG mw_CLA_resultCode modifies mw_CLA_dummy := {
                template CLA_MSG mw_CLA_resultCode modifies mw_CLA_basic := {
                    cLA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess)
                    }
                }

                template PUEA_MSG mw_PUEA_resultCode modifies mw_PUEA_dummy := {
                template PUEA_MSG mw_PUEA_resultCode modifies mw_PUEA_basic := {
                    pUEA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess)
                    }
                }

                template ULA_MSG mw_ULA_resultCode modifies mw_ULA_dummy := {
                template ULA_MSG mw_ULA_resultCode modifies mw_ULA_basic := {
                    uLA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess)
                    }
                }

                template ULA_MSG mw_ULA_resultCode_flags modifies mw_ULA_dummy := {
                template ULA_MSG mw_ULA_resultCode_flags modifies mw_ULA_basic := {
                    uLA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess),
                        ula_Flags := ?
@@ -1124,9 +1191,35 @@ module AtsImsIot_Diameter_Templates {
            }// end group ShRequestMessageTemplates
        }//end group ShMessageTemplates
        group S9MessageTemplates{
            
            group S9RequestBasicTemplates{
                
                template AAR_MSG mw_AAR_S9_basic modifies mw_AAR_dummy := {
                    header := mw_diameterHeaderReq_dummy(AAR_E, c_applIdRx/*TODO c_applIdS9*/)
                }
                
                template ASR_MSG mw_ASR_S9_basic modifies mw_ASR_dummy := {
                    header := mw_diameterHeaderReq_dummy(ASR_E, c_applIdRx/*TODO c_applIdS9*/)
                }

                template CCR_MSG mw_CCR_S9_basic modifies mw_CCR_dummy := {
                    header := mw_diameterHeaderReq_dummy(CCR_E, c_applIdGx/*TODO c_applIdS9*/)
                }

                template STR_MSG mw_STR_S9_basic modifies mw_STR_dummy := {
                    header := mw_diameterHeaderReq_dummy(STR_E, c_applIdGx/*TODO c_applIdS9*/)
                }
                
            }
            group S9RequestMessageTemplates{

                template CCR_MSG mw_CCR_S9_Establishment(CC_Request_Ty_Type p_avpData) modifies mw_CCR_dummy := {
                template ASR_MSG mw_ASR_S9_abortCause(template (present) Abort_Cause_Type p_avpData) modifies mw_ASR_S9_basic := {
                    aSR_Body :={
                        abort_cause := mw_abortCause(p_avpData)
                    }
                }
                
                template CCR_MSG mw_CCR_S9_Establishment(CC_Request_Ty_Type p_avpData) modifies mw_CCR_S9_basic := {
                    cCR_Body :={
                        cC_Request_Type        := mw_cC_Request_Type(p_avpData),
                        subscription_Id        := {mw_subscription_Id(mw_subscription_Id_Type(END_USER_IMSI_E))},
@@ -1143,7 +1236,7 @@ module AtsImsIot_Diameter_Templates {
                    }
                }
                
                template CCR_MSG mw_CCR_S9_Termination(CC_Request_Ty_Type p_avpData) modifies mw_CCR_dummy := {
                template CCR_MSG mw_CCR_S9_Termination(CC_Request_Ty_Type p_avpData) modifies mw_CCR_S9_basic := {
                    cCR_Body :={
                        cC_Request_Type        := mw_cC_Request_Type(p_avpData),
                        subsesion_Enforcement_Info := ? //AXR {mw_subses_Enforcement_Info(mw_subsession_Operation_AVP (TERMINATION_E))}
@@ -1151,23 +1244,75 @@ module AtsImsIot_Diameter_Templates {
                }
            
            }// end group S9RequestMessageTemplates
            
            group S9AnswerBasicTemplates{
                
                template AAA_MSG mw_AAA_S9_basic modifies mw_AAA_dummy := {
                    header := mw_diameterHeaderAns_dummy(AAA_E, c_applIdRx/*TODO c_applIdS9*/)
                }
                
                template ASA_MSG mw_ASA_S9_basic modifies mw_ASA_dummy := {
                    header := mw_diameterHeaderAns_dummy(ASA_E, c_applIdRx/*TODO c_applIdS9*/)
                }
                
                template CCA_MSG mw_CCA_S9_basic modifies mw_CCA_dummy := {
                    header := mw_diameterHeaderAns_dummy(CCA_E, c_applIdGx/*TODO c_applIdS9*/)
                }
                
                template STA_MSG mw_STA_S9_basic modifies mw_STA_dummy := {
                    header := mw_diameterHeaderAns_dummy(STA_E, c_applIdGx/*TODO c_applIdS9*/)
                }
            }
            
            group S9AnswertMessageTemplates{
                
                template CCA_MSG mw_CCA_subsessionDecisionAny modifies mw_CCA_dummy := {
                template AAA_MSG mw_AAA_S9_resultCode modifies mw_AAA_S9_basic := {
                    aAA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess)
                    }
                }
                
                template AAA_MSG mw_AAA_S9_AcceptableService modifies mw_AAA_S9_basic := {
                    aAA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess),
                        acceptable_service_info := {
                            media_component_description := 
                                {mw_mediaComponentDescription_SubComponentFlowStatusEnabled
                                }
                        },
                        ip_Can_Type := ?,
                        rat_Type := ?
                        
                    }
                }
                
                template AAA_MSG mw_AAA_S9_resultCode_mediaCopmonentDescription modifies mw_AAA_S9_basic := {
                    aAA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess),
                        acceptable_service_info := {
                            media_component_description := 
                                {mw_mediaComponentDescription_SubComponentFlowStatusEnabled
                                }
                        }
                        
                    }
                }
                
                template CCA_MSG mw_CCA_S9_subsessionDecisionAny modifies mw_CCA_S9_basic := {
                    cCA_Body :={
                        result_Code              := mw_resultCode(mw_resultCode_diameterSuccess),
                        subsession_Decision_Info := {mw_subses_Decision_Info_any}
                    }
                }
                
                template CCA_MSG mw_CCA_subsessionDecision_qosInfoAndDefaultEpsBearer modifies mw_CCA_dummy := {
                template CCA_MSG mw_CCA_S9_subsessionDecision_qosInfoAndDefaultEpsBearer modifies mw_CCA_S9_basic := {
                    cCA_Body :={
                        result_Code              := mw_resultCode(mw_resultCode_diameterSuccess),
                        subsession_Decision_Info := {mw_subses_Decision_Info_qosInfoAndDefaultEpsBearer}
                    }
                }
                
                template STA_MSG mw_STA_diamSuccess modifies mw_STA_dummy := {
                template STA_MSG mw_STA_S9_diamSuccess modifies mw_STA_S9_basic := {
                    sTA_Body :={
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess)
                    }
+4 −3
Original line number Diff line number Diff line
@@ -68,9 +68,10 @@ module AtsImsIot_TD_ATT{
                    // test body
                    // Check that user A can register to IMS A
                    //f_mtc_userRegistration ( v_ueA, v_userInfoA ); // Send REGISTER request message
                    f_mtc_check_TP_S6A_MME_ULR_01 ( vc_vxlte_monitor_components.s6a, false ); // Check (ULR – Event 2)
                    f_mtc_check_TP_S6A_HSS_ULA_01 ( vc_vxlte_monitor_components.s6a, false ); // Check (ULA – Event 3) 
                    f_mtc_check_TP_GX_PCRF_CCA_01 ( vc_vxlte_monitor_components.gx, false ); // Check (CCR, CCA – Events 4, 5)
                    
                    //f_mtc_check_TP_S6A_MME_ULR_01 ( vc_vxlte_monitor_components.s6a, true ); // Check (ULR – Event 2)
                    f_mtc_check_TP_S6A_HSS_ULA_01 ( vc_vxlte_monitor_components.s6a);        // Check (ULA – Event 3) 
                    f_mtc_check_TP_GX_PCRF_CCA_01 ( vc_vxlte_monitor_components.gx); // Check (CCR, CCA – Events 4, 5)
                    //f_mtc_userCheckRegistration ( v_ueA, f_getAnyValidUser ( PX_EUT_A ) ); 
        
                    // postamble
+4 −5
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ 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); // Event 2
                    //f_mtc_check_TP_GM_PCSCF_NOTIFY_01(vc_vxlte_monitor_components.gmA); // Events 3
                    f_mtc_check_TP_MW_PCSCF_NOTIFY_01(vc_vxlte_monitor_components.mwPS); // Event 2, 5
                    f_mtc_check_TP_GM_PCSCF_NOTIFY_01(vc_vxlte_monitor_components.gmA); // Events 3, 4
                    //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,-); // Event 5
                    //f_mtc_check_TP_MW_PCSCF_NOTIFY_02(vc_vxlte_monitor_components.mwPS, false, true); // Event 6, 7
@@ -190,7 +190,7 @@ module AtsImsIot_TD_DRG{
                    // test body
                    f_mtc_check_TP_RX_PCRF_STA_02(vc_vxlte_monitor_components.rx); // Event 1, 14
                    
                    //f_mtc_check_TP_MW_PCSCF_REGISTER_09(vc_vxlte_monitor_components.mwPS, false, true); // Event 2
                    f_mtc_check_TP_MW_PCSCF_REGISTER_09(vc_vxlte_monitor_components.mwPS); // Event 2
                    
                    f_mtc_check_TP_CX_HSS_UAA_04(f_getCxInterface(PX_DIAMETER_CX_SINGLE_INTERFACE));// Event 3, 4
                    
@@ -200,8 +200,7 @@ module AtsImsIot_TD_DRG{
                    
                    //f_mtc_check_TP_MW_SCSCF_REGISTER_07(vc_vxlte_monitor_components.mwSI, false, true); // Event 8
                    
                    //f_mtc_check_TP_MW_PCSCF_NOTIFY_01(vc_vxlte_monitor_components.mwPS, false); // Events 11
                    //f_mtc_check_TP_MW_PCSCF_200OK_01(vc_vxlte_monitor_components.mwPS, false, true); // Event 12
                    f_mtc_check_TP_MW_PCSCF_NOTIFY_01(vc_vxlte_monitor_components.mwPS); // Events 11, 12
                    //f_mtc_check_TP_MW_SCSCF_NOTIFY_01(vc_vxlte_monitor_components.mwIB, false, true); // Event 10, 13
                    
                    f_mtc_check_TP_GX_PGW_RAA_04(vc_vxlte_monitor_components.gx); // Event 15, 16
+138 −116

File changed.

Preview size limit exceeded, changes collapsed.

Loading