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

ttcn/DiameterShDh_PIXITS.ttcn3

+4 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,10 @@ module DiameterShDh_PIXITS {
		* TODO
		*/
		modulepar charstring PX_PublicUser_MSISDN := "foo";
		/** @desc UTF8String
		* TODO
		*/
		modulepar charstring PX_IMSPublicUserIdentity := "foo";
		} // End of group DiameterCommonShDhData

		group SipParameters {

ttcn/DiameterShDh_TCFunctions.ttcn3

+65 −19

Original line number	Diff line number	Diff line
		@@ -137,7 +137,30 @@ module DiameterShDh_TCFunctions {
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		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_NotExistingUserIdentity)
		)
		)
		)
		);


		f_awaiting_UDA(
		mdw_uDA(
		vc_sessionId, // containing a Session-ID AVP
		mdw_udaBodyExperimentalAvps(
		mw_experimentalResult(DIAMETER_ERROR_USER_DATA_CANNOT_BE_READ),
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT
		))
		);

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		@@ -170,11 +193,12 @@ module DiameterShDh_TCFunctions {
		)
		);


		f_awaiting_UDA(
		mdw_uDA(
		vc_sessionId, // containing a Session-ID AVP
		mdw_udaBodyAvps(
		mw_resultCode(DIAMETER_ERROR_USER_UNKNOWN_E),
		mdw_udaBodyExperimentalAvps(
		mw_experimentalResult(DIAMETER_ERROR_USER_UNKNOWN_E),
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT
		))
		@@ -214,8 +238,8 @@ module DiameterShDh_TCFunctions {
		f_awaiting_UDA(
		mdw_uDA(
		vc_sessionId, // containing a Session-ID AVP
		mdw_udaBodyAvps(
		mw_resultCode(DIAMETER_ERROR_IDENTITIES_DONT_MATCH_E),
		mdw_udaBodyExperimentalAvps(
		mw_experimentalResult(DIAMETER_ERROR_IDENTITIES_DONT_MATCH_E),
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT
		))
		@@ -254,8 +278,8 @@ module DiameterShDh_TCFunctions {
		f_awaiting_UDA(
		mdw_uDA(
		vc_sessionId, // containing a Session-ID AVP
		mdw_udaBodyAvps(
		mw_resultCode(DIAMETER_ERROR_OPERATION_NOT_ALLOWED),
		mdw_udaBodyExperimentalAvps(
		mw_experimentalResult(DIAMETER_ERROR_OPERATION_NOT_ALLOWED),
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT
		))
		@@ -278,7 +302,29 @@ module DiameterShDh_TCFunctions {
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		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_udaBodyExperimentalAvps(
		mw_experimentalResult(DIAMETER_ERROR_OPERATION_NOT_ALLOWED),
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT
		))
		);

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

ttcn/DiameterShDh_Templates.ttcn3

+30 −2

Original line number	Diff line number	Diff line
		@@ -102,6 +102,8 @@ module DiameterShDh_Templates {
		) modifies m_user_Identity_dummy := {
		public_Identity_AVP := p_public_identity
		}


		}

		} // End of group SpecificAVPHeaders
		@@ -497,7 +499,7 @@ module DiameterShDh_Templates {
		group uda_msg {

		template UDA_Body_AVP mw_UDA_ResulFaile(
		template Result_Code_AVP p_resultCode,
		template (present) Result_Code_AVP p_resultCode,
		template (present) Origin_Host_AVP p_originHost,
		template (present) Origin_Realm_AVP p_originRealm,
		template UDA_Body_AVP.failed p_failed
		@@ -530,12 +532,38 @@ module DiameterShDh_Templates {
		origin_Realm := p_originRealm
		} // End of template mdw_udaBodyAvps

		template Experimental_Result_Code_AVP m_experimentalResultCode(
		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
		) := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_experimental_Result_AVP_Code, 24, omit),
		vendor_Id := m_vendorId(c_vendId3gpp),
		experimental_Result_Code := m_experimentalResultCode(p_expResultCode)
		}


		template (present) UDA_Body_AVP mdw_udaBodyExperimentalAvps(
		template (present) Experimental_Result_AVP p_experimental_resultCode,
		template (present) Origin_Host_AVP p_originHost,
		template (present) Origin_Realm_AVP p_originRealm
		) modifies mw_UDA_Body_dummy := {
		experimental_Result := p_experimental_resultCode,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm
		} // End of template mdw_udaBodyAvps

		} // End of group uda_msg

		group pna_msg {

		template PNA_Body_AVP mw_PNA_ResulFaile(
		template Result_Code_AVP p_resultCode,
		template (present) Result_Code_AVP p_resultCode,
		template (present) Origin_Host_AVP p_originHost,
		template (present) Origin_Realm_AVP p_originRealm,
		template PNA_Body_AVP.failed p_failed