Commit d438bbff authored by Yann Garcia's avatar Yann Garcia
Browse files

Resolve conflict

parents 60089b5c c936bfc2
Loading
Loading
Loading
Loading
+23 −9
Original line number Diff line number Diff line
@@ -78,20 +78,34 @@
        
          Test Configuration CF_VxLTE_INT
                containing 
                    Tester component EPC_PGW_A of type DiameterComp
                    Tester component EPC_PCRF_A of type DiameterComp
                    
                    SUT component IMS_A of type DiameterComp
                    SUT component EPC_PGW_A of type DiameterComp
                    SUT component EPC_PCRF_A of type DiameterComp
                    SUT component S_CSCF_A of type DiameterComp
                    SUT component I_CSCF_A of type DiameterComp
                    SUT component P_CSCF_A of type DiameterComp
                    SUT component HSS_A of type DiameterComp
                    SUT component EPC_MME_A of type DiameterComp
                    SUT component IMS_AS_A of type DiameterComp
                    connection between EPC_MME_A.g and HSS_A.g
                    connection between EPC_PGW_A.g and EPC_PCRF_A.g
                    connection between EPC_PCRF_A.g and P_CSCF_A.g
                    connection between HSS_A.g and S_CSCF_A.g
                    connection between HSS_A.g and I_CSCF_A.g
                    connection between IMS_AS_A.g and HSS_A.g
          ;
          
          Test Configuration CF_VxLTE_RMI
                containing 
                    Tester component EPC_PCRF_A of type DiameterComp
                    Tester component EPC_PCRF_B of type DiameterComp
                    
                    SUT component IMS_A of type DiameterComp
                    connection between EPC_PCRF_A.g and EPC_PCRF_A.g
                    SUT component EPC_PGW_B of type DiameterComp
                    SUT component EPC_PCRF_A of type DiameterComp
                    SUT component EPC_PCRF_B of type DiameterComp
                    SUT component P_CSCF_B of type DiameterComp
                    SUT component HSS_A of type DiameterComp
                    SUT component EPC_MME_B of type DiameterComp
                    connection between EPC_MME_B.g and HSS_A.g
                    connection between EPC_PGW_B.g and EPC_PCRF_B.g
                    connection between EPC_PCRF_A.g and EPC_PCRF_B.g
                    connection between EPC_PCRF_B.g and P_CSCF_B.g
          ;
          
    } // End of Configuration section
+32 −24
Original line number Diff line number Diff line
@@ -252,11 +252,12 @@ Package TP_RX {
                            Max_Requested_Bandwidth_DL_AVP
                            RR_Bandwidth_AVP
                            Codec_Data_AVP
                            "one or more" Media_Subcomponent_Description_AVP
                            "one or more" Media_Subcomponent_Description_AVP containing
                                Flow_Number_AVP
                                Flow_Description_AVP
                            ;
                        ;
                    ;
                    to the EPC_PCRF_A entity
                }
            }  
@@ -301,11 +302,12 @@ Package TP_RX {
                            RR_Bandwidth_AVP
                            RS_Bandwidth_AVP
                            Codec_Data_AVP
                            "one or more" Media_Subcomponent_Description_AVP
                            "one or more" Media_Subcomponent_Description_AVP containing
                                Flow_Number_AVP
                                Flow_Description_AVP
                            ;
                        ;
                    ;
                    to the EPC_PCRF_A entity
                }
            }  
@@ -350,11 +352,12 @@ Package TP_RX {
                            RR_Bandwidth_AVP
                            RS_Bandwidth_AVP
                            Codec_Data_AVP
                            "one or more" Media_Subcomponent_Description_AVP
                            "one or more" Media_Subcomponent_Description_AVP containing
                                Flow_Number_AVP
                                Flow_Description_AVP
                            ;
                        ;
                    ;
                    to the EPC_PCRF_A entity
                }
            }  
@@ -397,11 +400,12 @@ Package TP_RX {
                            Max_Requested_Bandwidth_UL_AVP
                            RS_Bandwidth_AVP
                            Codec_Data_AVP
                            "one or more" Media_Subcomponent_Description_AVP
                            "one or more" Media_Subcomponent_Description_AVP containing
                                Flow_Number_AVP
                                Flow_Description_AVP
                            ;
                        ;
                    ;
                    to the EPC_PCRF_A entity
                }
            }  
@@ -446,11 +450,12 @@ Package TP_RX {
                            RR_Bandwidth_AVP
                            RS_Bandwidth_AVP
                            Codec_Data_AVP
                            "one or more" Media_Subcomponent_Description_AVP
                            "one or more" Media_Subcomponent_Description_AVP containing
                                Flow_Number_AVP
                                Flow_Description_AVP
                            ;
                        ;
                    ;
                    to the EPC_PCRF_A entity
                }
            }  
