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

ttcn/DiameterShDh_TCFunctions.ttcn3

+128 −46

Original line number	Original line	Diff line number	Diff line
	@@ -159,8 +159,7 @@ module DiameterShDh_TCFunctions {
	mw_experimentalResult(DIAMETER_ERROR_USER_DATA_CANNOT_BE_READ_E),		mw_experimentalResult(DIAMETER_ERROR_USER_DATA_CANNOT_BE_READ_E),
	vc_originHost_IUT, // containing an Origin-Host AVP		vc_originHost_IUT, // containing an Origin-Host AVP
	vc_originRealm_IUT		vc_originRealm_IUT
	))		)));
	);

	f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

	@@ -193,7 +192,6 @@ module DiameterShDh_TCFunctions {
	)		)
	);		);


	f_awaiting_UDA(		f_awaiting_UDA(
	mdw_uDA(		mdw_uDA(
	vc_sessionId, // containing a Session-ID AVP		vc_sessionId, // containing a Session-ID AVP
	@@ -201,9 +199,7 @@ module DiameterShDh_TCFunctions {
	mw_experimentalResult(DIAMETER_ERROR_USER_UNKNOWN_E),		mw_experimentalResult(DIAMETER_ERROR_USER_UNKNOWN_E),
	vc_originHost_IUT, // containing an Origin-Host AVP		vc_originHost_IUT, // containing an Origin-Host AVP
	vc_originRealm_IUT		vc_originRealm_IUT
	))		)));
	);


	f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

	@@ -242,8 +238,7 @@ module DiameterShDh_TCFunctions {
	mw_experimentalResult(DIAMETER_ERROR_IDENTITIES_DONT_MATCH_E),		mw_experimentalResult(DIAMETER_ERROR_IDENTITIES_DONT_MATCH_E),
	vc_originHost_IUT, // containing an Origin-Host AVP		vc_originHost_IUT, // containing an Origin-Host AVP
	vc_originRealm_IUT		vc_originRealm_IUT
	))		)));
	);

	f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

	@@ -360,7 +355,9 @@ module DiameterShDh_TCFunctions {
	mdw_uDA(		mdw_uDA(
	vc_sessionId, // containing a Session-ID AVP		vc_sessionId, // containing a Session-ID AVP
	mdw_udaBodyExperimentalAvps(		mdw_udaBodyExperimentalAvps(
	mw_experimentalResult(DIAMETER_USER_DATA_NOT_AVAILABLE_E),		mw_experimentalResult(
			DIAMETER_USER_DATA_NOT_AVAILABLE_E
			),
	vc_originHost_IUT, // containing an Origin-Host AVP		vc_originHost_IUT, // containing an Origin-Host AVP
	vc_originRealm_IUT		vc_originRealm_IUT
	))		))
	@@ -757,8 +754,10 @@ module DiameterShDh_TCFunctions {
	mdw_pUA(		mdw_pUA(
	vc_sessionId, // containing a Session-ID AVP		vc_sessionId, // containing a Session-ID AVP
	mdw_puaBodyAvps(		mdw_puaBodyAvps(
	*,		?,
	mw_experimentalResult((DIAMETER_ERROR_USER_DATA_CANNOT_BE_MODIFIED_E)),		mw_experimentalResult(
			DIAMETER_ERROR_USER_DATA_CANNOT_BE_MODIFIED_E
			),
	vc_originHost_IUT, // containing an Origin-Host AVP		vc_originHost_IUT, // containing an Origin-Host AVP
	vc_originRealm_IUT		vc_originRealm_IUT
	))		))
	@@ -880,17 +879,16 @@ module DiameterShDh_TCFunctions {
	vc_destinationRealm, // containing a Destination-Realm AVP		vc_destinationRealm, // containing a Destination-Realm AVP
	m_msisdn_user_Identity (		m_msisdn_user_Identity (
	m_MSISDN_user_identity(char2oct(PX_PublicUser_MSISDN))		m_MSISDN_user_identity(char2oct(PX_PublicUser_MSISDN))
	)		))));
	)
	)
	);

	f_awaiting_PUA(		f_awaiting_PUA(
	mdw_pUA(		mdw_pUA(
	vc_sessionId, // containing a Session-ID AVP		vc_sessionId, // containing a Session-ID AVP
	mdw_puaBodyAvps(		mdw_puaBodyAvps(
	*,		?,
	mw_experimentalResult(DIAMETER_ERROR_OPERATION_NOT_ALLOWED_E),		mw_experimentalResult(
			DIAMETER_ERROR_OPERATION_NOT_ALLOWED_E
			),
	vc_originHost_IUT, // containing an Origin-Host AVP		vc_originHost_IUT, // containing an Origin-Host AVP
	vc_originRealm_IUT		vc_originRealm_IUT
	))		))
	@@ -957,7 +955,35 @@ module DiameterShDh_TCFunctions {
	f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
	log("* " & __SCOPE__ & ": INFO: Preamble done. *");		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());		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

	@@ -975,7 +1001,35 @@ module DiameterShDh_TCFunctions {
	f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
	log("* " & __SCOPE__ & ": INFO: Preamble done. *");		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());		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

	@@ -993,7 +1047,35 @@ module DiameterShDh_TCFunctions {
	f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
	log("* " & __SCOPE__ & ": INFO: Preamble done. *");		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());		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

ttcn/DiameterShDh_Templates.ttcn3

+9 −16

Original line number	Original line	Diff line number	Diff line
	@@ -636,19 +636,12 @@ module DiameterShDh_Templates {
	origin_Realm := p_originRealm		origin_Realm := p_originRealm
	} // End of template mdw_udaBodyAvps		} // End of template mdw_udaBodyAvps

	template Experimental_Result_Code_AVP m_experimentalResultCode(		template (present) Experimental_Result_AVP mw_experimentalResult(
	template (present) Experimental_Result_Type p_avpData
	) := {
	aVP_Header := m_aVP_HeaderVid_Mbit1(c_experimental_Result_Code_AVP_Code, 4, omit),
	aVP_Data := p_avpData
	}

	template Experimental_Result_AVP mw_experimentalResult(
	template (present) Experimental_Result_Type p_expResultCode		template (present) Experimental_Result_Type p_expResultCode
	) := {		) := {
	aVP_Header := m_aVP_HeaderVid_Mbit1(c_experimental_Result_AVP_Code, 24, omit),		aVP_Header := m_aVP_HeaderVid_Mbit1(c_experimental_Result_AVP_Code, 24, omit),
	vendor_Id := m_vendorId(c_vendId3gpp),		vendor_Id := m_vendorId(c_vendId3gpp),
	experimental_Result_Code := m_experimentalResultCode(p_expResultCode)		experimental_Result_Code := mw_experimentalResultCode(p_expResultCode)
	}		}

ttcn/DiameterShDh_TestCases.ttcn3

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1747,7 +1747,11 @@ module DiameterShDh_TestCases {
	// Local variables		// Local variables
	var DiameterShDh v_diameterSh_as;		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		// Test component configuration
	f_cf_1Sh_asUp(v_diameterSh_as);		f_cf_1Sh_asUp(v_diameterSh_as);