Diameter Rx update on types, templates within TTF006 (c0752927) · Commits · TTCN-3 Libraries / LibDiameter

ttcn/LibDiameter_Steps.ttcn

+40 −0

Original line number	Diff line number	Diff line
		@@ -1661,6 +1661,46 @@ group GlobalSteps {
		}
		}


		function f_IPV4_Address2oct (charstring p_addr)
		return octetstring
		{
		var integer addr_len:=0;
		var integer i;

		var integer addr_i;
		var charstring num:="";
		var charstring current:="";
		var integer v_Addrint;
		var hexstring v_Addrhex := ''H;
		var octetstring v_Addroct := ''O;
		addr_len:=lengthof(p_addr);
		addr_i:=0;

		for(i:=0;i<addr_len;i:=i+1){
		current:=substr(p_addr,i,1);
		if(current=="."){
		v_Addrint := str2int(num);
		v_Addrhex := v_Addrhex&int2hex(v_Addrint, 2);
		addr_i:=addr_i+1;
		num:="";
		}else{
		num:=num&current;
		}
		}
		if (addr_i>3){
		log("IPV4 parse ERROR");
		}else{
		v_Addrint := str2int(num);
		v_Addrhex := v_Addrhex&int2hex(v_Addrint, 2);
		v_Addroct := hex2oct(v_Addrhex);
		num:="";
		}

		return(v_Addroct)

		}

		/**
		*
		* @desc component termination

ttcn/LibDiameter_Templates.ttcn

+64 −10

Original line number	Diff line number	Diff line
		@@ -1004,11 +1004,13 @@ module LibDiameter_Templates {

		template (value) AAR_Body_AVP m_AAR_Body_dummy :=
		{
		//dRMP := omit,
		auth_Application_Id := m_authApplicationId_dummy,
		origin_Host := m_originHost_dummy,
		origin_Realm := m_originRealm_dummy,
		destination_Realm := m_destinationRealm_dummy,
		destination_Host := m_destinationHost_dummy,
		auth_Application_Id := m_authApplicationId_dummy,
		iP_Domain := omit,
		af_Application_Id := omit,
		media_Component_Description := omit,
		service_Info_Status := omit,
		@@ -1016,6 +1018,7 @@ module LibDiameter_Templates {
		sip_Forking_Indication := omit,
		specific_Action := omit,
		subscription_Id := omit,
		//oC_Supported_Features := omit,
		supported_Features := omit,
		reservation_Priority := omit,
		framed_IP_Address := omit,
		@@ -1024,6 +1027,16 @@ module LibDiameter_Templates {
		service_URN := omit,
		sponsored_Connectivity_Data := omit,
		mps_Identifier := omit,
		gcs_Identifier := omit,
		mcptt_Identifier := omit,
		mCVideo_Identifier := omit,
		iMS_Content_Identifier := omit,
		iMS_Content_Type := omit,
		rx_Request_Type := omit,
		required_Access_Info := omit,
		aF_Requested_Data := omit,
		//reference_Id := omit,
		pre_emption_Control_Info := omit,
		user_Name := omit,
		origin_State_Id := omit,
		proxy_Info := omit,
		@@ -1587,11 +1600,13 @@ module LibDiameter_Templates {

		template AAR_Body_AVP mw_AAR_Body_dummy :=
		{
		//dRMP := *,
		auth_Application_Id := ?,
		origin_Host := ?,
		origin_Realm := ?,
		destination_Realm := ?,
		destination_Host := *,
		auth_Application_Id := ?,
		iP_Domain := *,
		af_Application_Id := *,
		media_Component_Description := *,
		service_Info_Status := *,
		@@ -1599,6 +1614,7 @@ module LibDiameter_Templates {
		sip_Forking_Indication := *,
		specific_Action := *,
		subscription_Id := *,
		//oC_Supported_Features := *,
		supported_Features := *,
		reservation_Priority := *,
		framed_IP_Address := *,
		@@ -1607,6 +1623,16 @@ module LibDiameter_Templates {
		service_URN := *,
		sponsored_Connectivity_Data := *,
		mps_Identifier := *,
		gcs_Identifier := *,
		mcptt_Identifier := *,
		mCVideo_Identifier := *,
		iMS_Content_Identifier := *,
		iMS_Content_Type := *,
		rx_Request_Type := *,
		required_Access_Info := *,
		aF_Requested_Data := *,
		//reference_Id := omit,
		pre_emption_Control_Info := *,
		user_Name := *,
		origin_State_Id := *,
		proxy_Info := *,
		@@ -2169,27 +2195,41 @@ module LibDiameter_Templates {

		template (value) AAA_Body_AVP m_AAA_Body_dummy :=
		{
		result_Code := omit,
		//dRMP := omit,
		auth_Application_Id := m_authApplicationId_dummy,
		origin_Host := m_originHost_dummy,
		origin_Realm := m_originRealm_dummy,
		auth_Application_Id := m_authApplicationId_dummy,
		result_Code := omit,
		experimental_Result := omit,
		auth_Session_State := omit,
		access_network_charging_Identifier := omit,
		access_network_charging_address := omit,
		acceptable_service_info := omit,
		aN_GW_Address := omit,
		//aN_Trusted := omit,
		service_Authorization_Info := omit,
		ip_Can_Type := omit,
		//netLoc_Access_Support := omit,
		rat_Type := omit,
		flows := omit,
		//oC_Supported_Features := *,
		//oC_OLR := *,
		supported_Features := omit,
		class := omit,
		subscription_Id_AVP := omit,
		user_Equipment_Info := omit,
		threeGPP_SGSN_MCC_MNC := omit,
		class_ := omit,
		user_Name := omit,
		origin_State_Id := omit,
		error_Message := omit,
		error_Reporting_Host := omit,
		failed := omit,
		retry_Interval := omit,
		origin_State_Id := omit,
		redirect_Host := omit,
		redirect_Host_Usage := omit,
		redirect_Max_Cache_Time := omit,
		proxy_Info := omit,
		// load:= omit,
		aVP_Type := omit
		}

		@@ -2744,27 +2784,41 @@ module LibDiameter_Templates {

		template AAA_Body_AVP mw_AAA_Body_dummy :=
		{
		result_Code := *,
		//dRMP := *,
		auth_Application_Id := ?,
		origin_Host := ?,
		origin_Realm := ?,
		auth_Application_Id := ?,
		result_Code := *,
		experimental_Result := *,
		auth_Session_State :=*,
		access_network_charging_Identifier := *,
		access_network_charging_address := *,
		acceptable_service_info := *,
		aN_GW_Address := *,
		//aN_Trusted := *,
		service_Authorization_Info := *,
		ip_Can_Type := *,
		//netLoc_Access_Support := *,
		rat_Type := *,
		flows := *,
		//oC_Supported_Features := *,
		//oC_OLR := *,
		supported_Features := *,
		class := *,
		subscription_Id_AVP := *,
		user_Equipment_Info := *,
		threeGPP_SGSN_MCC_MNC := *,
		class_ := *,
		user_Name := *,
		origin_State_Id := *,
		error_Message := *,
		error_Reporting_Host := *,
		failed := *,
		retry_Interval := *,
		origin_State_Id := *,
		redirect_Host := *,
		redirect_Host_Usage := *,
		redirect_Max_Cache_Time := *,
		proxy_Info := *,
		// load:= *,
		aVP_Type := *
		}

ttcn/LibDiameter_TypesAndValues.ttcn

+34 −6

Original line number	Diff line number	Diff line
		@@ -320,6 +320,7 @@ group BasicTypesAndConstants{
		const integer c_rR_Bandwidth_AVP_Code := 521; //Ref: ETSI TS 129 214 RR Bandwidth_AVP
		const integer c_rS_Bandwidth_AVP_Code := 522; //Ref: ETSI TS 129 214 RS Bandwidth_AVP
		const integer c_service_Info_Status_AVP_Code := 527; //Ref: ETSI TS 129 214 Service_Info AVP
		const integer c_rx_Request_Type_AVP_Code := 533; //Ref: ETSI TS 129 214 Request_Type_AVP
		const integer c_service_URN_AVP_Code := 525; //Ref: ETSI TS 129 214 Service_URN AVP
		const integer c_sIP_Forking_Indication_AVP_Code := 523; //Ref: ETSI TS 129 214 SIP_Forking_Indication AVP
		const integer c_specific_Action_AVP_Code := 513; //Ref: ETSI TS 129 214 Specific_Action AVP
		@@ -2335,11 +2336,13 @@ group BasicTypesAndConstants{
		}

		type set AAR_Body_AVP {
		//DRMP dRMP optional, //ETSI TS 129 214 V15.5 from RFC 7944
		Auth_Application_Id_AVP auth_Application_Id,
		Origin_Host_AVP origin_Host,//required
		Origin_Realm_AVP origin_Realm,
		Destination_Realm_AVP destination_Realm,
		Destination_Host_AVP destination_Host optional,
		Auth_Application_Id_AVP auth_Application_Id,
		IP_Domain_AVP iP_Domain optional, //ETSI TS 129 214 V15.5
		AF_Application_Identifier_AVP af_Application_Id optional,//present in ETSI TS 129 214 p.5.6.7
		set of Media_Component_Description_AVP media_Component_Description optional,
		Service_Info_Status_AVP service_Info_Status optional,
		@@ -2347,6 +2350,7 @@ group BasicTypesAndConstants{
		SIP_Forking_Indication_AVP sip_Forking_Indication optional,
		set of Specific_Action_AVP specific_Action optional,
		set of Subscription_Id_AVP subscription_Id optional,
		//OC_Supported_Features_AVP oC_Supported_Features optional, //ETSI TS 129 214 V15.5 from RFC7583
		set of Supported_Features_AVP supported_Features optional,
		Reservation_Priority_AVP reservation_Priority optional,
		Framed_IP_Address_AVP framed_IP_Address optional,
		@@ -2355,6 +2359,16 @@ group BasicTypesAndConstants{
		Service_URN_AVP service_URN optional,
		Sponsored_Connectivity_Data_AVP sponsored_Connectivity_Data optional,
		MPS_Identifier_AVP mps_Identifier optional,
		GCS_Identifier_AVP gcs_Identifier optional, //ETSI TS 129 214 V15.5
		MCPTT_Identifier_AVP mcptt_Identifier optional, //ETSI TS 129 214 V15.5
		MCVideo_Identifier_AVP mCVideo_Identifier optional, //ETSI TS 129 214 V15.5
		IMS_Content_Identifier_AVP iMS_Content_Identifier optional, //ETSI TS 129 214 V15.5
		IMS_Content_Type_AVP iMS_Content_Type optional, //ETSI TS 129 214 V15.5
		Rx_Request_Type_AVP rx_Request_Type optional, //ETSI TS 129 214 V15.5
		set of Required_Access_Info_AVP required_Access_Info optional, //ETSI TS 129 214 V15.5
		AF_Requested_Data_AVP aF_Requested_Data optional, //ETSI TS 129 214 V15.5
		//Reference_Id_AVP reference_Id optional, //ETSI TS 129 214 V15.5 from TS 129 154
		Pre_emption_Control_Info_AVP pre_emption_Control_Info optional, //ETSI TS 129 214 V15.5
		User_Name_AVP user_Name optional,
		Origin_State_Id_AVP origin_State_Id optional,
		set of Proxy_Info_AVP proxy_Info optional,
		@@ -2382,27 +2396,41 @@ group BasicTypesAndConstants{
		}

		type set AAA_Body_AVP {
		Result_Code_AVP result_Code optional,//required
		//DRMP dRMP optional, //ETSI TS 129 214 V15.5 from RFC 7944
		Auth_Application_Id_AVP auth_Application_Id,
		Origin_Host_AVP origin_Host,//required
		Origin_Realm_AVP origin_Realm,
		Auth_Application_Id_AVP auth_Application_Id,
		Result_Code_AVP result_Code optional,//required
		Experimental_Result_AVP experimental_Result optional,
		Auth_Session_State_AVP auth_Session_State optional, //ETSI TS 129 214 V15.5
		set of Access_Network_Charging_Identifier_AVP access_network_charging_Identifier optional,
		Access_Network_Charging_Address_AVP access_network_charging_address optional,
		Acceptable_Service_Info_AVP acceptable_service_info optional,
		set length (0..2) of AN_GW_Addr_AVP aN_GW_Address optional, //ETSI TS 129 214 V15.5
		//AN_Trusted_AVP aN_Trusted optional, //ETSI TS 129 214 V15.5 from TS 129 273
		Service_Authorization_Info_AVP service_Authorization_Info optional, //ETSI TS 129 214 V15.5
		IP_CAN_Type_AVP ip_Can_Type optional,
		//NetLoc_Access_Support_AVP netLoc_Access_Support optional, //ETSI TS 129 214 V15.5 from TS 129 212
		RAT_Type_AVP rat_Type optional,
		set of Flows_AVP flows optional, //ETSI TS 129 214 V15.5
		//OC_Supported_Features_AVP oC_Supported_Features optional, //ETSI TS 129 214 V15.5 from RFC7683
		//OC_OLR_AVP oC_OLR optional, //ETSI TS 129 214 V15.5 from RFC7683
		set of Supported_Features_AVP supported_Features optional,
		set of Class_AVP class optional,
		set of Subscription_Id_AVP subscription_Id_AVP optional, //ETSI TS 129 214 V15.5
		User_Equipment_Info_AVP user_Equipment_Info optional, //ETSI TS 129 214 V15.5
		ThreeGPP_SGSN_MCC_MNC_AVP threeGPP_SGSN_MCC_MNC optional, //ETSI TS 129 214 V15.5
		set of Class_AVP class_ optional,
		User_Name_AVP user_Name optional,
		Origin_State_Id_AVP origin_State_Id optional,
		Error_Message_AVP error_Message optional,
		Error_Reporting_Host_AVP error_Reporting_Host optional,
		set of Failed_AVP failed optional,
		Failed_AVP failed optional,
		Retry_Interval_AVP retry_Interval optional, //ETSI TS 129 214 V15.5
		Origin_State_Id_AVP origin_State_Id optional,
		set of Redirect_Host_AVP redirect_Host optional,
		Redirect_Host_Usage_AVP redirect_Host_Usage optional,
		Redirect_Max_Cache_Time_AVP redirect_Max_Cache_Time optional,
		set of Proxy_Info_AVP proxy_Info optional,
		//set of Load_AVP load optional, //ETSI TS 129 214 V15.5
		set of AVP_Type aVP_Type optional
		}
		with {

ttcn/LibDiameter_Types_Rx_AVPs.ttcn

+136 −7

File changed.

Preview size limit exceeded, changes collapsed.

Admin message