Commit 1bb8fd79 authored by rennoch's avatar rennoch
Browse files

No commit message 

No commit message
parent c97139e9

DiameterS9/ttcn/DiameterS9_PIXITS.ttcn

+10 −14
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


module DiameterS9_PIXITS

{

    import from LibDiameter_Types_Base_AVPs {type UTF8String, Subscription_Id_Ty_Type;};

    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;};



    group Port_and_addresses{
@@ -234,19 +234,15 @@ module DiameterS9_PIXITS 
//    

//        */

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

//

//        /** @desc	 

//                     

//       The SGW/AGW in IPv4Addr format (3GPP-EPS and 3GPP2 accesses), PIXIT item A-7/27

//    

//        */

//        modulepar IPv4Addr PX_SGW_AGW_ipv4 := {1,2,3,4};

//        /** @desc	

//                     

//       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 SGW/AGW in IPv4Addr format (3GPP-EPS and 3GPP2 accesses), PIXIT item A-7/27

        */

        modulepar IPv4Addr PX_SGW_AGW_ipv4 := {1,2,3,4};

        /** @desc	

        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	octetstring, PIXIT item A-7/29

DiameterS9/ttcn/DiameterS9_S9_TCFunctions.ttcn3

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ module DiameterS9_S9_TCFunctions { 
                                                f_framedIpAddress6_send(PX_UE1_framedIp6Address),

                								{m_subscription_Id(valueof(m_subscription_Id_Type(PX_SUBSCRIPTION_ID_TYPE)),

                								    valueof(m_subscription_Id_Data(PX_SUBSCRIPTION_ID_DATA)))},

                                                // TODO AN-GW-Address

                                                {m_anGwAddress(f_IPAdress(PX_SGW_AGW_ipv4,PX_SGW_AGW_ipv6))},

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

                								)

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



                //session termination

                //TODO: function have to be declared in S9_steps: f_terminate_session_VPCRF();

                f_terminate_session_HPCRF();



                //TODO: function have to be declared in S9_steps: f_postamble_VPCRF();

DiameterS9/ttcn/DiameterS9_Templates.ttcn

+7 −7
Original line number Diff line number Diff line
@@ -580,6 +580,12 @@ module DiameterS9_Templates { 
                    aVP_Data := p_avpData

                }                



                template AN_GW_Address_AVP m_anGwAddress(template (value) Address p_avpData) :=

                {

                    aVP_Header := m_aVP_HeaderVid_Mbit0(c_aN_GW_Address_AVP_Code, f_IPAdressLength(), c_vendId3gpp),

                    aVP_Data := p_avpData

                }

                

          	}//end group sendingTemplatesForAVPs

          	group awaitingTemplatesForAVPs{
@@ -600,12 +606,6 @@ module DiameterS9_Templates { 
                    aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_cC_Request_Type_AVP_Code),

                    aVP_Data := p_avpData

                }



                template AN_GW_Address_AVP m_anGwAddress(template (value) Address p_avpData) :=

                {

                    aVP_Header := m_aVP_HeaderVid_Mbit0(c_aN_GW_Address_AVP_Code, f_IPAdressLength(), c_vendId3gpp),

                    aVP_Data := p_avpData

                }

			}//end group awaitingTemplatesForAVPs

        } //end group SpecificAVPHeaders

    } //end group HeaderFieldTemplates
@@ -857,7 +857,7 @@ module DiameterS9_Templates { 
                                                                           template Framed_IP_Address_AVP p_framedIpAddress,

                                                                           template Framed_IPv6_Prefix_AVP p_framedIp6Address,

                                                                           template CCR_MSG.cCR_Body.subscription_Id p_subscriptionId,

                                                                           // TODO AN-GW-Address

                                                                           template CCR_MSG.cCR_Body.aN_GW_Address p_aN_GW_Address,

                                                                           template QoS_Information_AVP p_qosInformation

                                                                           // BBERF attributes TODO: to check more required AVPs  

                                                                        )