Commit e759f72f authored by garciay's avatar garciay
Browse files

STF490: Restore some fixes from Bostjan removed by conflict resolution

parent 8bd0f5ed
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -4442,7 +4442,7 @@ module DiameterRfRo_Templates {
                                                                   in template (value) UInt8        p_namespace_Id,
                                                                   in template (value) UInt8        p_namespace_Id,
                                                                   in template (value) UTF8String   p_operator_Name
                                                                   in template (value) UTF8String   p_operator_Name
            ) := {
            ) := {
                aVP_Header  := m_aVP_HeaderVid_Mbit1(c_operator_Name_AVP_Code, 1 + f_getUTF8StringLength(valueof(p_operator_Name)), c_vendId3gpp),
                aVP_Header  := m_aVP_HeaderVid_Mbit0(c_operator_Name_AVP_Code, 1 + f_getUTF8StringLength(valueof(p_operator_Name)), omit),
                namespace_Id := p_namespace_Id,
                namespace_Id := p_namespace_Id,
                operator_Name := p_operator_Name
                operator_Name := p_operator_Name
            } // End of template m_operator_Name_AVP
            } // End of template m_operator_Name_AVP
@@ -4488,7 +4488,7 @@ module DiameterRfRo_Templates {
                                                                   in template (value) UInt16     p_index,
                                                                   in template (value) UInt16     p_index,
                                                                   in template (value) UTF8String p_aVP_Data
                                                                   in template (value) UTF8String p_aVP_Data
            ) := {
            ) := {
                aVP_Header  := m_aVP_HeaderVid_Mbit1(c_location_Data_AVP_Code, f_getUTF8StringLength(valueof(p_aVP_Data)), c_vendId3gpp),
                aVP_Header  := m_aVP_HeaderVid_Mbit0(c_location_Data_AVP_Code, f_getUTF8StringLength(valueof(p_aVP_Data)), omit),
                index := p_index,
                index := p_index,
                aVP_Data := p_aVP_Data
                aVP_Data := p_aVP_Data
            } // End of template Location_Data_AVP
            } // End of template Location_Data_AVP
@@ -4509,7 +4509,7 @@ module DiameterRfRo_Templates {
                                                                      template (present) UInt8        p_namespace_Id := ?,
                                                                      template (present) UInt8        p_namespace_Id := ?,
                                                                      template (present) UTF8String   p_operator_Name := ?
                                                                      template (present) UTF8String   p_operator_Name := ?
            ) := {
            ) := {
                aVP_Header  := mw_aVP_HeaderVid_Mbit1(c_operator_Name_AVP_Code, ?, c_vendId3gpp),
                aVP_Header  := mw_aVP_HeaderVid_Mbit0(c_operator_Name_AVP_Code),
                namespace_Id := p_namespace_Id,
                namespace_Id := p_namespace_Id,
                operator_Name := p_operator_Name
                operator_Name := p_operator_Name
            } // End of template mw_operator_Name_AVP
            } // End of template mw_operator_Name_AVP