Align DiameterS6a code with changes introduced into LibDiameter (458a859d) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterS6a

DiameterS6a/ttcn/DiameterS6a_PIXITS.ttcn

+5 −2

Original line number	Diff line number	Diff line
		@@ -15,9 +15,12 @@ module DiameterS6a_PIXITS {
		};

		// LibDiameter
		import from LibDiameter_TypesAndValues {
		import from LibDiameter_Types_Base_AVPs {
		type
		IpAddress, RAT_Type, Diameter_Identity, UTF8String
		IpAddress, Diameter_Identity, UTF8String
		};
		import from LibDiameter_Types_Gx_AVPs {
		type RAT_Type
		};

		// DiameterS6a

DiameterS6a/ttcn/DiameterS6a_Templates.ttcn

+28 −17

Original line number	Diff line number	Diff line
		@@ -20,11 +20,7 @@ module DiameterS6a_Templates {

		// LibDiameter
		import from LibDiameter_TypesAndValues {
		type Command_Flags, Diameter_Identity, UTF8String, RAT_Type_AVP, Destination_Host_AVP,
		Destination_Realm_AVP, Origin_Host_AVP, Origin_Realm_AVP, Session_Id_AVP,
		Auth_Session_State_AVP, User_Name_AVP, RAT_Type,
		Result_Code_Type, Experimental_Result_Type, Result_Code_AVP, Experimental_Result_AVP, Experimental_Result_Code_AVP,
		IpAddress, UTF8String;
		type all;
		const c_versionId, c_vendId3gpp, c_destination_Host_AVP_Code, c_destination_Realm_AVP_Code,
		c_origin_Host_AVP_Code, c_origin_Realm_AVP_Code, c_session_Id_AVP_Code, c_rAT_Type_AVP_Code,
		c_result_Code_AVP_Code, c_experimental_Result_AVP_Code, c_experimental_Result_Code_AVP_Code
		@@ -32,9 +28,16 @@ module DiameterS6a_Templates {
		import from LibDiameter_Templates {
		template m_sessionId_dummy, m_auth_Session_State_dummy, m_originHost_dummy, m_originRealm_dummy,
		m_destinationRealm_dummy, m_destinationHost_dummy, m_user_Name_dummy, m_aVP_HeaderVid_Mbit1, m_cmdFlagsReq,
		m_vendor_Specific_Appl_Id_dummy, m_auth_Session_State_dummy, m_destinationRealm_dummy, m_user_Identity_dummy, m_data_Reference_dummy, m_user_Data_dummy,
		mw_cmdFlags, m_cmdFlagsAns,
		m_aVP_Header_Mbit1, m_aVP_HeaderVid_Mbit0
		};
		import from LibDiameter_Types_Base_AVPs {
		type all
		};
		import from LibDiameter_Types_Gx_AVPs {
		type RAT_Type, RAT_Type_AVP
		};

		// DiameterS6a
		import from DiameterS6a_TypesAndValues all;
		@@ -467,15 +470,18 @@ module DiameterS6a_Templates {
		} // End of template m_S6a_PUR_dummy

		template (value) PUR_Body_AVP m_S6a_PUR_Body_dummy := {
		vendor_Specific_Application_Id := omit,
		vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_dummy,
		auth_Session_State := m_auth_Session_State_dummy,
		origin_Host := m_originHost_dummy,
		origin_Realm := m_originRealm_dummy,
		destination_Host := omit,
		destination_Realm := m_destinationRealm_dummy,
		user_Name := m_user_Name_dummy,
		pUR_Flags := omit,
		supported_Features := omit,
		user_Identity := m_user_Identity_dummy,
		wildcarded_PSI := omit,
		wildcarded_IMPU := omit,
		data_Reference := m_data_Reference_dummy,
		user_Data := m_user_Data_dummy,
		proxy_Info := omit,
		route_Record := omit,
		aVP_Type := omit
		@@ -661,15 +667,18 @@ module DiameterS6a_Templates {
		} // End of template mw_S6a_PUR_dummy

		template (present) PUR_Body_AVP mw_S6a_PUR_Body_dummy := {
		vendor_Specific_Application_Id := *,
		vendor_Specific_Application_Id := ?,
		auth_Session_State := ?,
		origin_Host := ?,
		origin_Realm := ?,
		destination_Host := *,
		destination_Realm := ?,
		user_Name := ?,
		pUR_Flags := *,
		supported_Features := *,
		user_Identity := ?,
		wildcarded_PSI := *,
		wildcarded_IMPU := *,
		data_Reference := ?,
		user_Data := ?,
		proxy_Info := *,
		route_Record := *,
		aVP_Type := *
		@@ -847,15 +856,16 @@ module DiameterS6a_Templates {
		} // End of template m_S6a_PUA_dummy

		template (value) PUA_Body_AVP m_S6a_PUA_Body_dummy := {
		vendor_Specific_Application_Id := omit,
		vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_dummy,
		supported_Features := omit,
		result_Code := omit,
		experimental_Result := omit,
		auth_Session_State := m_auth_Session_State_dummy,
		origin_Host := m_originHost_dummy,
		origin_Realm := m_originRealm_dummy,
		pUA_Flags := omit,
		failed_AVP := omit,
		wildcarded_PSI := omit,
		wildcarded_IMPU := omit,
		failed := omit,
		proxy_Info := omit,
		route_Record := omit,
		aVP_Type := omit
		@@ -1022,15 +1032,16 @@ module DiameterS6a_Templates {
		pUA_Body := mw_S6a_PUA_Body_dummy
		}
		template (present) PUA_Body_AVP mw_S6a_PUA_Body_dummy := {
		vendor_Specific_Application_Id := *,
		vendor_Specific_Application_Id := ?,
		supported_Features := *,
		result_Code := *,
		experimental_Result := *,
		auth_Session_State := ?,
		origin_Host := ?,
		origin_Realm := ?,
		pUA_Flags := *,
		failed_AVP := *,
		wildcarded_PSI := *,
		wildcarded_IMPU := *,
		failed := *,
		proxy_Info := *,
		route_Record := *,
		aVP_Type := *

DiameterS6a/ttcn/DiameterS6a_TestSystem.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ module DiameterS6a_TestSystem {
		};

		// LibDiameter
		import from LibDiameter_TypesAndValues {
		import from LibDiameter_Types_Base_AVPs {
		type
		Session_Id_AVP, Origin_Host_AVP, Origin_Realm_AVP,
		Destination_Host_AVP

DiameterS6a/ttcn/DiameterS6a_TypesAndValues.ttcn

+1678 −1695

Original line number	Diff line number	Diff line
		@@ -12,9 +12,20 @@
		*/
		module DiameterS6a_TypesAndValues {

		// LibCommon
		import from LibCommon_BasicTypesAndValues all;
		import from LibCommon_DataStrings all;
		import from LibDiameter_TypesAndValues all;

		// LibDiameter
		import from LibDiameter_Types_Base_AVPs {
		type all
		};
		import from LibDiameter_TypesAndValues {
		type Command_Flags, PUR_Body_AVP, PUA_Body_AVP
		};
		import from LibDiameter_Types_Gx_AVPs {
		type RAT_Type_AVP
		};

		group BasicTypesAndConstants {
		group DiameterS6aConstants {
		@@ -1704,20 +1715,6 @@ group HeaderAndBodyTypes {
		Session_Id_AVP session_Id, //
		PUR_Body_AVP pUR_Body
		}
		type set PUR_Body_AVP {
		Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
		Auth_Session_State_AVP auth_Session_State,
		Origin_Host_AVP origin_Host,
		Origin_Realm_AVP origin_Realm,
		Destination_Host_AVP destination_Host optional,
		Destination_Realm_AVP destination_Realm,
		User_Name_AVP user_Name,
		PUR_Flags_AVP pUR_Flags optional,
		set of Supported_Features_AVP supported_Features optional,
		set of Proxy_Info_AVP proxy_Info optional,
		set of Route_Record_AVP route_Record optional,
		set of AVP_Type aVP_Type optional
		}

		// Purge-UE-Answer (PUA) Command - Ref: TS 129 272 7.2.14
		type record S6a_PUA_MSG {
		@@ -1725,20 +1722,6 @@ group HeaderAndBodyTypes {
		Session_Id_AVP session_Id, //
		PUA_Body_AVP pUA_Body
		}
		type set PUA_Body_AVP {
		Vendor_Specific_Appl_Id_AVP vendor_Specific_Application_Id optional,
		set of Supported_Features_AVP supported_Features optional,
		Result_Code_AVP result_Code optional,
		Experimental_Result_AVP experimental_Result optional,
		Auth_Session_State_AVP auth_Session_State,
		Origin_Host_AVP origin_Host,
		Origin_Realm_AVP origin_Realm,
		PUA_Flags_AVP pUA_Flags optional,
		set of Failed_AVP failed_AVP optional,
		set of Proxy_Info_AVP proxy_Info optional,
		set of Route_Record_AVP route_Record optional,
		set of AVP_Type aVP_Type optional
		}

		// Reset-Request (RSR) Command - Ref: TS 129 272 7.2.15
		type record RSR_MSG {