Commit 545d2f03 authored by garciay's avatar garciay
Browse files

Moved S6a messages into LibDiameter_Types_S6a_AVPs module

Add S6a messages AVPs into DIAMETER_MSG
parent cc03ddac
Loading
Loading
Loading
Loading
+48 −6
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ module LibDiameter_TypesAndValues {
    import from LibDiameter_Types_Base_AVPs all;
    import from LibDiameter_Types_Gx_AVPs all;
    import from LibDiameter_Types_Rx_AVPs all;
    import from LibDiameter_Types_S6a_AVPs {
        group S6a 
    };
    import from LibDiameter_Types_S9_AVPs all;


@@ -525,7 +528,30 @@ group BasicTypesAndConstants{

                    /* Codes on Gx interface - RFC4006 and TS 129 212  */
                    CCR_E,  // CCR Credit-Control-Request       CCR    (272)
                    CCA_E   // CCA Credit-Control-Request       CCA    (272)
                    CCA_E,   // CCA Credit-Control-Request       CCA    (272)
	                ULx_E( 316 ) //     Update-Location-Request (ULR) Command - Ref: TS 129 272 7.2.3
	                              ,
	                //     Update-Location-Answer (ULA) Command - Ref: TS 129 272 7.2.4
	                CLx_E( 317 ) //     Cancel-Location-Request (CLR) Command - Ref: TS 129 272 7.2.7
	                              ,
	                //     Cancel-Location-Answer (CLA) Command - Ref: TS 129 272 7.2.8
	                AIx_E( 318 ) //     Authentication-Information-Request (AIR) Command - Ref: TS 129 272 7.2.5
	                              ,
	                //     Authentication-Information-Answer (AIA) Command - Ref: TS 129 272 7.2.6
	                IDx_E( 319 ) //     Insert-Subscriber-Data-Request (IDR) Command - Ref: TS 129 272 7.2.9
	                              ,
	                //     Insert-Subscriber-Data-Answer (IDA) Command - Ref: TS 129 272 7.2.10
	                DSx_E( 320 ) //     Delete-Subscriber-Data-Request (DSR) Command - Ref: TS 129 272 7.2.11
	                              ,
	                //     Delete-Subscriber-Data-Answer (DSA) Command - Ref: TS 129 272 7.2.12
	                PUx_E( 321 ) //     Purge-UE-Request (PUR) Command - Ref: TS 129 272 7.2.13
	                              ,
	                //     Purge-UE-Answer (PUA) Command - Ref: TS 129 272 7.2.14
	                RSx_E( 322 ) //     Reset-Request (RSR) Command - Ref: TS 129 272 7.2.15
	                              ,
	                //     Reset-Answer (RSA) Command - Ref: TS 129 272 7.2.16
	                NOx_E( 323 ) //     Notify-Request (NOR) Command - Ref: TS 129 272 7.2.17
	                             //     Notify-Answer (NOA) Command - Ref: TS 129 272 7.2.18
                }
                with {
                    variant "length=24;use=com.testingtech.ttcn.tci.codec.CodecHelper;encode=CodecHelper.encodeCommandCode();decode=CodecHelper.decodeCommandCode()"
@@ -576,6 +602,22 @@ group BasicTypesAndConstants{
                    //Rx interface
                    AAR_MSG    aAR_MSG,
                    AAA_MSG    aAA_MSG,
                    // S6a interface
                    ULR_MSG    uLR_MSG,
                    ULA_MSG    uLA_MSG,
                    AIR_MSG    aIR_MSG,
                    AIA_MSG    aIA_MSG,
                    CLR_MSG    cLR_MSG,
                    CLA_MSG    cLA_MSG,
                    IDR_MSG    iDR_MSG,
                    IDA_MSG    iDA_MSG,
                    DSR_MSG    dSR_MSG,
                    DSA_MSG    dSA_MSG,
                    RSR_MSG    rSR_MSG,
                    RSA_MSG    rSA_MSG,
                    NOR_MSG    nOR_MSG,
                    NOA_MSG    nOA_MSG,
                    
                    UNKNOWN_MSG    uNKNOWN_MSG
                }

+397 −5
Original line number Diff line number Diff line
@@ -13,13 +13,14 @@ module LibDiameter_Types_S6a_AVPs {
        type all 
    };
    import from LibDiameter_TypesAndValues {
        type Command_Flags, PUR_Body_AVP, PUA_Body_AVP 
        type 
            DiameterHeader, 
            Command_Flags, PUR_Body_AVP, PUA_Body_AVP 
    };
    import from LibDiameter_Types_Gx_AVPs {
        type RAT_Type_AVP
    };


    group AVPs {
        
        group TS129_272_AVPs {
@@ -1229,4 +1230,395 @@ module LibDiameter_Types_S6a_AVPs {
        
    } // End of group AVPs
    
    group MessageTypes {
        
        group S6a {
            //     Update-Location-Request (ULR) Command - Ref: TS 129 272 7.2.3
            type record ULR_MSG {
                DiameterHeader header,
                //     <ULR>  ::= < Diameter Header: 316, REQ, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                ULR_Body_AVP uLR_Body
            }
            type set ULR_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                Destination_Host_AVP destination_Host optional,
                Destination_Realm_AVP destination_Realm,
                User_Name_AVP user_Name,
                set of Supported_Features_AVP supported_Features optional,
                Terminal_Information_AVP terminal_Information optional,
                RAT_Type_AVP rat_Type,
                ULR_Flags_AVP ulr_Flags,
                UE_SRVCC_Capability_AVP ue_SRVCC_Capability optional,
                Visited_PLMN_Id_AVP visited_PLMN_Id,
                SGSN_Number_AVP sgsn_Number optional,
                Homogeneous_Support_AVP homogeneous_Support optional,
                GMLC_Address_AVP gmlc_Address optional,
                Active_APN_AVP active_APN optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

            //     Update-Location-Answer (ULA) Command - Ref: TS 129 272 7.2.4
            type record ULA_MSG {
                DiameterHeader header,
                //     <ULA> ::=    < Diameter Header: 316, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                ULA_Body_AVP uLA_Body
            }
            type set ULA_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                Result_Code_AVP result_Code optional,
                Experimental_Result_AVP experimental_Result optional,
                Error_Diagnostic_AVP error_Diagnostic optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                set of Supported_Features_AVP supported_Features optional,
                ULA_Flags_AVP ula_Flags optional,
                Subscription_Data_AVP subscription_Data optional,
                set of Failed_AVP failed_AVP optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

            //     Authentication-Information-Request (AIR) Command - Ref: TS 129 272 7.2.5
            type record AIR_MSG {
                DiameterHeader header,
                //     <AIR> ::=    < Diameter Header: 318, REQ, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                AIR_Body_AVP aIR_Body
            }
            type set AIR_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                Destination_Host_AVP destination_Host optional,
                Destination_Realm_AVP destination_Realm,
                User_Name_AVP user_Name,
                set of Supported_Features_AVP supported_Features optional,
                Req_EUTRAN_Auth_Info_AVP req_EUTRAN_Auth_Info optional,
                Req_UTRAN_GERAN_Auth_Info_AVP req_UTRAN_GERAN_Auth_Info optional,
                Visited_PLMN_Id_AVP visited_PLMN_Id,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

            //     Authentication-Information-Answer (AIA) Command - Ref: TS 129 272 7.2.6
            type record AIA_MSG {
                DiameterHeader header,
                //     <AIA> ::=    < Diameter Header: 318, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                AIA_Body_AVP aIA_Body
            }
            type set AIA_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                Result_Code_AVP result_Code optional,
                Experimental_Result_AVP experimental_Result optional,
                Error_Diagnostic_AVP error_Diagnostic optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                set of Supported_Features_AVP supported_Features optional,
                Authentication_Info_AVP authentication_Info optional,
                set of Failed_AVP failed_AVP optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

            //     Cancel-Location-Request (CLR) Command - Ref: TS 129 272 7.2.7
            type record CLR_MSG {
                DiameterHeader header,
                //     <CLR>  ::= < Diameter Header: 317, REQ, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                CLR_Body_AVP cLR_Body
            }
            type set CLR_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                Destination_Host_AVP destination_Host,
                Destination_Realm_AVP destination_Realm,
                User_Name_AVP user_Name,
                set of Supported_Features_AVP supported_Features optional,
                Cancellation_Type_AVP cancellation_Type,
                CLR_Flags_AVP cLR_Flags optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

            //     Cancel-Location-Answer (CLA) Command - Ref: TS 129 272 7.2.8
            type record CLA_MSG {
                DiameterHeader header,
                //     <CLA> ::=    < Diameter Header: 317, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                CLA_Body_AVP cLA_Body
            }
            type set CLA_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                set of Supported_Features_AVP supported_Features optional,
                Result_Code_AVP result_Code optional,
                Experimental_Result_AVP experimental_Result optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                set of Failed_AVP failed_AVP optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

            //     Insert-Subscriber-Data-Request (IDR) Command - Ref: TS 129 272 7.2.9
            type record IDR_MSG {
                DiameterHeader header,
                //     <IDR>  ::= < Diameter Header: 319, REQ, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                IDR_Body_AVP iDR_Body
            }
            type set IDR_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                Destination_Host_AVP destination_Host,
                Destination_Realm_AVP destination_Realm,
                User_Name_AVP user_Name,
                set of Supported_Features_AVP supported_Features optional,
                Subscription_Data_AVP subscription_Data,
                IDR_Flags_AVP iDR_Flags optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

            //     Insert-Subscriber-Data-Answer (IDA) Command - Ref: TS 129 272 7.2.10
            type record IDA_MSG {
                DiameterHeader header,
                //     <IDA> ::=    < Diameter Header: 319, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                IDA_Body_AVP iDA_Body
            }
            type set IDA_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                set of Supported_Features_AVP supported_Features optional,
                Result_Code_AVP result_Code optional,
                Experimental_Result_AVP experimental_Result optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                IMS_Voice_PS_Sessions_Support_AVP iMS_Voice_PS_Sessions_Support optional,
                Last_UE_Activity_Time_AVP last_UE_Activity_Time_AVP optional,
                RAT_Type_AVP rAT_Type optional,
                IDA_Flags_AVP iDA_Flags optional,
                EPS_User_State_AVP ePS_User_State optional,
                EPS_Location_Information_AVP ePS_Location_Information optional,
                set of Failed_AVP failed_AVP optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

            //     Delete-Subscriber-Data-Request (DSR) Command - Ref: TS 129 272 7.2.11
            type record DSR_MSG {
                DiameterHeader header,
                //     <DSR>  ::= < Diameter Header: 320, REQ, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                DSR_Body_AVP dSR_Body
            }
            type set DSR_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                Destination_Host_AVP destination_Host,
                Destination_Realm_AVP destination_Realm,
                User_Name_AVP user_Name,
                set of Supported_Features_AVP supported_Features optional,
                DSR_Flags_AVP dSR_Flags,
                set of Context_Identifier_AVP context_Identifier optional,
                Trace_Reference_AVP trace_Reference optional,
                set of TS_Code_AVP tS_Code optional,
                set of SS_Code_AVP sS_Code optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

            //     Delete-Subscriber-Data-Answer (DSA) Command - Ref: TS 129 272 7.2.12
            type record DSA_MSG {
                DiameterHeader header,
                //     <DSA> ::=    < Diameter Header: 320, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                DSA_Body_AVP dSA_Body
            }
            type set DSA_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                set of Supported_Features_AVP supported_Features optional,
                Result_Code_AVP result_Code optional,
                Experimental_Result_AVP experimental_Result optional,
                Error_Diagnostic_AVP error_Diagnostic optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                DSA_Flags_AVP dSA_Flags optional,
                set of Failed_AVP failed_AVP optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

//            //     Purge-UE-Request (PUR) Command - Ref: TS 129 272 7.2.13
//            type record S6a_PUR_MSG {
//                DiameterHeader header,
//                //     <PUR>  ::= < Diameter Header: 321, REQ, PXY, 16777251 >
//
//                Session_Id_AVP session_Id,
//                //
//                PUR_Body_AVP pUR_Body
//            }
//
//            //     Purge-UE-Answer (PUA) Command - Ref: TS 129 272 7.2.14
//            type record S6a_PUA_MSG {
//                DiameterHeader header,
//                //     <DSA> ::=    < Diameter Header: 321, PXY, 16777251 >
//
//                Session_Id_AVP session_Id,
//                //
//                PUA_Body_AVP pUA_Body
//            }

            //     Reset-Request (RSR) Command - Ref: TS 129 272 7.2.15
            type record RSR_MSG {
                DiameterHeader header,
                //     <RSR> ::= < Diameter Header: 322, REQ, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                RSR_Body_AVP rSR_Body
            }
            type set RSR_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                Destination_Host_AVP destination_Host,
                Destination_Realm_AVP destination_Realm,
                set of Supported_Features_AVP supported_Features optional,
                set of User_Id_AVP user_Id optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

            //     Reset-Answer (RSA) Command - Ref: TS 129 272 7.2.16
            type record RSA_MSG {
                DiameterHeader header,
                //     <RSA> ::=    < Diameter Header: 322, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                RSA_Body_AVP rSA_Body
            }
            type set RSA_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                set of Supported_Features_AVP supported_Features optional,
                Result_Code_AVP result_Code optional,
                Experimental_Result_AVP experimental_Result optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                set of Failed_AVP failed_AVP optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

            //     Notify-Request (NOR) Command - Ref: TS 129 272 7.2.17
            type record NOR_MSG {
                DiameterHeader header,
                //     <NOR> ::= < Diameter Header: 323, REQ, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                NOR_Body_AVP nOR_Body
            }
            type set NOR_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                Destination_Host_AVP destination_Host optional,
                Destination_Realm_AVP destination_Realm,
                User_Name_AVP user_Name,
                set of Supported_Features_AVP supported_Features optional,
                Terminal_Information_AVP terminal_Information optional,
                MIP6_Agent_Info_AVP mIP6_Agent_Info optional,
                Visited_Network_Identifier_AVP visited_Network_Identifier optional,
                Context_Identifier_AVP context_Identifier optional,
                Service_Selection_AVP service_Selection optional,
                Alert_Reason_AVP alert_Reason optional,
                UE_SRVCC_Capability_AVP uE_SRVCC_Capability optional,
                NOR_Flags_AVP nOR_Flags optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

            //     Notify-Answer (NOA) Command - Ref: TS 129 272 7.2.18
            type record NOA_MSG {
                DiameterHeader header,
                //     <NOA> ::=    < Diameter Header: 323, PXY, 16777251 >

                Session_Id_AVP session_Id,
                //
                NOA_Body_AVP nOA_Body
            }
            type set NOA_Body_AVP {
                Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
                Result_Code_AVP result_Code optional,
                Experimental_Result_AVP experimental_Result optional,
                Auth_Session_State_AVP auth_Session_State,
                Origin_Host_AVP origin_Host,
                Origin_Realm_AVP origin_Realm,
                set of Supported_Features_AVP supported_Features optional,
                set of Failed_AVP failed_AVP optional,
                set of Proxy_Info_AVP proxy_Info optional,
                set of Route_Record_AVP route_Record optional,
                set of AVP_Type aVP_Type optional
            }

        } // End of group S6a

    } // End of group MessageTypes
    
} // End of LibDiameter_Types_S6a_AVPs 
 No newline at end of file