Commit 64253883 authored by rennoch's avatar rennoch
Browse files

extended response templates due to "forbidden" use of functions with component... 

extended response templates due to "forbidden" use of functions with component variables (error with ttwb 1.1.8)
parent b2b6c22d

BC/ttcn/AtsIms_Ic_TCFunctions.ttcn

+23 −23
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ group Registration { 
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Testbody



		f_sendResponse(m_Response_mbody(c_statusLine301,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine301,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));



		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		//Postamble
@@ -406,7 +406,7 @@ group Registration { 
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Testbody



		f_sendResponse(m_Response_mbody(c_statusLine301,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine301,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));



		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		//Postamble
@@ -707,12 +707,12 @@ group InitialRequest { 
		

		f_awaitingINVITE(mw_INVITE_Request_TH); 



		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());



		// POSTAMBLE: send final response, await ACK, await termination

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_awaitingACK(mw_ACK_Request_Base(vc_callId));

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

		f_awaitingINVITE(mw_INVITE_Request_TH); 



		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -1065,7 +1065,7 @@ group InitialRequest { 
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Testbody



		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));



		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -1137,7 +1137,7 @@ group InitialRequest { 
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Testbody



		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));



		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -1517,8 +1517,8 @@ group SubsequentRequest { 
		

		f_awaitingINVITE(mw_INVITE_Request_TH); 



		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_awaitingACK(mw_ACK_Request_Base(vc_callId));



		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -1595,8 +1595,8 @@ group SubsequentRequest { 
		

		f_awaitingINVITE(mw_INVITE_Request_TH); 



		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_awaitingACK(mw_ACK_Request_Base(vc_callId));



		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -1675,8 +1675,8 @@ group SubsequentRequest { 
		

		f_awaitingINVITE(mw_INVITE_Request_TH); 



		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_awaitingACK(mw_ACK_Request_Base(vc_callId));



		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -1753,8 +1753,8 @@ group SubsequentRequest { 
		

		f_awaitingINVITE(mw_INVITE_Request_TH); 



		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_awaitingACK(mw_ACK_Request_Base(vc_callId));



		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -1826,8 +1826,8 @@ group SubsequentRequest { 
		

		f_awaitingINVITE(mw_INVITE_Request_TH); 



		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_awaitingACK(mw_ACK_Request_Base(vc_callId));



		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -1918,8 +1918,8 @@ group TargetRefreshRequest { 
		// Note: UE1 is registerd in SUT only, but not registered in IMS1

		

		f_awaitingINVITE(mw_INVITE_Request_TH); // initial INVITE

		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));



		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -1935,7 +1935,7 @@ group TargetRefreshRequest { 
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());



		// POSTAMBLE: send final response, await ACK, await termination

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_awaitingACK(mw_ACK_Request_Base(vc_callId));

		f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
@@ -1978,7 +1978,7 @@ group TargetRefreshRequest { 
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		

		// POSTAMBLE: send final response, await ACK, await termination

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_awaitingACK(mw_ACK_Request_Base(vc_callId));



		f_terminateCall_UE(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);
@@ -2007,8 +2007,8 @@ group TargetRefreshRequest { 
		// Note: UE1 is registerd in SUT only, but not registered in IMS1

		

		f_awaitingINVITE(mw_INVITE_Request_TH); // initial INVITE

		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));

		f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));



		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

BC/ttcn/AtsIms_Isc_TCFunctions.ttcn

+45 −45

File changed.

Preview size limit exceeded, changes collapsed.

BC/ttcn/AtsIms_Mw_TCFunctions.ttcn

+11 −11
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ module AtsIms_Mw_TCFunctions 
			f_awaitingINVITE(mw_INVITE_Request_noPChargingFunction); 

		

			//send response - 200

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));			

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));			

					

			f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

			// TESTBODY
@@ -426,7 +426,7 @@ module AtsIms_Mw_TCFunctions 
			f_awaitingINVITE(mw_INVITE_Request_noPChargingFunction); 

		

			//send response - 200

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));			

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));			

					

			f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done

			// TESTBODY
@@ -2365,7 +2365,7 @@ module AtsIms_Mw_TCFunctions 
				f_awaitingINVITE(mw_INVITE_Request_route(mw_route({mw_routeBody(f_initSipUrl(c_interfaceProfile_IMS_SUT_SCSCF))})));  // route header from 200OK-serviceroute to UE1

			

				//send response - 200

				f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));			

				f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));			

	

				// await ACK

				f_awaitingACK(mw_ACK_Request_PchargingVector(vc_callId, mw_pChargingVector("orig-ioi",?)));
@@ -2437,7 +2437,7 @@ module AtsIms_Mw_TCFunctions 
				));  

		

			//send response - 200

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));			

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));			



			// await ACK

			f_awaitingACK(mw_ACK_Request_PchargingVector(vc_callId, mw_pChargingVector("orig-ioi",?)));
@@ -2502,7 +2502,7 @@ module AtsIms_Mw_TCFunctions 
			f_awaitingINVITE(mw_INVITE_Request_PAsserted_noPPreferred(m_PAssertedID(mw_UE1_Addr_display)));  

		

			//send response - 200

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));			

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));			



			// await ACK

			f_awaitingACK(mw_ACK_Request_PchargingVector(vc_callId, mw_pChargingVector("orig-ioi",?)));
@@ -2571,13 +2571,13 @@ module AtsIms_Mw_TCFunctions 
			f_awaitingINVITE(mw_INVITE_Request_Base); // no specific constraints in TP

		

			//send response - 180

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));			

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));			



			f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

			//Postamble

				

			//send response - 200

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));			

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));			



			// await ACK

			f_awaitingACK(mw_ACK_Request_PchargingVector(vc_callId, mw_pChargingVector("orig-ioi",?)));
@@ -2643,7 +2643,7 @@ module AtsIms_Mw_TCFunctions 
			f_awaitingINVITE(mw_INVITE_Request_Base); // no specific constraints in TP

				

			//send response - 200

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));			

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));			

		

			f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

			//Postamble
@@ -3247,7 +3247,7 @@ module AtsIms_Mw_TCFunctions 
			f_awaitingINVITE(mw_INVITE_Request_SessionExpires(mw_se));  

		

			//send response - 200

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));			

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));			



			// await ACK

			f_awaitingACK(mw_ACK_Request_PchargingVector(vc_callId, mw_pChargingVector("orig-ioi",?)));
@@ -3314,7 +3314,7 @@ module AtsIms_Mw_TCFunctions 
			   { setverdict (fail);}

		

			//send response - 200

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));			

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));			



			// await ACK

			f_awaitingACK(mw_ACK_Request_PchargingVector(vc_callId, mw_pChargingVector("orig-ioi",?)));
@@ -4973,7 +4973,7 @@ module AtsIms_Mw_TCFunctions 
			// POSTAMBLE

			

			// send response - 200

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof(m_MBody_SDP(vc_sdp_local))));			

			f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, f_route(), f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local))));			

			

			// Sending of a BYE request

			f_SendBYE(m_BYE_Request_UE(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_route));