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

LibDiameter @ f6a0410f

Original line number	Diff line number	Diff line
		Subproject commit c9f25b2f33d34138b9092ce747047abfb3e5fc17
		Subproject commit f6a0410faaf67d52748e5c694c8944cc5d00641c

ttcn/DiameterShDh_PIXITS.ttcn3

+5 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,11 @@ module DiameterShDh_PIXITS {
		* TODO
		*/
		modulepar charstring PX_IMSPublicUserIdentity := "foo";

		modulepar UTF8String PX_IUT_SIP_URL := "sip:stf549@etsi.org";

		modulepar octetstring PX_DSAI_TAG := '00'O;

		} // End of group DiameterCommonShDhData

		group SipParameters {

ttcn/DiameterShDh_TCFunctions.ttcn3

+112 −10

Original line number	Diff line number	Diff line
		@@ -714,6 +714,7 @@ module DiameterShDh_TCFunctions {
		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
		))
		@@ -735,7 +736,33 @@ 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)
		)
		)
		)
		);

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

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		@@ -1466,11 +1493,12 @@ module DiameterShDh_TCFunctions {
		?,
		?, // containing a Session-ID AVP
		mdw_udrBodyAvps(
		vc_originHost_IUT, // containing a Origin-Host AVP
		vc_originRealm_IUT, // containing a Destination-Realm AVP
		vc_destinationRealm_IUT
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT, // containing an Origin-Realm AVP
		vc_destinationRealm_IUT, // containing a Destination-Realm AVP
		// containing a User-Identity AVP
		// containing a Data-Reference AVP
		m_data_Reference_dummy // containing a Data-Reference AVP
		// indicating RepositoryData (0)
		)));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
		@@ -1497,10 +1525,33 @@ module DiameterShDh_TCFunctions {
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

		//TODO TestBody
		// TestBody
		// to indicate a user data handling procedure
		action("The IUT is requested to indicate a repository data within user data handling procedure");
		// Clause 'then': the IUT sends an UD-Request and receives an UD-Answer
		f_awaiting_UDR(
		mdw_uDR_Header_UDRBody(
		?,
		?, // containing a Session-ID AVP
		mdw_udrBodyAvps_handling_procedure(
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT, // containing an Origin-Realm AVP
		vc_destinationRealm_IUT, // containing a Destination-Realm AVP
		// containing a User-Identity AVP
		m_data_Reference_dummy // containing a Data-Reference AVP
		// containing a Service-Indication AVP
		)));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		f_send_UDA(
		md_uDA(
		vc_sessionId, // Set in f_awaiting_UDR
		md_udaBodyAvps(
		m_resultCode(DIAMETER_SUCCESS_E),
		vc_originHost,
		vc_originRealm
		)));
		f_postamble_Sh_HSS();
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
		log("* " & __SCOPE__ & ": INFO: Postamble done. *");
		@@ -1515,10 +1566,35 @@ module DiameterShDh_TCFunctions {
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

		//TODO TestBody

		// TestBody
		// to indicate a user data handling procedure
		action("The IUT is requested to indicate an initial filter criteria within user data handling procedure");
		// Clause 'then': the IUT sends an UD-Request and receives an UD-Answer
		f_awaiting_UDR(
		mdw_uDR_Header_UDRBody(
		?,
		?, // containing a Session-ID AVP
		mdw_udrBodyAvps_initial_filter_criteria(
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT, // containing an Origin-Realm AVP
		vc_destinationRealm_IUT, // containing a Destination-Realm AVP
		// containing a User-Identity AVP
		m_data_Reference_dummy, // containing a Data-Reference AVP
		// indicating RepositoryData (0)
		m_server_name( // Server-Name AVP
		PX_IUT_SIP_URL // indicating SIP URL of the IUT
		)
		)));
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		f_send_UDA(
		md_uDA(
		vc_sessionId, // Set in f_awaiting_UDR
		md_udaBodyAvps(
		m_resultCode(DIAMETER_SUCCESS_E),
		vc_originHost,
		vc_originRealm
		)));
		f_postamble_Sh_HSS();
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
		log("* " & __SCOPE__ & ": INFO: Postamble done. *");
		@@ -1533,10 +1609,36 @@ module DiameterShDh_TCFunctions {
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

		//TODO TestBody

		// TestBody
		// to indicate a user data handling procedure
		action("The IUT is requested to indicate a DSAI sends a UD-Request with DSAI-Tag AVP");
		// Clause 'then': the IUT sends an UD-Request and receives an UD-Answer
		f_awaiting_UDR(
		mdw_uDR_Header_UDRBody(
		?,
		?, // containing a Session-ID AVP
		mdw_udrBodyAvps_dsai(
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT, // containing an Origin-Realm AVP
		vc_destinationRealm_IUT, // containing a Destination-Realm AVP
		// containing a User-Identity AVP
		m_data_Reference( // containing a Data-Reference AVP
		DSAI_E // indicating DSAI (19)
		),
		m_dSAI_Tag_AVP( // containing a DSAI-Tag AVP
		PX_DSAI_TAG
		)
		)));
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		f_send_UDA(
		md_uDA(
		vc_sessionId, // Set in f_awaiting_UDR
		md_udaBodyAvps(
		m_resultCode(DIAMETER_SUCCESS_E),
		vc_originHost,
		vc_originRealm
		)));
		f_postamble_Sh_HSS();
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
		log("* " & __SCOPE__ & ": INFO: Postamble done. *");

ttcn/DiameterShDh_Templates.ttcn3

+59 −14

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

		} // End of group HeaderFieldTemplates

		group HeaderFieldTemplates {
		group AvpsTemplates {

		group SpecificAVPHeaders {

		@@ -103,12 +103,31 @@ module DiameterShDh_Templates {
		public_Identity_AVP := p_public_identity
		}

		template (value) Data_Reference_AVP m_data_Reference(
		in template (value) Data_Reference_Type p_aVP_Data
		) modifies m_data_Reference_dummy := {
		aVP_Data := p_aVP_Data
		}

		template (value) Server_Name_AVP m_server_name(
		in template (value) UTF8String p_aVP_Data
		) := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_server_Name_AVP_Code, 4, c_vendId3gpp),
		aVP_Data := p_aVP_Data
		}

		template (value) DSAI_Tag_AVP m_dSAI_Tag_AVP(
		in template (value) octetstring p_aVP_Data
		) := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_dSAI_Tag_AVP_Code, 4, c_vendId3gpp),
		aVP_Data := p_aVP_Data
		}

		}

		} // End of group SpecificAVPHeaders

		} // End of group HeaderFieldTemplates
		} // End of group AvpsTemplates

		group Sh_modified_message_templates {

		@@ -299,14 +318,48 @@ module DiameterShDh_Templates {
		template UDR_Body_AVP mdw_udrBodyAvps(
		template (present) Origin_Host_AVP p_originHost := ?,
		template (present) Origin_Realm_AVP p_originRealm := ?,
		template (present) Destination_Realm_AVP p_destinationRealm := ?
		template (present) Destination_Realm_AVP p_destinationRealm := ?,
		template (present) Data_Reference_AVP p_data_Reference := ?
		) modifies mw_UDR_Body_dummy := {
		vendor_Specific_Application_Id := ?,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm,
		destination_Realm := p_destinationRealm
		destination_Realm := p_destinationRealm,
		data_Reference := {p_data_Reference}
		} // End of template mdw_udrBodyAvps

		template UDR_Body_AVP mdw_udrBodyAvps_handling_procedure(
		template (present) Origin_Host_AVP p_originHost := ?,
		template (present) Origin_Realm_AVP p_originRealm := ?,
		template (present) Destination_Realm_AVP p_destinationRealm := ?,
		template (present) Data_Reference_AVP p_data_Reference
		) modifies mdw_udrBodyAvps := {
		data_Reference := superset(p_data_Reference),
		service_Indication := ?
		} // End of template mdw_udrBodyAvps_handling_procedure

		template UDR_Body_AVP mdw_udrBodyAvps_initial_filter_criteria(
		template (present) Origin_Host_AVP p_originHost := ?,
		template (present) Origin_Realm_AVP p_originRealm := ?,
		template (present) Destination_Realm_AVP p_destinationRealm := ?,
		template (present) Data_Reference_AVP p_data_Reference := ?,
		template (present) Server_Name_AVP p_server_Name := ?
		) modifies mdw_udrBodyAvps := {
		data_Reference := superset(p_data_Reference),
		server_Name := p_server_Name
		} // End of template mdw_udrBodyAvps_initial_filter_criteria

		template UDR_Body_AVP mdw_udrBodyAvps_dsai(
		template (present) Origin_Host_AVP p_originHost := ?,
		template (present) Origin_Realm_AVP p_originRealm := ?,
		template (present) Destination_Realm_AVP p_destinationRealm := ?,
		template (present) Data_Reference_AVP p_data_Reference := ?,
		template (present) DSAI_Tag_AVP p_dSAI_Tag := ?
		) modifies mdw_udrBodyAvps := {
		data_Reference := superset(p_data_Reference),
		dSAI_Tag := superset(p_dSAI_Tag)
		} // End of template mdw_udrBodyAvps_dsai

		} // End of group udr_msg

		group pnr_msg {
		@@ -601,16 +654,6 @@ module DiameterShDh_Templates {

		group pua_msg {

		template PUA_Body_AVP mw_PUA_Result(
		template Result_Code_AVP p_resultCode,
		template (present) Origin_Host_AVP p_originHost,
		template (present) Origin_Realm_AVP p_originRealm,
		template PUA_Body_AVP.failed p_failed
		) modifies mdw_puaBodyAvps := {
		result_Code := p_resultCode, // optional in TS 129 229
		failed := p_failed // optional in TS 129 229
		} // End of template mw_PUA_ResulFaile

		/**
		* @desc Receive template for PUA
		* @param p_sessionId Session identifier
		@@ -627,10 +670,12 @@ module DiameterShDh_Templates {

		template (present) PUA_Body_AVP mdw_puaBodyAvps(
		template (present) Result_Code_AVP p_resultCode,
		template (present) Experimental_Result_Code_AVP p_exp_rescode,
		template (present) Origin_Host_AVP p_originHost,
		template (present) Origin_Realm_AVP p_originRealm
		) modifies mw_PUA_Body_dummy := {
		result_Code := p_resultCode,
		experimental_Result := p_exp_rescode,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm
		} // End of template mdw_puaBodyAvps

ttcn/DiameterShDh_TestCases.ttcn3

+12 −4

Original line number	Diff line number	Diff line
		@@ -1461,7 +1461,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);
		@@ -1513,7 +1517,11 @@ module DiameterShDh_TestCases {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control - PICS
		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);