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

ttcn/DiameterShDh_TCFunctions.ttcn3

+11 −11

Original line number	Diff line number	Diff line
		@@ -1043,7 +1043,7 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(DSAI_E),
		m_user_Data_shData(char2oct("shimsdata_extension2")) //TODO import XML Schema
		m_user_Data_shData(unichar2oct(encvalue_unichar(m_imsdata_ext2)))
		)
		)
		);
		@@ -1691,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

+118 −2

Original line number	Diff line number	Diff line
		@@ -14,6 +14,12 @@ module DiameterShDh_Templates {
		import from LibDiameter_Types_ShDh_AVPs all;
		import from LibDiameter_Templates all;

		import from NoTargetNamespace language "XSD" all
		with {
		extension "File:../LibDiameter/xsd/ShDataType_Rel15.xsd";
		}


		group SubFields{
		} // End of group SubFields

		@@ -177,6 +183,15 @@ module DiameterShDh_Templates {

		} // End of group AvpsTemplates

		group Sh_XML_templates{

		template TShIMSDataExtension2 m_imsdata_ext2:= {
		dSAI_list := ? //TODO
		//extension_ := *
		}

		}// End of group Sh_XML_templates

		group Sh_modified_message_templates {

		group Sh_request_message_templates_send {
		@@ -360,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
		@@ -546,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 {
		@@ -646,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 {
		@@ -802,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