Conflict resolution in ttcn module DiameterShDh_Templates (7968af9f) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterShDh

ttcn/DiameterShDh_TCFunctions.ttcn3

+30 −1

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

		//TestBody
		f_send_PUR(
		md_pUR(
		vc_sessionId,
		@@ -1623,8 +1624,36 @@ 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(REPOSITORY_DATA_E),
		m_user_Data_shData(char2oct("shdata_repositorydata(0)_serviceinfo_seqnr_servicedata_empty-repositorydata(1)_serviceinfo_seqnr_servicedata_empty")) //TODO import XML Schema
		)
		)
		);

		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,
		mw_repository_data_id
		))
		);
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		f_postamble_Sh_AS();

+11 −3

Original line number	Diff line number	Diff line
		@@ -165,6 +165,12 @@ module DiameterShDh_Templates {
		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
		@@ -579,7 +585,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
		@@ -784,12 +790,14 @@ module DiameterShDh_Templates {
		template Result_Code_AVP p_resultCode,
		template Experimental_Result_AVP p_exp_rescode,
		template (present) Origin_Host_AVP p_originHost,
		template (present) Origin_Realm_AVP p_originRealm
		template (present) Origin_Realm_AVP p_originRealm,
		template Repository_Data_ID_AVP p_repositoryDataId := *
		) modifies mw_PUA_Body_dummy := {
		result_Code := p_resultCode,
		experimental_Result := p_exp_rescode,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm
		origin_Realm := p_originRealm,
		repository_Data_Id := p_repositoryDataId
		} // End of template mdw_puaBodyAvps

		} // End of group pua_msg

+7 −1

Original line number	Diff line number	Diff line
		@@ -2493,10 +2493,16 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_21
		*/
		testcase TP_SH_HSS_PU_21() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_21() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

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

		// Start
		v_diameterSh_as.start(f_TC_SH_HSS_PU_21());