Commit 55428bc1 authored by pintar's avatar pintar
Browse files

Changes done during STF482 validation: week6/2015

parent 112c7cae

DiameterS6a/ttcn/DiameterS6a_MME_TCFunctions.ttcn3

+3 −3
Original line number Diff line number Diff line
@@ -1391,11 +1391,11 @@ module DiameterS6a_MME_TCFunctions { 
			var Operator_Determined_Barring_AVP		v_operatorDeterminedBarring		:= m_operatorDeterminedBarring ( 16 );

			var Access_Restriction_Data_AVP			v_accessRestrictionData			:= m_accessRestrictionData ( 32 );

			var APN_OI_Replacement_AVP				v_aPNOIReplacement				:= m_aPNOIReplacement ( UTF8String:"AA" );

			var Regional_Subscription_Zone_Code_AVP	v_regionalSubscriptionZoneCode	:= m_regionalSubscriptionZoneCode ( '0A0B'O );

			var Regional_Subscription_Zone_Code_AVP	v_regionalSubscriptionZoneCode	:= m_regionalSubscriptionZoneCode ( '0A0B0101'O );

			var CSG_Subscription_Data_AVP			v_cSGSubscriptionData			:= m_cSGSubscriptionData ( m_cSGId ( 3 ));

			var Teleservice_List_AVP				v_teleserviceList				:= m_teleserviceListTsCode ( m_tSCode ( '0C0D'O ) );

			var Teleservice_List_AVP				v_teleserviceList				:= m_teleserviceListTsCode ( m_tSCode ( '0C0D0102'O ) );

			var Call_Barring_Info_AVP				v_callBarringInfo				:= m_callBarringInfo ( m_sSCode ( '0E0F'O ), m_sSStatus ( '0A0A'O ) );

			var LCS_Info_AVP						v_lCSInfo						:= m_lcsInfo_dummy;

			var LCS_Info_AVP						v_lCSInfo						:= m_lcsInfo_GMLCNumber(m_GMLC_Number('1234'O));

            var Subscription_Data_AVP          v_subscriptionData        := m_subscriptionDataAll (	v_operatorDeterminedBarring,

																									v_regionalSubscriptionZoneCode,

            																						v_accessRestrictionData,

DiameterS6a/ttcn/DiameterS6a_Templates.ttcn

+18 −2
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ module DiameterS6a_Templates { 
                template (value) Teleservice_List_AVP m_teleserviceListTsCode ( in template (value) TS_Code_AVP p_tSCode ) := {

                    aVP_Header    := m_aVP_HeaderVid_Mbit1 ( 

                                         c_teleservice_List_AVP_Code, 

                                         p_tSCode.aVP_Header.aVP_len,//f_getEncvalueLength ( encvalue ( p_tSCode ) ), 

                                         f_getEncvalueLength ( encvalue ( p_tSCode ) ),

                                         c_vendId3gpp ),

                    tS_Code       := { p_tSCode },

                    aVP_Type      := omit
@@ -914,7 +914,7 @@ module DiameterS6a_Templates { 
                template (value) CSG_Subscription_Data_AVP m_cSGSubscriptionData ( in template (value) CSG_Id_AVP p_cSGId ) := {

                    aVP_Header    := m_aVP_HeaderVid_Mbit1 ( 

										 c_csg_Subscription_Data_AVP_Code, 

										 16, 

                                         p_cSGId.aVP_Header.aVP_len ,//16, 

                                         c_vendId3gpp ),

                	cSG_Id       		:= p_cSGId,

                	expiration_Date		:= omit,
@@ -1351,6 +1351,22 @@ module DiameterS6a_Templates { 
                    aVP_Data := p_avpData

                }

            

                /**

                 * @desc TODO

                 */

                template (value) LCS_Info_AVP m_lcsInfo_GMLCNumber(template (value) GMLC_Number_AVP p_gMLC_Number) modifies m_lcsInfo_dummy := {

                    aVP_Header           := m_aVP_HeaderVid_Mbit1 (c_lcs_Info_AVP_Code, 

                                                                   f_getEncvalueLength ( encvalue ( p_gMLC_Number ) ),

                                                                   c_vendId3gpp ),

                    gMLC_Number          := {p_gMLC_Number}

                } // End of template m_lcsInfo_dummy

            



                template (value) GMLC_Number_AVP m_GMLC_Number(template (value) octetstring p_avp_Data) := {

                    aVP_Header           := m_aVP_HeaderVid_Mbit1 ( c_gmlc_Number_AVP_Code, f_getOctetStringLength(p_avp_Data), c_vendId3gpp ),

                    aVP_Data             := p_avp_Data

                }

                

            } // End of group sendingTemplatesForAVPs

            

            /** AVPs basic templates for receive */