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

LibDiameter @ 3f5dd03a

Original line number	Diff line number	Diff line
		Subproject commit 756510bbb241f944e87bbb71da2211ef7e740500
		Subproject commit 3f5dd03a50ea444f5704739b4fff7d9ffa80656b

ttcn/DiameterShDh_TCFunctions.ttcn3

+41 −13

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

		//TODO TestBody
		// 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_PublicUser_MSISDN)
		),
		m_data_Reference( // containing an Reference-Data AVP
		TADS_INFORMATION_E
		// indication TADS_INFORMATION_E
		)
		)
		)
		);

		f_awaiting_UDA(
		mdw_uDA(
		vc_sessionId, // containing a Session-ID AVP
		mdw_udaBodyAvps_user_Data(
		?,
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT, // containing an Origin-Realm AVP
		mw_user_Data( // containing an Uswr-Data AVP
		'00'O // indicating TADS information
		))));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		@@ -387,7 +415,7 @@ module DiameterShDh_TCFunctions {
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
		log("* " & __SCOPE__ & ": INFO: Postamble done. *");

		} // End of function f_TC_SH_HSS_UD_08()
		} // End of function f_TC_SH_HSS_UD_08

		function f_TC_SH_HSS_UD_09() runs on DiameterShDh {
		// Local variables
		@@ -1663,16 +1691,16 @@ module DiameterShDh_TCFunctions {
		)
		)
		);
		//
		// f_awaiting_SNA(
		// mdw_sNA(
		// vc_sessionId, // containing a Session-ID AVP
		// mdw_snaBodyAvps(
		// mw_resultCode(DIAMETER_SUCCESS_E),
		// vc_originHost_IUT, // containing an Origin-Host AVP
		// vc_originRealm_IUT
		// ))
		// );

		f_awaiting_SNA(
		mdw_sNA(
		vc_sessionId, // containing a Session-ID AVP
		mdw_snaBodyAvps(
		mw_resultCode(DIAMETER_SUCCESS_E),
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT
		))
		);

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

ttcn/DiameterShDh_Templates.ttcn3

+124 −5

