Commit b42314fb authored by pintar's avatar pintar
Browse files

Duplicated AVP Visited_Network_Identifier_AVP and Visited_Network_Id_AVP 

located in modules: 
-LibDiameter_Types_CxDx_AVPs
-LibDiameter_Types_S6a_AVPs

Visited_Network_Identifier_AVP is defined in  129 229 and therefore specified only within ...CxDx_AVPs module.
parent 29159839

ttcn/LibDiameter_Templates.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ module LibDiameter_Templates { 
                sIP_User_Authorization_Type := m_sIP_User_Authorization_Type,

                supported_Features := omit,

                public_Identity := omit,

                visited_Network_Id := omit,

                visited_Network_Identifier := omit,

                user_Authorization_Type := omit,

                uAR_Flags := omit,

                proxy_Info := omit,
@@ -1923,7 +1923,7 @@ module LibDiameter_Templates { 
                sIP_User_Authorization_Type := ?,

                supported_Features := *,

                public_Identity := *,

                visited_Network_Id := *,

                visited_Network_Identifier := *,

                user_Authorization_Type := *,

                uAR_Flags := *,

                proxy_Info := *,

ttcn/LibDiameter_TypesAndValues.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -1354,7 +1354,7 @@ group BasicTypesAndConstants{ 
                    SIP_User_Authorization_Type_AVP        sIP_User_Authorization_Type optional,   //required only in RFC4740

                    set of Supported_Features_AVP          supported_Features optional,            //only in TS129 229

                    Public_Identity_AVP                    public_Identity optional,               //required only in TS129 229

                    Visited_Network_Id_AVP                 visited_Network_Id optional,            //required only in TS129 229

                    Visited_Network_Identifier_AVP         visited_Network_Identifier optional,    //required only in TS129 229

                    User_Authorization_Type_AVP            user_Authorization_Type optional,       //only in TS129 229

                    UAR_Flags_AVP                          uAR_Flags optional,                     //only in TS129 229

                    set of Proxy_Info_AVP                  proxy_Info optional,                    //RFC4740

ttcn/LibDiameter_Types_CxDx_AVPs.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ module LibDiameter_Types_CxDx_AVPs { 
                variant (aVP_Data) "condition=CodecHelper.leaveScope()"

            }

            

            type record Visited_Network_Id_AVP{

            type record Visited_Network_Identifier_AVP{

            // Ref: ETSI TS 129 229 6.3.1  Visited-Network-Id AVP

                AVP_Header             aVP_Header,//<AVP header: 600 ....>

                octetstring            aVP_Data

ttcn/LibDiameter_Types_S6a_AVPs.ttcn3

+8 −4
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ module LibDiameter_Types_S6a_AVPs { 
    import from LibCommon_BasicTypesAndValues {

        type UInt32

    };

    import from LibDiameter_Types_CxDx_AVPs {

        type Visited_Network_Identifier_AVP

    };

    import from LibCommon_DataStrings {

        type Oct3

    };
@@ -142,10 +145,11 @@ module LibDiameter_Types_S6a_AVPs { 
                set of AVP_Type                      aVP_Type                           optional

            }



            type record Visited_Network_Identifier_AVP {                            //ref: 7.3.105 - TS 129 229 6.3.1

                AVP_Header                          aVP_Header,                     //Visited-Network-Identifier ::= <AVP header: 600>

                octetstring                         aVP_Data

            }

//            TODO: When S6a upgrade or corrections will be in progress. import this type from LibDiameter_Types_CxDx_AVPs.ttcn module

//            type record Visited_Network_Identifier_AVP {                            //ref: 7.3.105 - TS 129 229 6.3.1

//                AVP_Header                          aVP_Header,                     //Visited-Network-Identifier ::= <AVP header: 600>

//                octetstring                         aVP_Data

//            }



            type record Specific_APN_Info_AVP {                                        //ref: 7.3.82

                AVP_Header                             aVP_Header,                     //Specific-APN-Info ::= <AVP header: 1472 10415>