@@ -495,11 +500,12 @@ Package TP_RX {
                            RR_Bandwidth_AVP
                            RS_Bandwidth_AVP
                            Codec_Data_AVP
                            "one or more" Media_Subcomponent_Description_AVP
                            "one or more" Media_Subcomponent_Description_AVP containing
                                Flow_Number_AVP
                                Flow_Description_AVP
                            ;
                        ;
                    ;
                    to the EPC_PCRF_A entity
                }
            }  
@@ -544,11 +550,12 @@ Package TP_RX {
                            RR_Bandwidth_AVP
                            RS_Bandwidth_AVP
                            Codec_Data_AVP
                            "one or more" Media_Subcomponent_Description_AVP
                            "one or more" Media_Subcomponent_Description_AVP containing
                                Flow_Number_AVP
                                Flow_Description_AVP
                            ;
                        ;
                    ;
                    to the EPC_PCRF_A entity
                }
            }  
@@ -593,11 +600,12 @@ Package TP_RX {
                            RR_Bandwidth_AVP
                            RS_Bandwidth_AVP
                            Codec_Data_AVP
                            "one or more" Media_Subcomponent_Description_AVP
                            "one or more" Media_Subcomponent_Description_AVP containing
                                Flow_Number_AVP
                                Flow_Description_AVP
                            ;
                        ;
                    ;
                    to the EPC_PCRF_A entity
                }
            }  
