Bugs fixed in TC_CX_HSS_ER_xx (e8e0210d) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterCxDx

DiameterCxDx/ttcn/DiameterCxDx_Cx_TCFunctions.ttcn3

+41 −33

Original line number	Diff line number	Diff line
		@@ -5234,7 +5234,6 @@ module DiameterCxDx_Cx_TCFunctions {

		// Local variables
		var Session_Id_AVP v_sessionId;
		var Server_Name_AVP v_serverName;

		// Preamble
		// Clause 'Initial conditions'
		@@ -5246,20 +5245,19 @@ module DiameterCxDx_Cx_TCFunctions {
		);
		action("The current S-CSCF is stopped");
		vc_serverName := m_serverName(PX_OtherServerName);
		f_hssInitialRegistrationCx(vc_sessionId, // TODO Check if hssRegistrationCx is required
		f_hssInitialRegistrationCx(vc_sessionId2, // TODO Check if hssRegistrationCx is required
		PX_UserName,
		PX_PublicIdentity,
		m_uar_Flags_Cx
		); // Initiate a Re-registration procedure
		v_sessionId := valueof(vc_sessionId);
		v_serverName := valueof(vc_serverName);
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Test Body
		// Clause 'when': the IUT receives a MA-Request
		f_send_MAR(
		m_MAR_Msg(
		vc_sessionId,
		vc_sessionId2,
		m_MAR_withServerName(
		vc_originHost,
		vc_originRealm,
		@@ -5282,7 +5280,7 @@ module DiameterCxDx_Cx_TCFunctions {
		?, // containing a Origin-Host AVP
		vc_originRealm,
		m_destinationHost( // containing a Destination-Host AVP
		vc_originHost.aVP_Data
		PX_OtherServerName//vc_originHost.aVP_Data
		// indicating the name of the S-CSCF which originated the last update
		),
		vc_destinationRealm,
		@@ -5293,17 +5291,20 @@ module DiameterCxDx_Cx_TCFunctions {
		NEW_SERVER_ASSIGNED_E // indicating NEW_SERVER_ASSIGNED
		)))));
		// include to be validated
		f_send_RTA(m_RTA_Msg(vc_sessionId,
		m_RTA_basic(vc_originHost,
		f_send_RTA(
		m_RTA_Msg(
		vc_sessionId,
		m_RTA_basic(
		vc_originHost,
		vc_originRealm,
		m_resultCode
		(DIAMETER_SUCCESS_E),
		omit)));
		vc_sessionId := v_sessionId;
		vc_serverName := v_serverName;
		m_resultCode(
		DIAMETER_SUCCESS_E
		),
		omit
		)));
		f_awaiting_MAA(
		mw_MAA_Msg(
		vc_sessionId,
		vc_sessionId2,
		mw_MAA_ResulExpreUsrnaSipauthSrvna(
		mw_resultCode( // containing a Result-Code AVP
		DIAMETER_SUCCESS_E // indicating DIAMETER_SUCCESS
		@@ -5320,10 +5321,11 @@ module DiameterCxDx_Cx_TCFunctions {

		// Postamble
		//send 2nd UAR await UAA, SAR/SAA exchange
		f_hssSecondRegistratonCx(vc_sessionId,m_uar_Flags_Cx); // With SUBEQUENT_REGISTRATION
		f_hssSecondRegistratonCx(vc_sessionId2,m_uar_Flags_Cx); // With SUBEQUENT_REGISTRATION
		f_s_SAR_SAA(vc_sessionId2, REGISTRATION_E); // SAR registration
		f_hssDeregistrationCx(vc_sessionId2);

		f_hssDeregistrationCx(vc_sessionId);
		vc_sessionId := v_sessionId;
		vc_serverName := m_serverName(PX_ServerName);
		f_hssDeregistrationCx(vc_sessionId);
		f_postamble_HSS();
		@@ -5337,7 +5339,6 @@ module DiameterCxDx_Cx_TCFunctions {

		// Local variables
		var Session_Id_AVP v_sessionId;
		var Server_Name_AVP v_serverName;

		// Preamble
		// Clause 'Initial conditions'
		@@ -5347,22 +5348,21 @@ module DiameterCxDx_Cx_TCFunctions {
		PX_PublicIdentity,
		m_uar_Flags_Cx
		);
		v_sessionId := valueof(vc_sessionId);
		action("The current S-CSCF is stopped");
		vc_serverName := m_serverName(PX_OtherServerName);
		f_hssInitialRegistrationCx(vc_sessionId, // TODO Check if hssRegistrationCx is required
		f_hssInitialRegistrationCx(vc_sessionId2, // TODO Check if hssRegistrationCx is required
		PX_UserName,
		PX_PublicIdentity,
		m_uar_Flags_Cx
		); // Initiate a Re-registration procedure
		v_sessionId := valueof(vc_sessionId);
		v_serverName := valueof(vc_serverName);
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Test Body
		// Clause 'when': the IUT receives a MA-Request
		f_send_MAR(
		m_MAR_Msg(
		vc_sessionId,
		vc_sessionId2,
		m_MAR_withServerName(
		vc_originHost,
		vc_originRealm,
		@@ -5387,7 +5387,7 @@ module DiameterCxDx_Cx_TCFunctions {
		?, // containing a Origin-Host AVP
		vc_originRealm,
		m_destinationHost( // containing a Destination-Host AVP
		vc_originHost.aVP_Data
		PX_ServerName//vc_originHost.aVP_Data
		// indicating the name of the S-CSCF which originated the last update
		),
		vc_destinationRealm,
		@@ -5398,12 +5398,16 @@ module DiameterCxDx_Cx_TCFunctions {
		mw_reason_Code_AVP(NEW_SERVER_ASSIGNED_E)
		))));
		// include to be validated
		f_send_RTA(m_RTA_Msg(vc_sessionId,
		m_RTA_basic(vc_originHost,
		f_send_RTA(
		m_RTA_Msg(vc_sessionId,
		m_RTA_basic(
		vc_originHost,
		vc_originRealm,
		m_resultCode
		(DIAMETER_SUCCESS_E),
		omit)));
		m_resultCode(
		DIAMETER_SUCCESS_E
		),
		omit
		)));
		// Clause 'then': the IUT sends an RT-Request to old S-CSCF
		f_awaiting_RTR(
		mw_RTR_Msg(
		@@ -5412,7 +5416,7 @@ module DiameterCxDx_Cx_TCFunctions {
		?, // containing a Origin-Host AVP
		vc_originRealm,
		m_destinationHost( // containing a Destination-Host AVP
		vc_originHost.aVP_Data
		PX_OtherServerName//vc_originHost.aVP_Data
		// indicating the name of the S-CSCF which originated the last update
		),
		vc_destinationRealm,
		@@ -5429,12 +5433,9 @@ module DiameterCxDx_Cx_TCFunctions {
		m_resultCode
		(DIAMETER_SUCCESS_E),
		omit)));

		vc_sessionId := v_sessionId;
		vc_serverName := v_serverName;
		f_awaiting_MAA(
		mw_MAA_Msg(
		vc_sessionId,
		vc_sessionId2,
		mw_MAA_ResulExpreUsrnaSipauthSrvna(
		mw_resultCode( // containing a Result-Code AVP
		DIAMETER_SUCCESS_E // indicating DIAMETER_SUCCESS
		@@ -5450,6 +5451,13 @@ module DiameterCxDx_Cx_TCFunctions {
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		// Postamble
		//send 2nd UAR await UAA, SAR/SAA exchange
		f_hssSecondRegistratonCx(vc_sessionId2,m_uar_Flags_Cx); // With SUBEQUENT_REGISTRATION
		f_s_SAR_SAA(vc_sessionId2, REGISTRATION_E); // SAR registration
		f_hssDeregistrationCx(vc_sessionId2);

		vc_sessionId := v_sessionId;
		vc_serverName := m_serverName(PX_ServerName);
		f_hssDeregistrationCx(vc_sessionId);
		f_postamble_HSS();
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());

Admin message