corrections (a5435795) · Commits · INT - Core Network and Interoperability Testing / IMS / IMS_CON_BC

BC/ttcn/AtsIms_Gm_TCFunctions.ttcn

+139 −79

File changed.

Preview size limit exceeded, changes collapsed.

BC/ttcn/AtsIms_Ic_TCFunctions.ttcn

+21 −4

Original line number	Diff line number	Diff line
		@@ -603,6 +603,7 @@ group InitialRequest {

		//POSTAMBLE: await response and send ACK and dereg
		f_awaitingResponse(?);
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_RemoveRegistration(vc_cSeq); // deregistration in SUT
		@@ -679,6 +680,7 @@ group InitialRequest {

		//POSTAMBLE: await 200OK, send ACK and BYE/200OK, dereg
		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));
		f_terminateCall_UE(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);

		@@ -754,6 +756,7 @@ group InitialRequest {
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		//POSTAMBLE: send ACK and BYE/200OK, dereg
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));
		f_terminateCall_UE(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);

		@@ -822,6 +825,7 @@ group InitialRequest {
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		// POSTAMBLE: send ACK,
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));


		@@ -900,6 +904,7 @@ group InitialRequest {
		//Postamble await response, ack and await termination

		f_awaitingResponse(mw_Response_Base(c_statusLine403,vc_callId,p_cSeq_s));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_SIP_postamble_IMS1_withoutRegistration();
		@@ -968,6 +973,7 @@ group InitialRequest {
		//Postamble await response and ack

		f_awaitingResponse(mw_Response_Base(c_statusLine403, *, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_SIP_postamble_IMS1_withoutRegistration();
		@@ -1039,6 +1045,7 @@ group InitialRequest {
		//Postamble await response, ack and await termination

		f_awaitingResponse(mw_Response_Base(c_statusLine200,vc_callId,p_cSeq_s));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
		@@ -1109,7 +1116,7 @@ group InitialRequest {

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
		//Postamble await response, ack and await termination

		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
		@@ -1181,7 +1188,7 @@ group InitialRequest {

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
		//Postamble await response, ack and await termination

		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
		@@ -1289,6 +1296,7 @@ group StandaloneRequest {


		//POSTAMBLE: send ACK, dereg
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_RemoveRegistration(vc_cSeq); // de-register in SUT
		@@ -1484,6 +1492,7 @@ group SubsequentRequest {

		f_awaitingResponse(mw_Response_Base(c_statusLine180, vc_callId, vc_cSeq));
		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		@@ -1559,6 +1568,7 @@ group SubsequentRequest {

		f_awaitingResponse(mw_Response_Base(c_statusLine180, vc_callId, vc_cSeq));
		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		@@ -1633,6 +1643,7 @@ group SubsequentRequest {

		f_awaitingResponse(mw_Response_Base(c_statusLine180, vc_callId, vc_cSeq));
		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		@@ -1717,6 +1728,7 @@ group SubsequentRequest {

		f_awaitingResponse(mw_Response_Base(c_statusLine180, vc_callId, vc_cSeq));
		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		@@ -1794,6 +1806,7 @@ group SubsequentRequest {

		f_awaitingResponse(mw_Response_Base(c_statusLine180, vc_callId, vc_cSeq));
		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		@@ -1876,6 +1889,7 @@ group TargetRefreshRequest {

		f_awaitingResponse(mw_Response_Base(c_statusLine180, vc_callId, vc_cSeq));
		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		@@ -1883,13 +1897,14 @@ group TargetRefreshRequest {

		// Re-INVITE UE1@IMS1
		// Re-INVITE UE1@IMS1
		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq);
		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq, true);
		f_SendINVITE(m_INVITE_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, omit, m_MBody_SDP(vc_sdp_local)));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		//POSTAMBLE: await response and send ACK (on re-invite), terminate call and dereg
		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_terminateCall_UE(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);
		@@ -1963,6 +1978,7 @@ group TargetRefreshRequest {

		f_awaitingResponse(mw_Response_Base(c_statusLine180, vc_callId, vc_cSeq));
		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		@@ -2015,13 +2031,14 @@ group TargetRefreshRequest {
		// Testbody

		// Re-INVITE IMS1@UE1
		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq);
		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq, false);
		f_SendINVITE(m_INVITE_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, omit, m_MBody_SDP(vc_sdp_local)));


		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

BC/ttcn/AtsIms_Isc_TCFunctions.ttcn

+28 −18

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ group General {

		// Testbody

		f_awaitingMESSAGE(mw_MESSAGE_Request_Base (vc_callId));
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base);

		f_setHeadersForwardRequestFromAS(vc_cSeq);
		f_SendMESSAGE(m_MESSAGE_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));
		@@ -576,6 +576,7 @@ group InitialRequest {
		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

		//POSTAMBLE: send ACK and BYE/200OK, dereg
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));
		f_terminateCall_UE(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);

		@@ -705,6 +706,7 @@ group InitialRequest {


		//POSTAMBLE: send ACK and BYE/200OK, dereg
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));
		f_terminateCall_UE(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);

		@@ -827,6 +829,7 @@ group InitialRequest {
		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));

		//POSTAMBLE: send ACK and BYE/200OK, dereg
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));
		f_terminateCall_UE(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);

		@@ -961,6 +964,7 @@ group InitialRequest {


		//POSTAMBLE: send ACK and BYE/200OK, dereg
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));
		f_terminateCall_UE(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);

		@@ -1088,6 +1092,7 @@ group InitialRequest {


		//POSTAMBLE: send ACK and BYE/200OK, dereg
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_RemoveRegistration(vc_cSeq); // de-register in SUT
		@@ -1333,7 +1338,7 @@ group StandaloneRequest {
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Testbody
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base (vc_callId));
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base);
		f_sendResponse(m_Response_Base(c_statusLine503, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
		@@ -1362,7 +1367,7 @@ group StandaloneRequest {

		// Testbody
		// Testbody
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base (vc_callId));
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base);

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		@@ -1455,7 +1460,7 @@ group StandaloneRequest {
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Testbody
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base (vc_callId));
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base);
		f_sendResponse(m_Response_Base(c_statusLine408, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
		@@ -1484,7 +1489,7 @@ group StandaloneRequest {

		// Testbody
		// Testbody
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base (vc_callId));
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base);

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		@@ -1578,7 +1583,7 @@ group StandaloneRequest {
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Testbody
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base (vc_callId));
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base);

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		@@ -1606,7 +1611,7 @@ group StandaloneRequest {

		// Testbody
		// Testbody
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base (vc_callId));
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base);

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		@@ -1699,7 +1704,7 @@ group StandaloneRequest {
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Testbody
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base (vc_callId));
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base);
		f_sendResponse(m_Response_Base(c_statusLine503, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
		@@ -1820,7 +1825,7 @@ group StandaloneRequest {
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Testbody
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base (vc_callId));
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base);
		f_sendResponse(m_Response_Base(c_statusLine408, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
		@@ -2026,7 +2031,7 @@ group StandaloneRequest {


		// Testbody
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base (vc_callId));
		f_awaitingMESSAGE(mw_MESSAGE_Request_Base);

		//forward the message
		f_setHeadersForwardRequestFromAS(vc_cSeq);
		@@ -2335,6 +2340,7 @@ group SubsequentRequest {


		//POSTAMBLE: send ACK and BYE/200OK, dereg
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		@@ -2468,13 +2474,13 @@ group TargetRefreshRequest {


		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));


		// Re-INVITE UE1@IMS1

		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq);
		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq, true);
		f_SendINVITE(m_INVITE_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, omit, m_MBody_SDP(vc_sdp_local)));

		f_awaitingResponse(mw_Response_Base(c_statusLine100, vc_callId, vc_cSeq));
		@@ -2621,13 +2627,13 @@ group TargetRefreshRequest {


		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));


		// Re-INVITE UE1@IMS1

		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq);
		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq, true);
		f_SendINVITE(m_INVITE_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, omit, m_MBody_SDP(vc_sdp_local)));

		f_awaitingResponse(mw_Response_Base(c_statusLine100, vc_callId, vc_cSeq));
		@@ -2778,13 +2784,13 @@ group TargetRefreshRequest {


		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));


		// Re-INVITE UE1@IMS1

		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq);
		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq, true);
		f_SendINVITE(m_INVITE_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, omit, m_MBody_SDP(vc_sdp_local)));

		f_awaitingResponse(mw_Response_Base(c_statusLine100, vc_callId, vc_cSeq));
		@@ -2936,13 +2942,15 @@ group TargetRefreshRequest {


		//POSTAMBLE: send ACK and BYE/200OK, dereg
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		// Re-INVITE UE1@IMS1
		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq);
		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq, true);
		f_SendINVITE(m_INVITE_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, omit, m_MBody_SDP(vc_sdp_local)));

		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
		@@ -3099,13 +3107,15 @@ group TargetRefreshRequest {


		//POSTAMBLE: send ACK and BYE/200OK, dereg
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		// Re-INVITE UE1@IMS1
		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq);
		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq, true);
		f_SendINVITE(m_INVITE_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, omit, m_MBody_SDP(vc_sdp_local)));

		f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
		LibSip_Steps.f_setHeadersACK();
		f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

BC/ttcn/AtsIms_Mw_TCFunctions.ttcn

+70 −20

File changed.

Preview size limit exceeded, changes collapsed.