Compiler issues fixed (e448a0a0) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterShDh

ttcn/DiameterShDh_TCFunctions.ttcn3

+40 −42

Original line number	Original line	Diff line number	Diff line
	@@ -159,8 +159,7 @@ module DiameterShDh_TCFunctions {
	mw_experimentalResult(DIAMETER_ERROR_USER_DATA_CANNOT_BE_READ_E),		mw_experimentalResult(DIAMETER_ERROR_USER_DATA_CANNOT_BE_READ_E),
	vc_originHost_IUT, // containing an Origin-Host AVP		vc_originHost_IUT, // containing an Origin-Host AVP
	vc_originRealm_IUT		vc_originRealm_IUT
	))		)));
	);

	f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

	@@ -193,7 +192,6 @@ module DiameterShDh_TCFunctions {
	)		)
	);		);


	f_awaiting_UDA(		f_awaiting_UDA(
	mdw_uDA(		mdw_uDA(
	vc_sessionId, // containing a Session-ID AVP		vc_sessionId, // containing a Session-ID AVP
	@@ -201,9 +199,7 @@ module DiameterShDh_TCFunctions {
	mw_experimentalResult(DIAMETER_ERROR_USER_UNKNOWN_E),		mw_experimentalResult(DIAMETER_ERROR_USER_UNKNOWN_E),
	vc_originHost_IUT, // containing an Origin-Host AVP		vc_originHost_IUT, // containing an Origin-Host AVP
	vc_originRealm_IUT		vc_originRealm_IUT
	))		)));
	);


	f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

	@@ -242,8 +238,7 @@ module DiameterShDh_TCFunctions {
	mw_experimentalResult(DIAMETER_ERROR_IDENTITIES_DONT_MATCH_E),		mw_experimentalResult(DIAMETER_ERROR_IDENTITIES_DONT_MATCH_E),
	vc_originHost_IUT, // containing an Origin-Host AVP		vc_originHost_IUT, // containing an Origin-Host AVP
	vc_originRealm_IUT		vc_originRealm_IUT
	))		)));
	);

	f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

	@@ -360,7 +355,9 @@ module DiameterShDh_TCFunctions {
	mdw_uDA(		mdw_uDA(
	vc_sessionId, // containing a Session-ID AVP		vc_sessionId, // containing a Session-ID AVP
	mdw_udaBodyExperimentalAvps(		mdw_udaBodyExperimentalAvps(
	mw_experimentalResult(DIAMETER_USER_DATA_NOT_AVAILABLE_E),		mw_experimentalResult(
			DIAMETER_USER_DATA_NOT_AVAILABLE_E
			),
	vc_originHost_IUT, // containing an Origin-Host AVP		vc_originHost_IUT, // containing an Origin-Host AVP
	vc_originRealm_IUT		vc_originRealm_IUT
	))		))
	@@ -757,8 +754,10 @@ module DiameterShDh_TCFunctions {
	mdw_pUA(		mdw_pUA(
	vc_sessionId, // containing a Session-ID AVP		vc_sessionId, // containing a Session-ID AVP
	mdw_puaBodyAvps(		mdw_puaBodyAvps(
	*,		?,
	mw_experimentalResult((DIAMETER_ERROR_USER_DATA_CANNOT_BE_MODIFIED_E)),		mw_experimentalResult(
			DIAMETER_ERROR_USER_DATA_CANNOT_BE_MODIFIED_E
			),
	vc_originHost_IUT, // containing an Origin-Host AVP		vc_originHost_IUT, // containing an Origin-Host AVP
	vc_originRealm_IUT		vc_originRealm_IUT
	))		))
	@@ -880,17 +879,16 @@ module DiameterShDh_TCFunctions {
	vc_destinationRealm, // containing a Destination-Realm AVP		vc_destinationRealm, // containing a Destination-Realm AVP
	m_msisdn_user_Identity (		m_msisdn_user_Identity (
	m_MSISDN_user_identity(char2oct(PX_PublicUser_MSISDN))		m_MSISDN_user_identity(char2oct(PX_PublicUser_MSISDN))
	)		))));
	)
	)
	);

	f_awaiting_PUA(		f_awaiting_PUA(
	mdw_pUA(		mdw_pUA(
	vc_sessionId, // containing a Session-ID AVP		vc_sessionId, // containing a Session-ID AVP
	mdw_puaBodyAvps(		mdw_puaBodyAvps(
	*,		?,
	mw_experimentalResult(DIAMETER_ERROR_OPERATION_NOT_ALLOWED_E),		mw_experimentalResult(
			DIAMETER_ERROR_OPERATION_NOT_ALLOWED_E
			),
	vc_originHost_IUT, // containing an Origin-Host AVP		vc_originHost_IUT, // containing an Origin-Host AVP
	vc_originRealm_IUT		vc_originRealm_IUT
	))		))

ttcn/DiameterShDh_Templates.ttcn3

+9 −16

Original line number	Original line	Diff line number	Diff line
	@@ -598,19 +598,12 @@ module DiameterShDh_Templates {
	origin_Realm := p_originRealm		origin_Realm := p_originRealm
	} // End of template mdw_udaBodyAvps		} // End of template mdw_udaBodyAvps

	template Experimental_Result_Code_AVP m_experimentalResultCode(		template (present) Experimental_Result_AVP mw_experimentalResult(
	template (present) Experimental_Result_Type p_avpData
	) := {
	aVP_Header := m_aVP_HeaderVid_Mbit1(c_experimental_Result_Code_AVP_Code, 4, omit),
	aVP_Data := p_avpData
	}

	template Experimental_Result_AVP mw_experimentalResult(
	template (present) Experimental_Result_Type p_expResultCode		template (present) Experimental_Result_Type p_expResultCode
	) := {		) := {
	aVP_Header := m_aVP_HeaderVid_Mbit1(c_experimental_Result_AVP_Code, 24, omit),		aVP_Header := m_aVP_HeaderVid_Mbit1(c_experimental_Result_AVP_Code, 24, omit),
	vendor_Id := m_vendorId(c_vendId3gpp),		vendor_Id := m_vendorId(c_vendId3gpp),
	experimental_Result_Code := m_experimentalResultCode(p_expResultCode)		experimental_Result_Code := mw_experimentalResultCode(p_expResultCode)
	}		}