Merge branch 'develop' of https://forge.etsi.org/gitlab/DIAMETER/DiameterShDh into develop (f4004145) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterShDh

ttcn/DiameterShDh_PIXITS.ttcn3

+13 −5

Original line number	Original line	Diff line number	Diff line
	@@ -140,8 +140,16 @@ module DiameterShDh_PIXITS {
	/** @desc UTF8String		/** @desc UTF8String
	* TODO		* TODO
	*/		*/
	modulepar charstring PX_public_user_identity := "origin.etsi.org"		modulepar charstring PX_PublicUserIdentity := "origin.etsi.org";
			/** @desc UTF8String
			* TODO
			*/
			modulepar charstring PX_NotExistingUserIdentity := "origin.etsi2.org";

			/** @desc UTF8String
			* TODO
			*/
			modulepar charstring PX_NotRelatedPrivateIdentity := "foo";
	} // End of group DiameterCommonShDhData		} // End of group DiameterCommonShDhData

	group SipParameters {		group SipParameters {

ttcn/DiameterShDh_TCFunctions.ttcn3

+48 −2

Original line number	Original line	Diff line number	Diff line
	@@ -155,7 +155,31 @@ module DiameterShDh_TCFunctions {
	f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
	log("* " & __SCOPE__ & ": INFO: Preamble done. *");		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

	//TODO TestBody
			f_send_UDR(
			md_uDR(
			vc_sessionId,
			md_udrBodyAvps(
			vc_originHost, // containing an Origin-Host AVP
			vc_originRealm, // containing an Origin-Realm AVP
			vc_destinationRealm, // containing a Destination-Realm AVP
			m_specific_user_Identity (
			m_public_user_identity(PX_NotExistingUserIdentity)
			)
			)
			)
			);

			f_awaiting_UDA(
			mdw_uDA(
			vc_sessionId, // containing a Session-ID AVP
			mdw_udaBodyAvps(
			mw_resultCode(DIAMETER_ERROR_USER_UNKNOWN_E),
			vc_originHost_IUT, // containing an Origin-Host AVP
			vc_originRealm_IUT
			))
			);


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

	@@ -173,7 +197,29 @@ module DiameterShDh_TCFunctions {
	f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
	log("* " & __SCOPE__ & ": INFO: Preamble done. *");		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

	//TODO TestBody		f_send_UDR(
			md_uDR(
			vc_sessionId,
			md_udrBodyAvps(
			vc_originHost, // containing an Origin-Host AVP
			vc_originRealm, // containing an Origin-Realm AVP
			vc_destinationRealm, // containing a Destination-Realm AVP
			m_specific_user_Identity (
			m_public_user_identity(PX_NotRelatedPrivateIdentity)
			)
			)
			)
			);

			f_awaiting_UDA(
			mdw_uDA(
			vc_sessionId, // containing a Session-ID AVP
			mdw_udaBodyAvps(
			mw_resultCode(DIAMETER_ERROR_IDENTITIES_DONT_MATCH_E),
			vc_originHost_IUT, // containing an Origin-Host AVP
			vc_originRealm_IUT
			))
			);

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

ttcn/DiameterShDh_Templates.ttcn3

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -85,7 +85,7 @@ module DiameterShDh_Templates {


	template (value) Public_Identity_AVP m_public_user_identity (		template (value) Public_Identity_AVP m_public_user_identity (
	in template (value) charstring p_public_user_identity := PX_public_user_identity		in template (value) charstring p_public_user_identity := PX_PublicUserIdentity
	) := {		) := {
	aVP_Header := m_aVP_Header_Mbit1(c_wildcarded_Public_Identity_AVP_Code),		aVP_Header := m_aVP_Header_Mbit1(c_wildcarded_Public_Identity_AVP_Code),
	aVP_Data := p_public_user_identity		aVP_Data := p_public_user_identity