Correction of some warnings (112c7cae) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterS6a

DiameterS6a/ttcn/DiameterS6a_MME_TCFunctions.ttcn3

+4 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ module DiameterS6a_MME_TCFunctions {
		import from LibCommon_BasicTypesAndValues {
		type UInt32
		}; //import from LibCommon_VerdictControl all;
		import from LibCommon_DataStrings all;

		// LibDiameter
		import from LibDiameter_Steps {
		@@ -691,7 +692,8 @@ module DiameterS6a_MME_TCFunctions {

		// Local variables
		var Auth_Session_State_AVP v_noStateMaintained := md_auth_Session_State_noStateMaintained;
		const bitstring c_partialPurgeFeature := '10000000000000000000000000000'B;
		const Bit32 c_partialPurgeFeature := '00010000000000000000000000000000'B;
		const UInt32 c_partialPurgeFeatureInt := 536870911;
		var PUER_Flags_AVP v_pUER_Flags;
		var PUER_MSG v_puerMsg;
		var UInt32 v_purge;
		@@ -706,7 +708,7 @@ module DiameterS6a_MME_TCFunctions {

		// Test Body
		// Clause 'when'
		v_purge := bit2int(c_partialPurgeFeature);
		v_purge := c_partialPurgeFeatureInt;
		f_send_ULA(m_S6a_ULA(m_S6a_ULA_Body
		( {m_supportedFeatures ( m_vendorId(c_vendId3gpp), m_featureListId(0), m_featureList( v_purge ), omit)} )
		));

DiameterS6a/ttcn/DiameterS6a_Steps.ttcn3

+2 −2

Original line number	Diff line number	Diff line
		@@ -70,8 +70,8 @@

		vc_hostIPAddress := valueof(f_IPV4or6_String2Address (PX_DIAMETER_S6a_ETS_IPADDR));

		vc_send_hopid:=hex2int('00000100'H);
		vc_send_endid:=hex2int('01000000'H);
		vc_send_hopid:= 4; //hex2int('00000100'H);
		vc_send_endid:= 1048575; //hex2int('01000000'H);

		} // End of function f_DiameterGx_init

DiameterS6a/ttcn/DiameterS6a_Templates.ttcn

+18 −3

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ module DiameterS6a_Templates {
		c_result_Code_AVP_Code, c_experimental_Result_AVP_Code, c_experimental_Result_Code_AVP_Code
		};
		import from LibDiameter_Templates {
		function f_IPAdressLengthUInt24, f_getDiameterIdentityAvpLength, f_getUTF8StringLength, f_getCharStringLength, f_getOctetStringLength, f_getEncvalueLength
		function f_aVPvBit, f_IPAdressLengthUInt24, f_getDiameterIdentityAvpLength, f_getUTF8StringLength, f_getCharStringLength, f_getOctetStringLength, f_getEncvalueLength
		template m_diameterHeaderReq_dummy, mw_diameterHeaderReq_dummy, mw_diameterHeaderAns_dummy, m_diameterHeaderAns_dummy,
		m_sessionId_dummy, m_auth_Session_State_dummy, m_originHost_dummy, m_originRealm_dummy, mw_supportedFeatures_dummy,
		m_destinationRealm_dummy, m_destinationHost_dummy, m_user_Name_dummy, m_aVP_HeaderVid_Mbit1, m_cmdFlagsReq,
		@@ -72,6 +72,21 @@ module DiameterS6a_Templates {
		reserved_bits := '0000'B
		} // End of template mw_diameterHeaderAns_dummy

		/**
		* @desc complete AVP header field receive template
		* @param p_avpCode specific Code of the AVP parameter
		* @param p_avpVid vendor id if needed
		*/
		template (present) AVP_Header mw_aVP_S6a_HeaderVid_Mbit1( in AVP_Code p_avpCode, in template (present) AVP_Vendor_ID p_avpVid) := {
		aVP_Code := p_avpCode,
		aVP_flags := {v_bit := f_aVPvBit(p_avpVid),
		m_bit := '1'B,
		p_bit := ?,
		reserved_bits := '00000'B},
		aVP_len := ?,
		aVP_vid := p_avpVid
		}

		/** AVPs basic templates for send and receive */
		group DummyAVPHeaders{

		@@ -1645,7 +1660,7 @@ module DiameterS6a_Templates {
		* @param p_aVP_Data The PUEA_Flags value
		*/
		template (value) PUEA_Flags_AVP mw_pueaFlags ( in template UInt32 p_aVP_Data ):= {
		aVP_Header := mw_aVP_HeaderVid_Mbit1 (c_pua_Flags_AVP_Code, ?, c_vendId3gpp ),
		aVP_Header := mw_aVP_S6a_HeaderVid_Mbit1 (c_pua_Flags_AVP_Code, c_vendId3gpp ),
		aVP_Data := p_aVP_Data
		} // End of template m_pueaFlags

		@@ -1653,7 +1668,7 @@ module DiameterS6a_Templates {
		* @desc Received generic CLR Flags AVP template
		*/
		template (value) CLR_Flags_AVP mw_clrFlags := {
		aVP_Header := mw_aVP_HeaderVid_Mbit1 ( c_clr_Flags_AVP_Code, ?, c_vendId3gpp ),
		aVP_Header := mw_aVP_S6a_HeaderVid_Mbit1 ( c_clr_Flags_AVP_Code, c_vendId3gpp ),
		aVP_Data := 1
		} // End of template m_clrFlags_dummy

DiameterS6a/ttcn/DiameterS6a_TestConfiguration.ttcn3

+7 −6

Original line number	Diff line number	Diff line
		@@ -25,9 +25,10 @@ module DiameterS6a_TestConfiguration {
		import from DiameterS6a_PICS {
		modulepar PX_MME_IUT_SUPPORT_NAS_PROTOCOL
		};
		import from DiameterS6a_TestSystem {
		type DiameterS6a
		};
		import from DiameterS6a_TestSystem all;
		// import from DiameterS6a_TestSystem {
		// type DiameterS6a
		// };

		/**
		* @desc f_NrofComps returns the number of test components based on the PIXIT value PX_MME_IUT_SUPPORT_NAS_PROTOCOL
		@@ -51,7 +52,7 @@ module DiameterS6a_TestConfiguration {
		function f_cf_1S6aUp_MME (
		out DiameterComponent p_diameterS6a_hss,
		out DiameterComponent p_diameterS6a_eNodeB
		) runs on DiameterS6a {
		) runs on DiameterS6a system TestAdapter {
		// Create
		p_diameterS6a_hss := DiameterComponent.create;
		if (PX_MME_IUT_SUPPORT_NAS_PROTOCOL == true) {
		@@ -78,7 +79,7 @@ module DiameterS6a_TestConfiguration {
		*/
		function f_cf_1S6aUp_HSS (
		out DiameterComponent v_diameterS6a_mme
		) runs on DiameterS6a {
		) runs on DiameterS6a system TestAdapter {
		// Create
		v_diameterS6a_mme := DiameterComponent.create;
		// Map port
		@@ -98,7 +99,7 @@ module DiameterS6a_TestConfiguration {
		*/
		function f_cf_2S6aUp_HSS (
		out DiameterComponent v_diameterS6a_mme
		) runs on DiameterS6a {
		) runs on DiameterS6a system TestAdapter {
		// Create
		v_diameterS6a_mme := DiameterComponent.create;
		// Map port

Admin message