Commit 7dd70a70 authored by rennoch's avatar rennoch
Browse files

update due to TP corrections

parent 771c5647

DiameterS9/ttcn/DiameterS9_PIXITS.ttcn

+6 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ module DiameterS9_PIXITS 
{

    import from LibDiameter_Types_Base_AVPs {type IPv4Addr, IPv6Addr, UTF8String, Subscription_Id_Ty_Type;};

    import from LibDiameter_Types_Gx_AVPs {type IP_CAN_Type, RAT_Type;};

    import from LibCommon_BasicTypesAndValues all;



    group Port_and_addresses{

        group S9_Port_and_addresses{
@@ -299,7 +300,11 @@ module DiameterS9_PIXITS 
        The SGW/AGW in type IPv6Addr format (3GPP-EPS and 3GPP2 accesses), PIXIT item A-7/28

        */

        modulepar IPv6Addr PX_SGW_AGW_ipv6 := {1,2,3,4,5,6,7,8};

//

        /** @desc	

        The max QoS bandwidth in type UInt32 format, PIXIT item

        */

        modulepar UInt32 PX_max_Requested_Bandwidth_UL := 4294967295;



//        

//        /** @desc	octetstring, PIXIT item A-7/29

//         * A charging identifier for the Access-Network-Charging-Identifier-Value AVP in Access-Network-Charging-Identifier AVPs

DiameterS9/ttcn/DiameterS9_S9_TCFunctions.ttcn3

+3 −3
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ module DiameterS9_S9_TCFunctions { 
                                                vc_destinationRealm,

                                                {m_qoSRuleReport_dummy},

                                                m_qoS_Information_dummy, // BBERF attributes TODO: to check more required AVPs 

                								{m_subsesEnforcementInfo_Operation(m_subsessionId_dummy(1),

                								{m_subsesEnforcementInfo_Operation(m_subsessionId_dummy(111),

                            							m_subsessionOperation_dummy(Subsession_Operation_Code:MODIFICATION_E))}                                                        								    

                                                )

                                                );
@@ -247,7 +247,7 @@ module DiameterS9_S9_TCFunctions { 
                f_awaiting_CCA(mw_CCA_ExpResult_SubsesDecInfo(vc_sessionId,

                    vc_originHost_IUT, vc_originRealm_IUT,

                    mw_experimentalResult(mw_expResultCode(DIAMETER_ERROR_SUBSESSION_E)),

                    {(mw_SubsesDecisionInfo_resultCode(mw_subsessionId_dummy(1),?),mw_SubsesDecisionInfo_expResultCode(mw_subsessionId_dummy(1),?))} ) );

                    {(mw_SubsesDecisionInfo_resultCode(mw_subsessionId_dummy(111),?),mw_SubsesDecisionInfo_expResultCode(mw_subsessionId_dummy(1),?))} ) );



                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
@@ -278,7 +278,7 @@ module DiameterS9_S9_TCFunctions { 
                                                vc_originRealm,

                                                vc_destinationRealm,

                                                {m_qoSRuleReport_dummy},

                                                m_qoS_Information_dummy, // BBERF attributes TODO: to check more required AVPs 

                								m_qoS_Information_maxReqBwUl(m_maxRequestedBandwidthUL(PX_max_Requested_Bandwidth_UL)), // BBERF attributes TODO: to check more required AVPs 

                								{m_subsesEnforcementInfo_Operation(m_subsessionId_dummy(1),

                            							m_subsessionOperation_dummy(Subsession_Operation_Code:MODIFICATION_E))}                                                        								    

                                                )

DiameterS9/ttcn/DiameterS9_Templates.ttcn

+14 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ module DiameterS9_Templates { 
    import from LibDiameter_TypesAndValues all;

    import from LibDiameter_Templates all;

    import from DiameterS9_PIXITS all;

    import from LibDiameter_Types_Rx_AVPs all;



    group SubFields{

    } //end group SubFields
@@ -631,6 +632,19 @@ module DiameterS9_Templates { 
                    aVP_Data := p_avpData

                }



                template Max_Requested_Bandwidth_UL_AVP m_maxRequestedBandwidthUL(template (present) UInt32 p_aVPData) :=

                {

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_max_Requested_Bandwidth_UL_AVP_Code, 4, omit),

                    aVP_Data := p_aVPData

                }



                template QoS_Information_AVP m_qoS_Information_maxReqBwUl (template (present) Max_Requested_Bandwidth_UL_AVP p_maxRequestedBandwidthUL) 

                	modifies m_qoS_Information_dummy :=

                {

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_qoS_Information_AVP_Code, 4+lengthof(encvalue(p_maxRequestedBandwidthUL)), c_vendId3gpp),

                    max_Requested_Bandwidth_UL := p_maxRequestedBandwidthUL

                }

                

          	}//end group sendingTemplatesForAVPs

          	group awaitingTemplatesForAVPs{