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

DiameterS6a/ttcn/DiameterS6a_HSS_TCFunctions.ttcn3

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -99,7 +99,6 @@ module DiameterS6a_HSS_TCFunctions {
	vc_originRealm_IUT, // containing an Origin-Realm AVP		vc_originRealm_IUT, // containing an Origin-Realm AVP
	mdw_ula_Flags_AVP(1), // containing a ULA-Flags AVP with Separation-indicator bit set		mdw_ula_Flags_AVP(1), // containing a ULA-Flags AVP with Separation-indicator bit set
	mw_subscriptionData_dummy // containing a Subscription-Data AVP		mw_subscriptionData_dummy // containing a Subscription-Data AVP
	// TODO Set some fields in Subscription-Data AVP?
	)));		)));

	f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
	@@ -162,7 +161,6 @@ module DiameterS6a_HSS_TCFunctions {
	vc_originRealm_IUT, // containing an Origin-Realm AVP		vc_originRealm_IUT, // containing an Origin-Realm AVP
	mdw_ula_Flags_AVP(1), // containing a ULA-Flags AVP with Separation-indicator bit set		mdw_ula_Flags_AVP(1), // containing a ULA-Flags AVP with Separation-indicator bit set
	mw_subscriptionData_dummy // containing a Subscription-Data AVP		mw_subscriptionData_dummy // containing a Subscription-Data AVP
	// TODO Set some fields in Subscription-Data AVP?
	)));		)));

	f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
	@@ -1875,7 +1873,7 @@ module DiameterS6a_HSS_TCFunctions {
	? // containing IDR-Flags		? // containing IDR-Flags
	)));		)));

	v_iDR_Flags := vc_recvDiamMsg.iDR_MSG.iDR_Body.iDR_Flags;		v_iDR_Flags := valueof (vc_recvDiamMsg.iDR_MSG.iDR_Body.iDR_Flags);
	if(match(int2bit(v_iDR_Flags.aVP_Data, 32),'000000000000000000000000000?11??'B) or		if(match(int2bit(v_iDR_Flags.aVP_Data, 32),'000000000000000000000000000?11??'B) or
	match(int2bit(v_iDR_Flags.aVP_Data, 32),'000000000000000000000000000?01??'B) or		match(int2bit(v_iDR_Flags.aVP_Data, 32),'000000000000000000000000000?01??'B) or
	match(int2bit(v_iDR_Flags.aVP_Data, 32),'000000000000000000000000000?10??'B)		match(int2bit(v_iDR_Flags.aVP_Data, 32),'000000000000000000000000000?10??'B)
	@@ -1935,7 +1933,7 @@ module DiameterS6a_HSS_TCFunctions {
	? // containing IDR-Flags		? // containing IDR-Flags
	)));		)));

	v_iDR_Flags := vc_recvDiamMsg.iDR_MSG.iDR_Body.iDR_Flags;		v_iDR_Flags := valueof (vc_recvDiamMsg.iDR_MSG.iDR_Body.iDR_Flags);
	if(match(int2bit(v_iDR_Flags.aVP_Data, 32),'000000000000000000000000000???1?'B)		if(match(int2bit(v_iDR_Flags.aVP_Data, 32),'000000000000000000000000000???1?'B)
	){		){
	setverdict(pass, "T-ADS Data Request bit is set");		setverdict(pass, "T-ADS Data Request bit is set");

DiameterS6a/ttcn/DiameterS6a_MME_TCFunctions.ttcn3

+22 −15

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,9 @@ module DiameterS6a_MME_TCFunctions {
	const		const
	c_prDone, c_tbDone, c_poDone		c_prDone, c_tbDone, c_poDone
	};		};
	//import from LibCommon_VerdictControl all;		import from LibCommon_BasicTypesAndValues {
			type UInt32
			}; //import from LibCommon_VerdictControl all;

	// LibDiameter		// LibDiameter
	import from LibDiameter_Steps {		import from LibDiameter_Steps {
	@@ -29,9 +31,10 @@ module DiameterS6a_MME_TCFunctions {
	import from LibDiameter_Types_S6a_AVPs {		import from LibDiameter_Types_S6a_AVPs {
	type all		type all
	};		};
	import from LibDiameter_TypesAndValues {		import from LibDiameter_TypesAndValues all;
	type DIAMETER_MSG;		// import from LibDiameter_TypesAndValues {
	};		// type DIAMETER_MSG;
			// };
	import from LibDiameter_Templates {		import from LibDiameter_Templates {
	template m_resultCode_diameterSuccess, m_resultCode, m_supportedFeatures, m_featureList, m_featureListId, m_userName		template m_resultCode_diameterSuccess, m_resultCode, m_supportedFeatures, m_featureList, m_featureListId, m_userName
	};		};
	@@ -245,7 +248,7 @@ module DiameterS6a_MME_TCFunctions {
	// Clause 'then'		// Clause 'then'
	f_init_awaitULR_sendULA();		f_init_awaitULR_sendULA();

	f_selfOrClientSyncAndVerdict(c_sync1, e_success);		f_selfOrClientSyncAndVerdict(DiameterS6a_TypesAndValues.c_sync1, e_success);

	//awaiting second ULR		//awaiting second ULR
	f_awaiting_ULR( mdw_ULR(		f_awaiting_ULR( mdw_ULR(
	@@ -621,7 +624,7 @@ module DiameterS6a_MME_TCFunctions {
	mdw_pUERFlags(?) // containing an PUR_Flags_AVP		mdw_pUERFlags(?) // containing an PUR_Flags_AVP
	)));		)));

	v_pUER_Flags := vc_recvDiamMsg.pUER_MSG.pUER_Body.pUER_Flags;		v_pUER_Flags := valueof ( vc_recvDiamMsg.pUER_MSG.pUER_Body.pUER_Flags );
	if(match(int2bit(v_pUER_Flags.aVP_Data, 32),'000000000000000000000000000000?1'B)){		if(match(int2bit(v_pUER_Flags.aVP_Data, 32),'000000000000000000000000000000?1'B)){
	setverdict(pass, "UE Purged in MME is set");		setverdict(pass, "UE Purged in MME is set");
	}		}
	@@ -665,7 +668,7 @@ module DiameterS6a_MME_TCFunctions {
	mdw_pUERFlags(?) // containing an PUR_Flags_AVP		mdw_pUERFlags(?) // containing an PUR_Flags_AVP
	)));		)));

	v_pUER_Flags := vc_recvDiamMsg.pUER_MSG.pUER_Body.pUER_Flags;		v_pUER_Flags := valueof ( vc_recvDiamMsg.pUER_MSG.pUER_Body.pUER_Flags );
	if(match(int2bit(v_pUER_Flags.aVP_Data, 32),'00000000000000000000000000000011'B)){		if(match(int2bit(v_pUER_Flags.aVP_Data, 32),'00000000000000000000000000000011'B)){
	setverdict(pass, "UE Purged in MME is set");		setverdict(pass, "UE Purged in MME is set");
	}		}
	@@ -690,6 +693,8 @@ module DiameterS6a_MME_TCFunctions {
	var Auth_Session_State_AVP v_noStateMaintained := md_auth_Session_State_noStateMaintained;		var Auth_Session_State_AVP v_noStateMaintained := md_auth_Session_State_noStateMaintained;
	const bitstring c_partialPurgeFeature := '10000000000000000000000000000'B;		const bitstring c_partialPurgeFeature := '10000000000000000000000000000'B;
	var PUER_Flags_AVP v_pUER_Flags;		var PUER_Flags_AVP v_pUER_Flags;
			var PUER_MSG v_puerMsg;
			var UInt32 v_purge;

	// Preamble		// Preamble
	f_preamble_MME();		f_preamble_MME();
	@@ -701,8 +706,9 @@ module DiameterS6a_MME_TCFunctions {

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

	// Clause 'then'		// Clause 'then'
	@@ -715,7 +721,8 @@ module DiameterS6a_MME_TCFunctions {
	mdw_pUERFlags(?) // containing an PUR_Flags_AVP		mdw_pUERFlags(?) // containing an PUR_Flags_AVP
	)));		)));

	v_pUER_Flags := vc_recvDiamMsg.pUER_MSG.pUER_Body.pUER_Flags;		v_puerMsg := vc_recvDiamMsg.pUER_MSG;
			v_pUER_Flags := valueof ( v_puerMsg.pUER_Body.pUER_Flags);
	if((match(int2bit(v_pUER_Flags.aVP_Data, 32),'00000000000000000000000000000001'B)) or		if((match(int2bit(v_pUER_Flags.aVP_Data, 32),'00000000000000000000000000000001'B)) or
	(match(int2bit(v_pUER_Flags.aVP_Data, 32),'00000000000000000000000000000010'B))){		(match(int2bit(v_pUER_Flags.aVP_Data, 32),'00000000000000000000000000000010'B))){
	setverdict(pass, "UE Purged in MME or UE Purged in SGSN is set or ");		setverdict(pass, "UE Purged in MME or UE Purged in SGSN is set or ");
	@@ -1528,7 +1535,7 @@ module DiameterS6a_MME_TCFunctions {
	// Local variables		// Local variables
	var User_Name_AVP v_user_Name := m_userName ( PX_USR_NAME );		var User_Name_AVP v_user_Name := m_userName ( PX_USR_NAME );
	var Auth_Session_State_AVP v_noStateMaintained := md_auth_Session_State_noStateMaintained;		var Auth_Session_State_AVP v_noStateMaintained := md_auth_Session_State_noStateMaintained;
	var DSR_Flags_AVP v_dSR_Flags := m_dsrFlags ( bit2int('1000'B) ); // PDN subscription contexts Withdrawal (bit 3)		var DSR_Flags_AVP v_dSR_Flags := m_dsrFlags ( 8 ); // PDN subscription contexts Withdrawal (bit 3 '1000'B)
	var Result_Code_AVP v_resultCode := mw_resultCode(DIAMETER_UNABLE_TO_COMPLY_E);		var Result_Code_AVP v_resultCode := mw_resultCode(DIAMETER_UNABLE_TO_COMPLY_E);

	// Preamble		// Preamble
	@@ -1572,7 +1579,7 @@ module DiameterS6a_MME_TCFunctions {
	// Local variables		// Local variables
	var User_Name_AVP v_user_Name := m_userName ( PX_USR_NAME );		var User_Name_AVP v_user_Name := m_userName ( PX_USR_NAME );
	var Auth_Session_State_AVP v_noStateMaintained := md_auth_Session_State_noStateMaintained;		var Auth_Session_State_AVP v_noStateMaintained := md_auth_Session_State_noStateMaintained;
	var DSR_Flags_AVP v_dSR_Flags := m_dsrFlags ( bit2int('0010'B) ); // Complete APN Configuration Profile Withdrawal (bit 1)		var DSR_Flags_AVP v_dSR_Flags := m_dsrFlags ( 2 ); // Complete APN Configuration Profile Withdrawal (bit 1'0010'B)
	var Result_Code_AVP v_resultCode := mw_resultCode(DIAMETER_UNABLE_TO_COMPLY_E);		var Result_Code_AVP v_resultCode := mw_resultCode(DIAMETER_UNABLE_TO_COMPLY_E);

	// Preamble		// Preamble
	@@ -1725,8 +1732,8 @@ module DiameterS6a_MME_TCFunctions {
	)		)
	));		));

	v_reqEUTRAN := vc_recvDiamMsg.aIR_MSG.aIR_Body.req_EUTRAN_Auth_Info;		v_reqEUTRAN := valueof ( vc_recvDiamMsg.aIR_MSG.aIR_Body.req_EUTRAN_Auth_Info );
	v_reqUTRAN := vc_recvDiamMsg.aIR_MSG.aIR_Body.req_UTRAN_GERAN_Auth_Info;		v_reqUTRAN := valueof ( vc_recvDiamMsg.aIR_MSG.aIR_Body.req_UTRAN_GERAN_Auth_Info );

	if((match(v_reqEUTRAN, mw_reqEUTRANAuthInfo_ImRespPre(omit)) and (match(v_reqUTRAN, mw_reqUTRANGERANAuthInfo_ImRespPre(?)))) or		if((match(v_reqEUTRAN, mw_reqEUTRANAuthInfo_ImRespPre(omit)) and (match(v_reqUTRAN, mw_reqUTRANGERANAuthInfo_ImRespPre(?)))) or
	(match(v_reqEUTRAN, mw_reqEUTRANAuthInfo_ImRespPre(?)) and (match(v_reqUTRAN, mw_reqUTRANGERANAuthInfo_ImRespPre(omit))))		(match(v_reqEUTRAN, mw_reqEUTRANAuthInfo_ImRespPre(?)) and (match(v_reqUTRAN, mw_reqUTRANGERANAuthInfo_ImRespPre(omit))))
	@@ -1899,7 +1906,7 @@ module DiameterS6a_MME_TCFunctions {
	} else {		} else {
	action("the IUT is requested to indicate additional request for update location information");		action("the IUT is requested to indicate additional request for update location information");
	}		}
	f_selfOrClientSyncAndVerdict(c_sync1, e_success);		f_selfOrClientSyncAndVerdict(DiameterS6a_TypesAndValues.c_sync1, e_success);

	// Clause 'then': Nothing to do		// Clause 'then': Nothing to do
	f_selfOrClientSyncAndVerdict(c_tbDone, e_success);		f_selfOrClientSyncAndVerdict(c_tbDone, e_success);

DiameterS6a/ttcn/DiameterS6a_PIXITS.ttcn

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -144,19 +144,19 @@ module DiameterS6a_PIXITS {
	* @desc Stored MME identity and stored SGSN identity		* @desc Stored MME identity and stored SGSN identity
	* @see ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.10/5		* @see ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.10/5
	*/		*/
	modulepar UTF8String PX_STORED_MME_SGSN := "storedMmeStoredSgsn";		modulepar charstring PX_STORED_MME_SGSN := "storedMmeStoredSgsn";

	/**		/**
	* @desc Stored MME identity and not stored SGSN identity		* @desc Stored MME identity and not stored SGSN identity
	* @see ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.10/6		* @see ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.10/6
	*/		*/
	modulepar UTF8String PX_STORED_MME_NOT_SGSN := "storedMmeNotStoredSgsn";		modulepar charstring PX_STORED_MME_NOT_SGSN := "storedMmeNotStoredSgsn";

	/**		/**
	* @desc Stored MME identity and not stored SGSN identity		* @desc Stored MME identity and not stored SGSN identity
	* @see ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.10/7		* @see ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.10/7
	*/		*/
	modulepar UTF8String PX_STORED_SGSN_NOT_MME := "storedSgsnNotStoredMme";		modulepar charstring PX_STORED_SGSN_NOT_MME := "storedSgsnNotStoredMme";

	/**		/**
	* @desc The user name		* @desc The user name

DiameterS6a/ttcn/DiameterS6a_Templates.ttcn

+63 −63

File changed.

Preview size limit exceeded, changes collapsed.