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

LibDiameter @ 6b92bc06

Original line number	Diff line number	Diff line
		Subproject commit 8b6b124f1189f5761a55f5ae8c18667ed268c659
		Subproject commit 6b92bc069b05ddd1cb2005449b35c0bc0a0ca0eb

ttcn/DiameterShDh_PIXITS.ttcn3

+8 −0

Original line number	Diff line number	Diff line
		@@ -205,6 +205,14 @@ module DiameterShDh_PIXITS {
		*/
		modulepar TServiceData PX_Service_Data_unexpected := {elem:="1"}

		group DiameterTimers {

		/** @desc float for TWait default value for waiting an expiration period (cp. TP_SH_HSS_SN_07)
		*/
		modulepar float PX_DIAMETER_EXP_TImer := 120.0;

		}

		} // End of group DiameterCommonShDhData

		group SipParameters {

ttcn/DiameterShDh_TCFunctions.ttcn3

+51 −3

Original line number	Diff line number	Diff line
		@@ -1944,12 +1944,11 @@ module DiameterShDh_TCFunctions {
		m_MSISDN_user_identity(char2oct(PX_PublicUserIdentity))
		),
		m_data_Reference(DSAI_E), // containing a Data-Reference AVP
		m_expiry_Time_AVP(120) // indicating not matching DSAI
		m_expiry_Time_AVP(float2int(PX_DIAMETER_EXP_TImer)) // indicating not matching DSAI

		))
		);

		t1.start (120.0);

		f_awaiting_SNA(
		mdw_sNA(
		@@ -1958,11 +1957,18 @@ module DiameterShDh_TCFunctions {
		mw_resultCode(DIAMETER_SUCCESS_E),
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT,
		mw_expiry_Time_AVP(120)
		mw_expiry_Time_AVP(float2int(PX_DIAMETER_EXP_TImer))
		))

		);

		t1.start (PX_DIAMETER_EXP_TImer);
		alt{
		[] DIAMP.receive(DIAMETER_MSG:{pNR_MSG:=mdw_pNR(vc_sessionId, mdw_pnrBodyAvps(?,?,?) )})
		{ setverdict(pass)}
		[] t1.timeout { setverdict(fail); t1.start (PX_DIAMETER_EXP_TImer); }
		}

		// f_awaiting_PNA(mdw_pNR(vc_sessionId, mdw_pnrBodyAvps(?,?,?)));
		alt{
		[] DIAMP.receive(DIAMETER_MSG:{pNR_MSG:=mdw_pNR(vc_sessionId, mdw_pnrBodyAvps(?,?,?) )})
		@@ -3179,6 +3185,48 @@ module DiameterShDh_TCFunctions {

		} // End of function f_TC_DH_AS_SN_01()

		function f_TC_DH_AS_SN_01_HSS() runs on DiameterShDh {
		// Local variables

		// Preamble
		f_preamble_Dh_SLF();
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

		f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

		f_awaiting_SNR(
		mdw_sNR(
		?, // containing a Session-ID AVP
		mdw_snrBodyAvps(
		?,
		?,
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT, // containing an Origin-Realm AVP
		vc_destinationRealm_IUT ,
		?,
		?,
		?
		)));

		f_send_SNA(
		md_sNA(
		vc_sessionId,
		md_snaBodyAvps(
		m_resultCode(DIAMETER_SUCCESS_E),
		vc_originHost,
		vc_originRealm
		)));


		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		f_postamble_Dh_SLF();
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
		log("* " & __SCOPE__ & ": INFO: Postamble done. *");

		} // End of function f_TC_DH_AS_SN_01_HSS()


		} // End of group TP_ASRole_SubscriptionNotification