First changes related to SIP_....*_AVPs described in rfc4740 and 129 229 documents (96394cc3) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterCxDx

DiameterCxDx/ttcn/DiameterCxDx_Cx_TCFunctions.ttcn3

+39 −31

Original line number	Diff line number	Diff line
		@@ -229,9 +229,12 @@ module DiameterCxDx_Cx_TCFunctions {

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		// TODO delete at the end of validation or change it if needed
		//f_deRegistratonCx();

		// Postamble
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
		f_deRegistratonCx();

		f_postamble_HSS();
		} // End of function f_TC_CX_HSS_UA_01_I

		@@ -292,11 +295,11 @@ module DiameterCxDx_Cx_TCFunctions {
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		// Postamble
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
		f_s_SAR_SAA();
		f_deRegistratonCx();
		f_s_SAR_SAA();
		f_postamble_HSS();
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());

		} // End of function f_TC_CX_HSS_UA_02_I_S

		@@ -5249,21 +5252,22 @@ module DiameterCxDx_Cx_TCFunctions {

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		f_awaiting_MAR(mw_MAR_Msg(?, mw_MAR_basic));
		f_send_MAA(m_MAA_Msg(vc_sessionId, m_MAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));

		f_awaiting_UAR(mw_UAR_Msg(?, mw_UAR()));
		f_send_UAA(m_UAA_Msg(vc_sessionId, m_UAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));

		f_awaiting_SAR(mw_SAR_Msg(?, mw_SAR_basic));
		f_send_SAA(m_SAA_Msg(vc_sessionId, m_SAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));

		//de-registration
		f_awaiting_UAR(mw_UAR_Msg(?, mw_UAR()));
		f_send_UAA(m_UAA_Msg(vc_sessionId, m_UAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));

		f_awaiting_SAR(mw_SAR_Msg(?, mw_SAR_basic));
		f_send_SAA(m_SAA_Msg(vc_sessionId, m_SAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));
		// TODO delete at the end of validation or change it if needed
		// f_awaiting_MAR(mw_MAR_Msg(?, mw_MAR_basic));
		// f_send_MAA(m_MAA_Msg(vc_sessionId, m_MAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));
		//
		// f_awaiting_UAR(mw_UAR_Msg(?, mw_UAR()));
		// f_send_UAA(m_UAA_Msg(vc_sessionId, m_UAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));
		//
		// f_awaiting_SAR(mw_SAR_Msg(?, mw_SAR_basic));
		// f_send_SAA(m_SAA_Msg(vc_sessionId, m_SAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));
		//
		// //de-registration
		// f_awaiting_UAR(mw_UAR_Msg(?, mw_UAR()));
		// f_send_UAA(m_UAA_Msg(vc_sessionId, m_UAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));
		//
		// f_awaiting_SAR(mw_SAR_Msg(?, mw_SAR_basic));
		// f_send_SAA(m_SAA_Msg(vc_sessionId, m_SAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));

		f_postamble_HSS();
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
		@@ -6084,7 +6088,8 @@ module DiameterCxDx_Cx_TCFunctions {
		// the IUT sends a UA-Request
		f_awaiting_UAR(mw_UAR_Msg(?, mw_UAR));

		f_send_UAA(m_UAA_Msg(vc_sessionId, m_UAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_AUTHENTICATION_REJECTED_E))));
		f_send_UAA(m_UAA_Msg(vc_sessionId, m_UAA_basic(vc_originHost, vc_originRealm, omit,
		m_experimentalResult(DIAMETER_FIRST_REGISTRATION_E))));// or DIAMETER_SUBSEQUENT_REGISTRATION_E
		vc_userName := m_userName(PX_UserName);
		f_awaiting_MAR(
		mw_MAR_Msg(
		@@ -6105,21 +6110,24 @@ module DiameterCxDx_Cx_TCFunctions {

		f_send_MAA(m_MAA_Msg(vc_sessionId, m_MAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));

		f_awaiting_UAR(mw_UAR_Msg(?, mw_UAR()));
		f_send_UAA(m_UAA_Msg(vc_sessionId, m_UAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));

		f_awaiting_SAR(mw_SAR_Msg(?, mw_SAR_basic));
		f_send_SAA(m_SAA_Msg(vc_sessionId, m_SAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));

		// TODO delete at the end of validation or change it if needed
		// f_awaiting_UAR(mw_UAR_Msg(?, mw_UAR()));
		// f_send_UAA(m_UAA_Msg(vc_sessionId, m_UAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));
		//
		// f_awaiting_SAR(mw_SAR_Msg(?, mw_SAR_basic));
		// f_send_SAA(m_SAA_Msg(vc_sessionId, m_SAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));
		//
		// f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
		// // Postamble
		//
		// //de-registration
		// f_awaiting_UAR(mw_UAR_Msg(?, mw_UAR()));
		// f_send_UAA(m_UAA_Msg(vc_sessionId, m_UAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));
		//
		// f_awaiting_SAR(mw_SAR_Msg(?, mw_SAR_basic));
		// f_send_SAA(m_SAA_Msg(vc_sessionId, m_SAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
		// Postamble

		//de-registration
		f_awaiting_UAR(mw_UAR_Msg(?, mw_UAR()));
		f_send_UAA(m_UAA_Msg(vc_sessionId, m_UAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));

		f_awaiting_SAR(mw_SAR_Msg(?, mw_SAR_basic));
		f_send_SAA(m_SAA_Msg(vc_sessionId, m_SAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));
		f_postamble_HSS();
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
		}

DiameterCxDx/ttcn/DiameterCxDx_Steps.ttcn

+0 −1

Original line number	Diff line number	Diff line
		@@ -366,7 +366,6 @@
		f_postambleDisconnect();
		}

		f_postambleDiameterBase();
		// Deactivate defaults
		deactivate;
		}

DiameterCxDx/ttcn/DiameterCxDx_Templates.ttcn

+5 −0

Original line number	Diff line number	Diff line
		@@ -164,6 +164,11 @@ module DiameterCxDx_Templates {
		aVP_Data := p_aVP_Data
		}

		template (value) SIP_Number_Auth_Items_AVP m_sIPNumberAuthItems (template (value) UInt32 p_avpData) := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Number_Auth_Items_AVP_Code, 4, c_vendId3gpp),
		aVP_Data := p_avpData
		}

		template (value) Line_Identifier_AVP m_line_Identifier(
		in template (value) octetstring p_aVP_Data
		) := {