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

LibDiameter @ 03e99fe0

Original line number	Diff line number	Diff line
		Subproject commit 8ae64e39ccce0fefa8258e6a69bb33909f5fef47
		Subproject commit 03e99fe0ee4b9466a9de3a873359f8485863a3d9

ttcn/DiameterShDh_TCFunctions.ttcn3

+89 −5

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

		//TODO TestBody
		//TestBody
		f_send_PUR(
		md_pUR(
		vc_sessionId,
		md_purBodyAvps(
		m_auth_Session_State,
		vc_originHost, // containing an Origin-Host AVP
		vc_originRealm, // containing an Origin-Realm AVP
		vc_destinationHost, // containing an Destination-Host AVP
		vc_destinationRealm, // containing a Destination-Realm AVP
		m_msisdn_user_Identity (
		m_MSISDN_user_identity(char2oct(PX_PublicUser_MSISDN))
		),
		m_data_Reference(PSI_ACTIVATION_E),
		m_user_Data_dummy
		)
		)
		);

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

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

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

		//TODO TestBody
		//TestBody
		f_send_PUR(
		md_pUR(
		vc_sessionId,
		md_purBodyAvps(
		m_auth_Session_State,
		vc_originHost, // containing an Origin-Host AVP
		vc_originRealm, // containing an Origin-Realm AVP
		vc_destinationHost, // containing an Destination-Host AVP
		vc_destinationRealm, // containing a Destination-Realm AVP
		m_specific_user_Identity (
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(DSAI_E),
		m_user_Data_shImsData_dsai(char2oct("XMLProfile")) //TODO import XML Schema
		)
		)
		);

		f_awaiting_PUA(
		mdw_pUA(
		vc_sessionId, // containing a Session-ID AVP
		mdw_puaBodyAvps(
		mw_resultCode(DIAMETER_SUCCESS_E),
		*,
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT
		))
		);

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

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

		//TODO TestBody
		//TestBody
		f_send_PUR(
		md_pUR(
		vc_sessionId,
		md_purBodyAvps(
		m_auth_Session_State,
		vc_originHost, // containing an Origin-Host AVP
		vc_originRealm, // containing an Origin-Realm AVP
		vc_destinationHost, // containing an Destination-Host AVP
		vc_destinationRealm, // containing a Destination-Realm AVP
		m_specific_user_Identity (
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(DSAI_E),
		m_user_Data_dummy
		)
		)
		);

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

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

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

		// TestBody
		// // TestBody
		// f_send_SNR(
		// md_sNR(
		// vc_sessionId,

ttcn/DiameterShDh_Templates.ttcn3

+38 −0

Original line number	Diff line number	Diff line
		@@ -298,6 +298,44 @@ module DiameterShDh_Templates {

		} // End of group pur_msg

		group snr_msg {

		/**
		* @desc Send template for SNR
		* @param p_sessionId Session identifier
		* @param p_snrBody SNR message body
		*/
		template (value) SNR_MSG md_sNR(
		in template (value) Session_Id_AVP p_sessionId,
		in template (value) SNR_Body_AVP p_snrBody
		) modifies m_SNR_dummy := {
		header := m_diameterHeaderReq_dummy(SNR_E, c_applId3GPPShDh),
		session_Id := p_sessionId,
		sNR_Body := p_snrBody
		} // End of template md_sNR

		/**
		* @desc Send template for SNR message body
		*/
		template (value) SNR_Body_AVP md_snrBodyAvps(
		template (value) Origin_Host_AVP p_origin_Host,
		template (value) Origin_Realm_AVP p_origin_Realm,
		template (value) Destination_Realm_AVP p_destination_Realm,
		template (value) User_Identity_AVP p_user_Identity := m_user_Identity_dummy,
		template (value) Data_Reference_AVP p_data_Reference := m_data_Reference_dummy
		) modifies m_SNR_Body_dummy := {
		vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_Sh,//required only in TS129 229
		auth_Session_State := m_auth_Session_State_dummy,//TODO
		origin_Host := p_origin_Host,
		origin_Realm := p_origin_Realm,
		destination_Realm := p_destination_Realm,
		user_Identity := p_user_Identity,
		subs_Req_Type := m_subs_Req_Type_dummy,//TODO
		data_Reference := {m_data_Reference_dummy}//TODO
		} // End of template md_snrBodyAvps

		} // End of group snr_msg

		} // End of group Sh_request_message_templates_send

		group Sh_request_message_templates_receive {

ttcn/DiameterShDh_TestCases.ttcn3

+5 −1

Original line number	Diff line number	Diff line
		@@ -1775,7 +1775,11 @@ module DiameterShDh_TestCases {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);