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

ttcn/DiameterShDh_PIXITS.ttcn3

+5 −0

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

			/** @desc UTF8String
			* TODO
			*/
			modulepar charstring PX_PublicUser_MSISDN := "foo";
	} // End of group DiameterCommonShDhData		} // End of group DiameterCommonShDhData

	group SipParameters {		group SipParameters {

ttcn/DiameterShDh_TCFunctions.ttcn3

+26 −1

Original line number	Original line	Diff line number	Diff line
	@@ -237,7 +237,30 @@ 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		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)
			)
			)
			)
			);

			f_awaiting_UDA(
			mdw_uDA(
			vc_sessionId, // containing a Session-ID AVP
			mdw_udaBodyAvps(
			mw_resultCode(DIAMETER_ERROR_OPERATION_NOT_ALLOWED),
			vc_originHost_IUT, // containing an Origin-Host AVP
			vc_originRealm_IUT
			))
			);


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

	@@ -606,8 +629,10 @@ module DiameterShDh_TCFunctions {
	md_pUR(		md_pUR(
	vc_sessionId,		vc_sessionId,
	md_purBodyAvps(		md_purBodyAvps(
			m_auth_Session_State,
	vc_originHost, // containing an Origin-Host AVP		vc_originHost, // containing an Origin-Host AVP
	vc_originRealm, // containing an Origin-Realm AVP		vc_originRealm, // containing an Origin-Realm AVP
			vc_destinationHost, // containing an Destination-Host AVP
	vc_destinationRealm, // containing a Destination-Realm AVP		vc_destinationRealm, // containing a Destination-Realm AVP
	m_specific_user_Identity (		m_specific_user_Identity (
	m_public_user_identity(PX_PublicUserIdentity)		m_public_user_identity(PX_PublicUserIdentity)

ttcn/DiameterShDh_Templates.ttcn3

+13 −3

Original line number	Original line	Diff line number	Diff line
	@@ -83,9 +83,13 @@ module DiameterShDh_Templates {
	acct_Application_Id := omit		acct_Application_Id := omit
	}		}

			template Auth_Session_State_AVP m_auth_Session_State := {
			aVP_Header := m_aVP_Header_Mbit1(c_auth_Session_State_AVP_Code),
			aVP_Data := STATE_MAINTAINED_E
			}

	template (value) Public_Identity_AVP m_public_user_identity (		template (value) Public_Identity_AVP m_public_user_identity (
	in template (value) charstring p_public_user_identity := PX_public_user_identity		in template (value) charstring p_public_user_identity := PX_PublicUserIdentity
	) := {		) := {
	aVP_Header := m_aVP_Header_Mbit1(c_wildcarded_Public_Identity_AVP_Code),		aVP_Header := m_aVP_Header_Mbit1(c_wildcarded_Public_Identity_AVP_Code),
	aVP_Data := p_public_user_identity		aVP_Data := p_public_user_identity
	@@ -228,18 +232,24 @@ module DiameterShDh_Templates {
	* @desc Send template for PUR message body		* @desc Send template for PUR message body
	*/		*/
	template (value) PUR_Body_AVP md_purBodyAvps(		template (value) PUR_Body_AVP md_purBodyAvps(
			template (value) Auth_Session_State_AVP p_auth_sess_State,
	template (value) Origin_Host_AVP p_origin_Host,		template (value) Origin_Host_AVP p_origin_Host,
	template (value) Origin_Realm_AVP p_origin_Realm,		template (value) Origin_Realm_AVP p_origin_Realm,
	template (value) Destination_Host_AVP p_destination_Host,		template (value) Destination_Host_AVP p_destination_Host,
	template (value) Destination_Realm_AVP p_destination_Realm,		template (value) Destination_Realm_AVP p_destination_Realm,
	template (value) User_Identity_AVP p_user_Identity := m_user_Identity_dummy		template (value) User_Identity_AVP p_user_Identity := m_user_Identity_dummy,
			template (value) Data_Reference_AVP p_data_Reference := m_data_Reference_dummy,
			template (value) User_Data_AVP p_user_data := m_user_Data_dummy
	) modifies m_PUR_Body_dummy := {		) modifies m_PUR_Body_dummy := {
	vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_Sh,		vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_Sh,
			auth_Session_State := p_auth_sess_State,
	origin_Host := p_origin_Host,		origin_Host := p_origin_Host,
	origin_Realm := p_origin_Realm,		origin_Realm := p_origin_Realm,
	destination_Host := p_destination_Host,		destination_Host := p_destination_Host,
	destination_Realm := p_destination_Realm,		destination_Realm := p_destination_Realm,
	user_Identity := p_user_Identity		user_Identity := p_user_Identity,
			data_Reference := p_data_Reference,
			user_Data := p_user_data
	} // End of template md_purBodyAvps		} // End of template md_purBodyAvps

	} // End of group pur_msg		} // End of group pur_msg

ttcn/DiameterShDh_TestCases.ttcn3

+321 −321

Original line number	Original line	Diff line number	Diff line
	@@ -2609,12 +2609,12 @@ module DiameterShDh_TestCases {

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

	// Test component configuration		// Test component configuration
	f_cf_1Sh_asUp(v_diameterSh_as);		f_cf_1Sh_hssUp(v_diameterSh_as);

	// Start		// Start
	v_diameterSh_as.start(f_TC_SH_AS_MS_01());		v_diameterSh_as.start(f_TC_SH_AS_MS_01());
	@@ -2622,7 +2622,7 @@ module DiameterShDh_TestCases {
	// synchronize PTC on 1 sychronization points		// synchronize PTC on 1 sychronization points
	f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});		f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});

	f_cf_1Sh_asDown(v_diameterSh_as);		f_cf_1Sh_hssDown(v_diameterSh_as);

	} // End of testcase TC_SH_AS_MS_01		} // End of testcase TC_SH_AS_MS_01