+0 −9
Original line number Diff line number Diff line
@@ -82,15 +82,6 @@ Package TP_S9 {
                                    indicating value 0,
                                Media_Sub_Component_AVP containing
                                    Flow_Description_AVP
                                        indicating value 
                                        "permit_in_ip from (UE_A-IP_address and UE_A_port_number) to (P-CSCF-IP_address and P-CSCF_port_number) or
                                         permit_in_udp from (UE_A-IP_address and UE_A_port_number) to (P-CSCF-IP_address and P-CSCF_port_number) or
                                         permit_in_tcp from (UE_A-IP_address and UE_A_port_number) to (P-CSCF-IP_address and P-CSCF_port_number)",
                                    Flow_Description_AVP
                                        indicating value 
                                        "permit_out_ip from (P-CSCF-IP_address P-CSCF_port_number) to UE_A-IP_address or
                                         permit_out_udp from (P-CSCF-IP_address P-CSCF_port_number) to UE_A-IP_address or
                                         permit_out_tcp from (P-CSCF-IP_address P-CSCF_port_number) to UE_A-IP_address",
                                    Flow_Usage_AVP
                                        indicating value AF_SIGNALING,
                                    Flow_Status_AVP
+59 −45
Original line number Diff line number Diff line
@@ -152,64 +152,78 @@ Package Sip_Common {
        Component Type EnumDBComponent with gate gEnum of type enumGT;
        
            Test Configuration CF_VxLTE_INT
                containing 
                    SUT component UE_A of type SipComponent
                    SUT component IMS_P_CSCF_A of type SipComponent
                    SUT component IMS_S_CSCF_A of type SipComponent
                    SUT component IMS_I_CSCF_A of type SipComponent
                    SUT component IMS_AS_A of type SipComponent
                    SUT component IMS_IBCF_A of type SipComponent
                    SUT component IMS_IBCF_B of type SipComponent
                    connection between UE_A.g and IMS_P_CSCF_A.g
                    connection between IMS_P_CSCF_A.g and IMS_S_CSCF_A.g
                    connection between IMS_S_CSCF_A.g and IMS_I_CSCF_A.g
                    connection between IMS_I_CSCF_A.g and IMS_IBCF_A.g
                    connection between IMS_IBCF_A.g and IMS_IBCF_B.g
                    connection between IMS_S_CSCF_A.g and IMS_AS_A.g
            ;
            
            Test Configuration CF_VxLTE_RMI
            
            Test Configuration CF_VxLTE_RMI_A
            ;
            
            Test Configuration CF_VxLTE_RMI_B
            ;
            
            Test Configuration CF_VxLTE_RMI_S8HR
            ;
            
            Test Configuration CFG_IC_01
                containing 
                    Tester component UE_A of type SipComponent
                    Tester component NW_UE_B of type SipComponent
                    
                    SUT component IMS_A of type SipComponent
                    connection between UE_A.g and IMS_A.g
                    connection between IMS_A.g and NW_UE_B.g 
                    SUT component UE_A of type SipComponent
                    SUT component IMS_P_CSCF_B of type SipComponent
                    SUT component IMS_S_CSCF_B of type SipComponent
                    SUT component IMS_AS_B of type SipComponent
                    SUT component IMS_IBCF_B of type SipComponent
                    SUT component IMS_IBCF_A of type SipComponent
                    connection between UE_A.g and IMS_P_CSCF_B.g
                    connection between IMS_P_CSCF_B.g and IMS_S_CSCF_B.g
                    connection between IMS_S_CSCF_B.g and IMS_I_CSCF_B.g
                    connection between IMS_I_CSCF_B.g and IMS_IBCF_B.g
                    connection between IMS_IBCF_B.g and IMS_IBCF_A.g
            ;
            
            Test Configuration CFG_IC_02
            Test Configuration CF_VxLTE_RMI_A
                containing 
                    Tester component UE_A of type SipComponent
                    Tester component UE_B of type SipComponent
                    Tester component NW_UE_B of type SipEnumComponent
                    Tester component Enum_DB of type EnumDBComponent
                    
                    SUT component IMS_A of type SipEnumComponent
                    connection between UE_A.g and IMS_A.gSip
                    connection between IMS_A.gEnum and Enum_DB.gEnum
                    connection between NW_UE_B.gEnum and Enum_DB.gEnum
                    connection between IMS_A.gSip and NW_UE_B.gSip
                    connection between NW_UE_B.gSip and UE_B.g 
                    SUT component UE_B of type SipComponent
                    SUT component IMS_P_CSCF_A of type SipComponent
                    SUT component IMS_S_CSCF_A of type SipComponent
                    SUT component IMS_IBCF_A of type SipComponent
                    SUT component IMS_IBCF_B of type SipComponent
                    connection between UE_B.g and IMS_P_CSCF_A.g
                    connection between IMS_P_CSCF_A.g and IMS_S_CSCF_A.g
                    connection between IMS_S_CSCF_A.g and IMS_IBCF_A.g
                    connection between IMS_IBCF_A.g and IMS_IBCF_B.g
            ;
            
            Test Configuration CFG_IC_03
            Test Configuration CF_VxLTE_RMI_B
                containing 
                    Tester component UE_A of type SipComponent
                    Tester component UE_B of type SipComponent
                    Tester component IMS_B of type SipComponent
                    
                    SUT component IMS_A of type SipComponent
                    connection between UE_A.g and IMS_A.g
                    connection between UE_B.g and IMS_A.g
                    connection between IMS_A.g and IMS_B.g 
                    SUT component UE_A of type SipComponent
                    SUT component IMS_P_CSCF_B of type SipComponent
                    SUT component IMS_S_CSCF_B of type SipComponent
                    SUT component IMS_AS_B of type SipComponent
                    SUT component IMS_IBCF_B of type SipComponent
                    SUT component IMS_IBCF_A of type SipComponent
                    connection between UE_A.g and IMS_P_CSCF_B.g
                    connection between IMS_P_CSCF_B.g and IMS_S_CSCF_B.g
                    connection between IMS_S_CSCF_B.g and IMS_I_CSCF_B.g
                    connection between IMS_I_CSCF_B.g and IMS_IBCF_B.g
                    connection between IMS_IBCF_B.g and IMS_IBCF_A.g
            ;
            
            Test Configuration CFG_xxx_02 
            Test Configuration CF_VxLTE_RMI_S8HR
                containing 
                    Tester component UE_A of type SipComponent
                    Tester component IMS_PCRF_A of type SipComponent
                    
                    SUT component IUT of type SipComponent
                    connection between UE_A.g and IMS_PCRF_A.g
                    connection between IMS_PCRF_A.g and IMS_xxx_A.g
                    SUT component UE_A of type SipComponent
                    SUT component IMS_P_CSCF_A of type SipComponent
                    SUT component IMS_S_CSCF_A of type SipComponent
                    SUT component IMS_I_CSCF_A of type SipComponent
                    SUT component IMS_IBCF_A of type SipComponent
                    SUT component IMS_IBCF_B of type SipComponent
                    connection between UE_A.g and IMS_P_CSCF_A.g
                    connection between IMS_P_CSCF_A.g and IMS_S_CSCF_A.g
                    connection between IMS_S_CSCF_A.g and IMS_I_CSCF_A.g
                    connection between IMS_I_CSCF_A.g and IMS_IBCF_A.g
                    connection between IMS_IBCF_A.g and IMS_IBCF_B.g
            ;
      } // End of Configuration section
    
+137 −9
Original line number Diff line number Diff line
@@ -72,11 +72,11 @@ module AtsImsIot_Diameter_Templates {
                aVP_Data := p_avpData
            };
            
            template Media_Component_Description_AVP mw_mediaComponentDescription :=
            template Media_Component_Description_AVP mw_mediaComponentDescription_SubComponentFlowStatusEnabled :=
            {
                aVP_Header := mw_aVP_Header_any_Code(c_media_Component_Description_AVP_Code),
                media_Component_Nr := {aVP_Header := ?, aVP_Data := ?},
                media_Sub_component := {mw_mediaSubComponent},
                media_Sub_component := {mw_mediaSubComponent_flowStatusEnabled_flowUsageAfSignalling_SignallingSip},
                af_Application_Id := *,
                media_type := *,
                max_Requested_Bw_Ul := *,
@@ -88,19 +88,96 @@ module AtsImsIot_Diameter_Templates {
                codec_data := *
            }
            
            template Media_Sub_Component_AVP mw_mediaSubComponent :=
            template Media_Component_Description_AVP mw_mediaComponentDescription_FlowStatusDisabled :=
            {
                aVP_Header := mw_aVP_Header_any_Code(c_media_Component_Description_AVP_Code),
                media_Component_Nr := {aVP_Header := ?, aVP_Data := ?},
                media_Sub_component := {mw_mediaSubComponent_FlowDescription},
                af_Application_Id := *,
                media_type := ?,
                max_Requested_Bw_Ul := *,
                max_Requested_Bw_Dl := ?,
                flow_Status := mw_flowStatus(DISABLED_E),
                reservation_Priority := *,
                rs_Bw := *,
                rr_Bw := ?,
                codec_data := ?
            }
            
            template Media_Component_Description_AVP mw_mediaComponentDescription_FlowStatusEnabledDownlink :=
            {
                aVP_Header := mw_aVP_Header_any_Code(c_media_Component_Description_AVP_Code),
                media_Component_Nr := {aVP_Header := ?, aVP_Data := ?},
                media_Sub_component := {mw_mediaSubComponent_FlowDescription},
                af_Application_Id := *,
                media_type := ?,
                max_Requested_Bw_Ul := ?,
                max_Requested_Bw_Dl := ?,
                flow_Status := mw_flowStatus(ENABLED_DOWNLINK_E),
                reservation_Priority := *,
                rs_Bw := ?,
                rr_Bw := ?,
                codec_data := ?
            }
            
            template Media_Component_Description_AVP mw_mediaComponentDescription_FlowStatusEnabledUplink :=
            {
                aVP_Header := mw_aVP_Header_any_Code(c_media_Component_Description_AVP_Code),
                media_Component_Nr := {aVP_Header := ?, aVP_Data := ?},
                media_Sub_component := {mw_mediaSubComponent_FlowDescription},
                af_Application_Id := *,
                media_type := ?,
                max_Requested_Bw_Ul := ?,
                max_Requested_Bw_Dl := ?,
                flow_Status := mw_flowStatus(ENABLED_UPLINK_E),
                reservation_Priority := *,
                rs_Bw := ?,
                rr_Bw := ?,
                codec_data := ?
            }
            
            template Media_Component_Description_AVP mw_mediaComponentDescription_FlowStatusEnabled :=
            {
                aVP_Header := mw_aVP_Header_any_Code(c_media_Component_Description_AVP_Code),
                media_Component_Nr := {aVP_Header := ?, aVP_Data := ?},
                media_Sub_component := {mw_mediaSubComponent_FlowDescription},
                af_Application_Id := *,
                media_type := ?,
                max_Requested_Bw_Ul := ?,
                max_Requested_Bw_Dl := ?,
                flow_Status := mw_flowStatus(ENABLED_E),
                reservation_Priority := *,
                rs_Bw := ?,
                rr_Bw := ?,
                codec_data := ?
            }
            
            template Media_Sub_Component_AVP mw_mediaSubComponent_any :=
            {
                aVP_Header             := mw_aVP_Header_any_Code(c_media_Sub_Component_AVP_Code),
                flow_Number            := ?,
                flow_Description       := ?,
                flow_Status            := mw_flowStatus(ENABLED_E),
                flow_Usage             := mw_flowUsage(AF_SIGNALLING_E),
                flow_Description       := *,
                flow_Status            := *,
                flow_Usage             := *,
                max_Requested_Bw_Ul    := *,
                max_Requested_Bw_Dl    := *,
                af_Signalling_Protocol := mw_afSignallingProtocolSIP,
                af_Signalling_Protocol := *,
                aVP_Type               := *
            }
            
            template Media_Sub_Component_AVP mw_mediaSubComponent_FlowDescription modifies mw_mediaSubComponent_any :=
            {
                flow_Description       := ?
            }
            
            template Media_Sub_Component_AVP mw_mediaSubComponent_flowStatusEnabled_flowUsageAfSignalling_SignallingSip modifies mw_mediaSubComponent_any :=
            {
                flow_Description       := ?,
                flow_Status            := mw_flowStatus(ENABLED_E),
                flow_Usage             := mw_flowUsage(AF_SIGNALLING_E),
                af_Signalling_Protocol := mw_afSignallingProtocolSIP
            }

            template AF_Signalling_Protocol_AVP mw_afSignallingProtocolSIP := {
                 aVP_Header := mw_aVP_Header_any_Code(c_aF_Signalling_Protocol_AVP_Code),
                 aVP_Data := SIP_E
@@ -117,6 +194,12 @@ module AtsImsIot_Diameter_Templates {
                aVP_Header := mw_aVP_Header_any_Code(c_flow_Usage_AVP_Code),
                aVP_Data   := p_avpData
            }

            template Specific_Action_AVP mw_specificAction (template (present) Specific_Action_Type p_avpData) :={
                aVP_Header := mw_aVP_Header_any_Code(c_specific_Action_AVP_Code),//<AVP header: 513 ....>
                aVP_Data   := p_avpData
            }
            
        } //end group RxHeaderFields
        group GxHeaderFields{

@@ -561,6 +644,51 @@ module AtsImsIot_Diameter_Templates {
        group RxMessageTemplates{
            group RxRequestMessageTemplates{

                template AAR_MSG mw_AAR_MediaComponent_specificActionLossOfBearer modifies mw_AAR_dummy := {
                    aAR_Body :={
                        media_Component_Description := {mw_mediaComponentDescription_SubComponentFlowStatusEnabled},
                        specific_Action := {mw_specificAction(INDICATION_OF_LOSS_OF_BEARER_E)},
                        framed_IP_Address := ?
                        //framed_IPv6_Address := *,
                    }
                }

                template AAR_MSG mw_AAR_MediaComponent_mediaComponentDescription_FlowStatusDisabled modifies mw_AAR_dummy := {
                    aAR_Body :={
                        media_Component_Description := {mw_mediaComponentDescription_FlowStatusDisabled},
                        specific_Action := *,
                        framed_IP_Address := ?
                        //framed_IPv6_Address := *,
                    }
                }

                template AAR_MSG mw_AAR_MediaComponent_mediaComponentDescription_FlowStatusEnabledDownlink modifies mw_AAR_dummy := {
                    aAR_Body :={
                        media_Component_Description := {mw_mediaComponentDescription_FlowStatusEnabledDownlink},
                        specific_Action := *,
                        framed_IP_Address := ?
                        //framed_IPv6_Address := *,
                    }
                }

                template AAR_MSG mw_AAR_MediaComponent_mediaComponentDescription_FlowStatusEnabledUplink modifies mw_AAR_dummy := {
                    aAR_Body :={
                        media_Component_Description := {mw_mediaComponentDescription_FlowStatusEnabledUplink},
                        specific_Action := *,
                        framed_IP_Address := ?
                        //framed_IPv6_Address := *,
                    }
                }

                template AAR_MSG mw_AAR_MediaComponent_mediaComponentDescription_FlowStatusEnabled modifies mw_AAR_dummy := {
                    aAR_Body :={
                        media_Component_Description := {mw_mediaComponentDescription_FlowStatusEnabled},
                        specific_Action := *,
                        framed_IP_Address := ?
                        //framed_IPv6_Address := *,
                    }
                }

                template ASR_MSG mw_ASR_abortCause(template (present) Abort_Cause_Type p_avpData) modifies mw_ASR_dummy := {
                    aSR_Body :={
                        abort_cause := mw_abortCause(p_avpData)
@@ -575,7 +703,7 @@ module AtsImsIot_Diameter_Templates {
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess),
                        acceptable_service_info := {
                            media_component_description := 
                                {mw_mediaComponentDescription
                                {mw_mediaComponentDescription_SubComponentFlowStatusEnabled
                                }
                        },
                        ip_Can_Type := ?,
@@ -595,7 +723,7 @@ module AtsImsIot_Diameter_Templates {
                        result_Code := mw_resultCode(mw_resultCode_diameterSuccess),
                        acceptable_service_info := {
                            media_component_description := 
                                {mw_mediaComponentDescription
                                {mw_mediaComponentDescription_SubComponentFlowStatusEnabled
                                }
                        }
                        
Loading