Duplicated types deleted and some types updated due to validation (1f3760b0) · Commits · TTCN-3 Libraries / LibDiameter

ttcn/LibDiameter_Templates.ttcn

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2302,7 +2302,7 @@ module LibDiameter_Templates {
	cC_Session_Failover := omit,		cC_Session_Failover := omit,
	cC_Sub_Session_Id := omit,		cC_Sub_Session_Id := omit,
	acct_Multi_Session_Id := omit,		acct_Multi_Session_Id := omit,
	origin_State := omit,		origin_State_Id := omit,
	event_Timestamp := omit,		event_Timestamp := omit,
	granted_Service_Unit := omit,		granted_Service_Unit := omit,
	multiple_Services_Credit_Control := omit,		multiple_Services_Credit_Control := omit,
	@@ -2891,7 +2891,7 @@ module LibDiameter_Templates {
	cC_Session_Failover := *,		cC_Session_Failover := *,
	cC_Sub_Session_Id := *,		cC_Sub_Session_Id := *,
	acct_Multi_Session_Id := *,		acct_Multi_Session_Id := *,
	origin_State := *,		origin_State_Id := *,
	event_Timestamp := *,		event_Timestamp := *,
	granted_Service_Unit := *,		granted_Service_Unit := *,
	multiple_Services_Credit_Control := *,		multiple_Services_Credit_Control := *,

ttcn/LibDiameter_TypesAndValues.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2261,7 +2261,7 @@ group BasicTypesAndConstants{
	CC_Session_Failover_AVP cC_Session_Failover optional, //RFC4006		CC_Session_Failover_AVP cC_Session_Failover optional, //RFC4006
	CC_Sub_Session_Id_AVP cC_Sub_Session_Id optional, //RFC4006		CC_Sub_Session_Id_AVP cC_Sub_Session_Id optional, //RFC4006
	Acct_Multi_Session_Id_AVP acct_Multi_Session_Id optional, //RFC4006		Acct_Multi_Session_Id_AVP acct_Multi_Session_Id optional, //RFC4006
	Origin_State_Id_AVP origin_State optional, //RFC4006 & TS129 212 & TS129 215		Origin_State_Id_AVP origin_State_Id optional, //RFC4006 & TS129 212 & TS129 215
	Event_Timestamp_AVP event_Timestamp optional, //RFC4006		Event_Timestamp_AVP event_Timestamp optional, //RFC4006
	Granted_Service_Unit_AVP granted_Service_Unit optional, //RFC4006		Granted_Service_Unit_AVP granted_Service_Unit optional, //RFC4006
	set of Multiple_Services_Credit_Control_AVP multiple_Services_Credit_Control optional, //RFC4006		set of Multiple_Services_Credit_Control_AVP multiple_Services_Credit_Control optional, //RFC4006

ttcn/LibDiameter_Types_Gx_AVPs.ttcn

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -246,6 +246,7 @@ module LibDiameter_Types_Gx_AVPs {

	type enumerated QoS_Class_Identifier{		type enumerated QoS_Class_Identifier{
	// Ref: ETSI TS 129 212 5.3.17		// Ref: ETSI TS 129 212 5.3.17
			Reserved1_E ( 0),
	QCI_1_E (1),//examle service=conversational voice		QCI_1_E (1),//examle service=conversational voice
	QCI_2_E (2),//examle service=conversational video		QCI_2_E (2),//examle service=conversational video
	QCI_3_E (3),//examle service=real time gaming		QCI_3_E (3),//examle service=real time gaming
	@@ -254,7 +255,10 @@ module LibDiameter_Types_Gx_AVPs {
	QCI_6_E (6),//examle service=video(TCP based)		QCI_6_E (6),//examle service=video(TCP based)
	QCI_7_E (7),//examle service=voice,video(life streaming)		QCI_7_E (7),//examle service=voice,video(life streaming)
	QCI_8_E (8),//examle service=video(buffered streaming)		QCI_8_E (8),//examle service=video(buffered streaming)
	QCI_9_E (9)//examle service=video(buffered streaming)		QCI_9_E (9),//examle service=video(buffered streaming)
			Reserved2_E ( 10), // .. 127
			OperatorSpecific_E (128), // .. 254
			Reserved3_E (255)
	}		}
	with {		with {
	variant "length=32"		variant "length=32"

ttcn/LibDiameter_Types_S6a_AVPs.ttcn3

+8 −71

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,12 @@ module LibDiameter_Types_S6a_AVPs {
	import from LibDiameter_Types_CxDx_AVPs {		import from LibDiameter_Types_CxDx_AVPs {
	type Visited_Network_Identifier_AVP		type Visited_Network_Identifier_AVP
	};		};
			import from LibDiameter_Types_Gx_AVPs {
			type QoS_Class_Identifier_AVP, Pre_emption_Capability_AVP, Pre_emption_Vulnerability_AVP, Priority_Level_AVP, Allocation_Retention_Priority_AVP;
			};
			import from LibDiameter_Types_Rx_AVPs {
			type Max_Requested_Bandwidth_UL_AVP, Max_Requested_Bandwidth_DL_AVP;
			};
	import from LibCommon_DataStrings {		import from LibCommon_DataStrings {
	type Oct3		type Oct3
	};		};
	@@ -148,12 +154,6 @@ module LibDiameter_Types_S6a_AVPs {
	set of AVP_Type aVP_Type optional		set of AVP_Type aVP_Type optional
	}		}

	// TODO: When S6a upgrade or corrections will be in progress. import this type from LibDiameter_Types_CxDx_AVPs.ttcn module
	// type record Visited_Network_Identifier_AVP { //ref: 7.3.105 - TS 129 229 6.3.1
	// AVP_Header aVP_Header, //Visited-Network-Identifier ::= <AVP header: 600>
	// octetstring aVP_Data
	// }

	type record Specific_APN_Info_AVP { //ref: 7.3.82		type record Specific_APN_Info_AVP { //ref: 7.3.82
	AVP_Header aVP_Header, //Specific-APN-Info ::= <AVP header: 1472 10415>		AVP_Header aVP_Header, //Specific-APN-Info ::= <AVP header: 1472 10415>
	Service_Selection_AVP service_Selection,		Service_Selection_AVP service_Selection,
	@@ -363,20 +363,10 @@ module LibDiameter_Types_S6a_AVPs {
	set of AVP_Type aVP_Type optional		set of AVP_Type aVP_Type optional
	}		}

	type record Max_Requested_Bandwidth_DL_AVP { //ref: TS 129 214 5.3.14
	AVP_Header aVP_Header, //Max-Requested-Bandwidth-DL ::= <AVP header: 515 10415>
	UInt32 aVP_Data
	}

	type record Max_Requested_Bandwidth_UL_AVP { //ref: TS 129 214 5.3.15
	AVP_Header aVP_Header, //Max-Requested-Bandwidth-UL ::= <AVP header: 516 10415>
	UInt32 aVP_Data
	}

	type record AMBR_AVP { //ref: 7.3.41		type record AMBR_AVP { //ref: 7.3.41
	AVP_Header aVP_Header, //AMBR ::= <AVP header: 1435 10415>		AVP_Header aVP_Header, //AMBR ::= <AVP header: 1435 10415>
	Max_Requested_Bandwidth_UL_AVP max_Requested_Bandwidth_UL,		Max_Requested_Bandwidth_UL_AVP max_Requested_Bw_Ul,//max_Requested_Bandwidth_UL,//max_Requested_Bw_Ul
	Max_Requested_Bandwidth_DL_AVP max_Requested_Bandwidth_DL,		Max_Requested_Bandwidth_DL_AVP max_Requested_Bw_Dl,//max_Requested_Bandwidth_DL,//max_Requested_Bw_Dl
	set of AVP_Type aVP_Type optional		set of AVP_Type aVP_Type optional
	}		}

	@@ -420,59 +410,6 @@ module LibDiameter_Types_S6a_AVPs {
	PDN_Type_Code pDN_Type_Code		PDN_Type_Code pDN_Type_Code
	}		}

	type enumerated QoS_Class_Identifier_Code {
	Reserved1_E ( 0),
	QCI_1_E ( 1),
	QCI_2_E ( 2),
	QCI_3_E ( 3),
	QCI_4_E ( 4),
	QCI_5_E ( 5),
	QCI_6_E ( 6),
	QCI_7_E ( 7),
	QCI_8_E ( 8),
	QCI_9_E ( 9),
	Reserved2_E ( 10), // .. 127
	OperatorSpecific_E (128), // .. 254
	Reserved3_E (255)
	}

	type record QoS_Class_Identifier_AVP { //ref: TS 129 212 5.3.17
	AVP_Header aVP_Header, //QoS-Class-Identifier ::= <AVP header: 1028 10415>
	QoS_Class_Identifier_Code qoS_Class_Identifier_Code
	}

	type record Priority_Level_AVP { //ref: TS 129 212 5.3.45
	AVP_Header aVP_Header, //Priority-Level ::= <AVP header: 1046 10415>
	UInt32 aVP_Data
	}

	type enumerated Pre_emption_Capability_Code {
	PRE_EMPTION_CAPABILITY_ENABLED_E (0),
	PRE_EMPTION_CAPABILITY_DISABLED_E (1)
	}

	type record Pre_emption_Capability_AVP { //ref: TS 129 212 5.3.46
	AVP_Header aVP_Header, //Pre-emption-Capability ::= <AVP header: 1047 10415>
	Pre_emption_Capability_Code pre_emption_Capability
	}

	type enumerated Pre_emption_Vulnerability_Code {
	PRE_EMPTION_VULNERABILITY_ENABLED_E (0),
	PRE_EMPTION_VULNERABILITY_DISABLED_E (1)
	}

	type record Pre_emption_Vulnerability_AVP { //ref: TS 129 212 5.3.47
	AVP_Header aVP_Header, //Pre-emption-Vulnerability ::= <AVP header: 1048 10415>
	Pre_emption_Vulnerability_Code pre_emption_Vulnerability
	}

	type record Allocation_Retention_Priority_AVP { //ref: TS 129 212 5.3.32
	AVP_Header aVP_Header, //Allocation-Retention-Priority ::= < AVP Header: 1034 10415>
	Priority_Level_AVP priority_Level,
	Pre_emption_Capability_AVP pre_emption_Capability optional,
	Pre_emption_Vulnerability_AVP pre_emption_Vulnerability optional
	}

	type record EPS_Subscribed_QoS_Profile_AVP { //ref: 7.3.37		type record EPS_Subscribed_QoS_Profile_AVP { //ref: 7.3.37
	AVP_Header aVP_Header, //EPS-Subscribed-QoS-Profile ::= <AVP header: 1431 10415>		AVP_Header aVP_Header, //EPS-Subscribed-QoS-Profile ::= <AVP header: 1431 10415>
	QoS_Class_Identifier_AVP qoS_Class_Identifier,		QoS_Class_Identifier_AVP qoS_Class_Identifier,

Admin message