Original line number	Diff line number	Diff line
		@@ -165,12 +165,18 @@ module DiameterShDh_Templates {
		aVP_Data := p_aVP_Data
		}

		template Repository_Data_ID_AVP mw_repository_data_id
		:= {
		template User_Data_AVP mw_user_Data(
		template (present) octetstring p_aVP_Data
		) modifies mw_user_Data_dummy_RFC := {
		aVP_Data := p_aVP_Data
		}

		template Repository_Data_ID_AVP mw_repository_data_id := {
		aVP_Header := mw_aVP_HeaderVid_Mbit1(c_repository_Data_Id_AVP_Code, ?, ?),
		service_Indication := ? ,
		sequence_Number := ?
		}

		} // End of group receivingTemplatesForAVPs

		} // End of group SpecificAVPHeaders
		@@ -369,7 +375,6 @@ module DiameterShDh_Templates {
		data_Reference := {p_data_Reference}
		} // End of template md_snrBodyAvps


		} // End of group snr_msg

		} // End of group Sh_request_message_templates_send
		@@ -555,6 +560,50 @@ module DiameterShDh_Templates {

		} // End of group pur_msg

		group snr_msg {

		/**
		* @desc Main receive message for HSS_Sh port
		* @param p_sNR_MSG SN-Request message
		*/
		template (present) SNR_MSG mdw_sNR(
		template (present) Session_Id_AVP p_sessionId,
		template (present) SNR_Body_AVP p_snrBody
		) modifies mw_SNR_dummy := {
		header := mw_diameterHeaderReq_dummy(SNR_E, c_applId3GPPShDh),
		session_Id := p_sessionId,
		sNR_Body := p_snrBody
		} // End of template mdw_sNR

		/**
		* @desc Receive template for SNR message body
		* @param p_resultCode Indicates whether a particular request was completed successfully or an error occurred
		* @param p_originHost Identifies the endpoint that originated the Diameter message
		* @param p_originRealm Realm of the originator
		* @param p_destinationRealm Destination realm
		*/
		template SNR_Body_AVP mdw_snrBodyAvps(
		template (present) Vendor_Specific_Appl_Id_AVP p_vendor_Specific_Appl_Id_Sh := ?,
		template (present) Auth_Session_State_AVP p_auth_Session_State := ?,
		template (present) Origin_Host_AVP p_originHost := ?,
		template (present) Origin_Realm_AVP p_originRealm := ?,
		template (present) Destination_Realm_AVP p_destinationRealm := ?,
		template (present) User_Identity_AVP p_user_Identity := ?,
		template (present) Subs_Req_Type_AVP p_subs_Req_Type := ?,
		template (present) Data_Reference_AVP p_data_Reference := ?
		) modifies mw_SNR_Body_dummy := {
		vendor_Specific_Application_Id := p_vendor_Specific_Appl_Id_Sh,
		auth_Session_State := p_auth_Session_State,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm,
		destination_Realm := p_destinationRealm,
		user_Identity := p_user_Identity,
		subs_Req_Type := p_subs_Req_Type,
		data_Reference := {p_data_Reference}
		} // End of template mdw_purBodyAvps

		} // End of group snr_msg

		} // End of group Sh_request_message_templates_receive

		group Sh_answer_message_templates_send {
		@@ -594,7 +643,7 @@ module DiameterShDh_Templates {
		result_Code := p_resultCode,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm,
		aVP_Type := { AVP_Type: {p_redirect_Host_AVP.aVP_Header, { cHARSTRING := p_redirect_Host_AVP.aVP_Data } } }
		aVP_Type := { AVP_Type: {p_redirect_host.aVP_Header, { cHARSTRING := p_redirect_host.aVP_Data } } }
		} // End of template md_udaBodyAvps

		} // End of group uda_msg
		@@ -655,6 +704,36 @@ module DiameterShDh_Templates {

		} // End of group pua_msg

		group sna_msg {

		/**
		* @desc Send template for SNA
		* @param p_sessionId Session identifier
		* @param p_snaBody SNA message body
		*/
		template (value) SNA_MSG md_sNA(
		in template (value) Session_Id_AVP p_sessionId,
		in template (value) SNA_Body_AVP p_snaBody
		) modifies m_SNA_dummy := {
		header := m_diameterHeaderAns_dummy(SNA_E, c_applId3GPPShDh),
		session_Id := p_sessionId,
		sNA_Body := p_snaBody
		} // End of template md_sNA

		template (omit) SNA_Body_AVP md_snaBodyAvps(
		in template (value) Result_Code_AVP p_resultCode,
		in template (value) Origin_Host_AVP p_originHost,
		in template (value) Origin_Realm_AVP p_originRealm
		) modifies m_SNA_Body_dummy := {
		vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_dummy,//required only in TS129 229
		auth_Session_State := m_auth_Session_State_dummy,
		result_Code := p_resultCode,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm
		} // End of template md_snaBodyAvps

		} // End of group sna_msg

		} // End of group Sh_answer_message_templates_send

		group Sh_answer_message_templates_receive {
		@@ -695,6 +774,18 @@ module DiameterShDh_Templates {
		origin_Realm := p_originRealm
		} // End of template mdw_udaBodyAvps

		template (present) UDA_Body_AVP mdw_udaBodyAvps_user_Data(
		template (present) Result_Code_AVP p_resultCode,
		template (present) Origin_Host_AVP p_originHost,
		template (present) Origin_Realm_AVP p_originRealm,
		template (present) User_Data_AVP p_user_data
		) modifies mw_UDA_Body_dummy := {
		result_Code := p_resultCode,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm,
		user_Data := p_user_data
		} // End of template mdw_udaBodyAvps

		template (present) UDA_Body_AVP mdw_udaBodyAvps_redirect(
		template (present) Result_Code_AVP p_resultCode,
		template (present) Origin_Host_AVP p_originHost,
		@@ -799,6 +890,34 @@ module DiameterShDh_Templates {

		} // End of group pua_msg

		group sna_msg {

		/**
		* @desc Receive template for SNA
		* @param p_sessionId Session identifier
		* @param p_snaBody SNA message body
		*/
		template (present) SNA_MSG mdw_sNA(
		template (present) Session_Id_AVP p_sessionId,
		template (present) SNA_Body_AVP p_snaBody
		) modifies mw_SNA_dummy := {
		header := mw_diameterHeaderAns_dummy(SNA_E, c_applId3GPPShDh),
		session_Id := p_sessionId,
		sNA_Body := p_snaBody
		} // End of template md_sNA

		template (present) SNA_Body_AVP mdw_snaBodyAvps(
		template Result_Code_AVP p_resultCode,
		template (present) Origin_Host_AVP p_originHost,
		template (present) Origin_Realm_AVP p_originRealm
		) modifies mw_SNA_Body_dummy := {
		result_Code := p_resultCode,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm
		} // End of template mdw_snaBodyAvps

		} // End of group sna_msg

		} // End of group Sh_answer_message_templates_receive

		} // End of group Sh_modified_message_templates

ttcn/DiameterShDh_TestCases.ttcn3

+6 −6

Original line number	Diff line number	Diff line
		@@ -510,7 +510,7 @@ module DiameterShDh_TestCases {
		* indicating IMS Public User Identity
		* containing a Data-Reference AVP
		* indicating TADSinformation (26)
		sends a UD-Answer
		* sends a UD-Answer
		* containing a Session-ID AVP
		* containing a Vendor-Specific-Application-Id AVP
		* containing an Auth-Session-State AVP