Commit 85808b8d authored by pintar's avatar pintar
Browse files

Sync corrections due to ISUP side and TSS/TP document

parent c937a242
Loading
Loading
Loading
Loading
+35 −52
Original line number Diff line number Diff line
@@ -9906,8 +9906,6 @@ module SipIsup_IMS_TCFunctions {
					
					f_awaitingResponse(mw_Response_Base(c_statusLine180,vc_callId, vc_cSeq));
					
					f_check_Ringing();
					
					f_awaitingResponse(mw_Response_Base(c_statusLine200,vc_callId, vc_cSeq));					
					f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));		
					
@@ -9945,11 +9943,11 @@ module SipIsup_IMS_TCFunctions {
					f_sendResponse(m_Response_2xxonINVITE(c_statusLine200,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,f_route(),valueof(m_MBody_SDP(vc_sdp_local))));
					f_awaitingACK(mw_ACK_Request_Base(vc_callId));
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					//Send BYE and awaiting response
					f_terminateCall_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);
										
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_502_001
				
@@ -9971,13 +9969,9 @@ module SipIsup_IMS_TCFunctions {
					
					f_awaitingResponse(mw_Response_Base(c_statusLine180,vc_callId, vc_cSeq));
					
					f_check_Ringing();
					
					f_awaitingResponse(mw_Response_Base(c_statusLine200,vc_callId, vc_cSeq));					
					f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));
										
					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync point 1
					
					//	send UPDATE, await 200					
					f_SIP_modSessionDirection(m_attribute_sendonly); // handling of attribute in session
					f_SendUPDATE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, m_Supported_prec, omit, m_MBody_SDP(vc_sdp_local)));
@@ -9985,7 +9979,7 @@ module SipIsup_IMS_TCFunctions {
					f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));		
					f_SIP_checkSDPrespDirection(mw_attribute_recvonly);

					f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict());// sync point 2	
					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync point 1	

					//send UPDATE, await 200					
					f_SIP_modSessionDirection(m_attribute_sendrecv); // handling of attribute in session
@@ -9994,11 +9988,11 @@ module SipIsup_IMS_TCFunctions {
					f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));		
					f_SIP_checkSDPrespDirection(mw_attribute_sendrecv);
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					//Send BYE and awaiting response
					f_terminateCall_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_502_002
				
@@ -10028,9 +10022,6 @@ module SipIsup_IMS_TCFunctions {
					
					f_awaitingResponse(mw_Response_Base(c_statusLine180,vc_callId, vc_cSeq));
										

					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync point 1
					
					//	send UPDATE, await 200					
					f_SIP_modSessionDirection(m_attribute_sendonly); // handling of attribute in session
					f_SendUPDATE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, m_Supported_prec, omit, m_MBody_SDP(vc_sdp_local)));
@@ -10038,7 +10029,7 @@ module SipIsup_IMS_TCFunctions {
					f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));		
					f_SIP_checkSDPrespDirection(mw_attribute_recvonly);

					f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict());// sync point 2	
					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync point 1	

					//send UPDATE, await 200					
					f_SIP_modSessionDirection(m_attribute_sendrecv); // handling of attribute in session
@@ -10047,11 +10038,11 @@ module SipIsup_IMS_TCFunctions {
					f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));		
					f_SIP_checkSDPrespDirection(mw_attribute_sendrecv);
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					//Send BYE and awaiting response
					f_terminateCall_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_502_004
				
@@ -10089,11 +10080,11 @@ module SipIsup_IMS_TCFunctions {
					f_sendResponse(m_Response_2xxonUPDATE(c_statusLine200,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,f_route(),valueof(m_MBody_SDP(vc_sdp_local))));
					f_awaitingACK(mw_ACK_Request_Base(vc_callId));
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					//Send BYE and awaiting response
					f_terminateCall_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_502_005
				
@@ -10115,8 +10106,6 @@ module SipIsup_IMS_TCFunctions {
					
					f_awaitingResponse(mw_Response_Base(c_statusLine180,vc_callId, vc_cSeq));
					
					f_check_Ringing();
					
					f_awaitingResponse(mw_Response_Base(c_statusLine200,vc_callId, vc_cSeq));					
					f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));		
					
@@ -10154,11 +10143,11 @@ module SipIsup_IMS_TCFunctions {
					f_sendResponse(m_Response_2xxonINVITE(c_statusLine200,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via,vc_contact,f_route(),valueof(m_MBody_SDP(vc_sdp_local))));
					f_awaitingACK(mw_ACK_Request_Base(vc_callId));
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					//Send BYE and awaiting response
					f_terminateCall_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_502_006
				
@@ -10180,8 +10169,6 @@ module SipIsup_IMS_TCFunctions {
					
					f_awaitingResponse(mw_Response_Base(c_statusLine180,vc_callId, vc_cSeq));
					
					f_check_Ringing();
					
					f_awaitingResponse(mw_Response_Base(c_statusLine200,vc_callId, vc_cSeq));					
					f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));		
					
@@ -10219,11 +10206,11 @@ module SipIsup_IMS_TCFunctions {
					f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));		
					f_SIP_checkSDPrespDirection(mw_attribute_sendrecv);
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					//Send BYE and awaiting response
					f_terminateCall_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To);
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_502_007
				
@@ -10238,7 +10225,7 @@ module SipIsup_IMS_TCFunctions {
			group TP505_3PTY {
			} // end group TP505_3PTY
			
			group TP506_COL {
			group TP506_COLP {
				
				/* 
				* @desc		This is the test case function (SIP side) for TC_506_001
@@ -10379,7 +10366,6 @@ module SipIsup_IMS_TCFunctions {
					f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, omit, omit, m_MBody_SDP(vc_sdp_local)));

					f_awaitingResponse(mw_Response_Base(c_statusLine180,vc_callId, vc_cSeq));
					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync 1
					
					f_check_Ringing();

@@ -10389,11 +10375,11 @@ module SipIsup_IMS_TCFunctions {

					f_check_Conversation();

					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

					//await BYE and send 200 OK
					f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));

					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_507_001
				
@@ -10539,7 +10525,6 @@ module SipIsup_IMS_TCFunctions {
					f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, omit, omit, m_MBody_SDP(vc_sdp_local)));
	
					f_awaitingResponse(mw_Response_Base(c_statusLine180,vc_callId, vc_cSeq)); 
					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync 1
					f_check_Ringing();
	
					f_awaitingResponse(mw_Response_Base(c_statusLine200,vc_callId, vc_cSeq)); 
@@ -10591,16 +10576,14 @@ module SipIsup_IMS_TCFunctions {
					f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));		
	
					f_check_Conversation();
					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());// sync 1
					
					f_check_Conversation();	
					f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict());// sync 2
	
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					//await BYE and send 200 OK
					f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
	
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
	
					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_511_001
				
@@ -10639,11 +10622,11 @@ module SipIsup_IMS_TCFunctions {
	
					f_check_Conversation();
	
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					//await BYE and send 200 OK
					f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
	
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
	
					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_511_003
				
@@ -10757,11 +10740,11 @@ module SipIsup_IMS_TCFunctions {
                    	
                    f_check_Conversation();
                    	
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                    					
                    //await BYE and send 200 OK
                    f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
                    	
                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                    	
                    f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_514_001
				
@@ -10826,11 +10809,11 @@ module SipIsup_IMS_TCFunctions {
					
					f_check_Conversation();
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					//await BYE and send 200 OK
					f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_516_001
				
@@ -10862,11 +10845,11 @@ module SipIsup_IMS_TCFunctions {
					
					f_check_Conversation();
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					//await BYE and send 200 OK
					f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_516_002
				
@@ -10898,11 +10881,11 @@ module SipIsup_IMS_TCFunctions {
					
					f_check_Conversation();
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					//await BYE and send 200 OK
					f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_516_003
				
@@ -10934,11 +10917,11 @@ module SipIsup_IMS_TCFunctions {
					
					f_check_Conversation();
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					//await BYE and send 200 OK
					f_awaitingBYE_sendReply(mw_BYE_Request_Base(vc_callId));
					
					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
					
					f_SIP_postamble_IMS1_withoutRegistration();
				} // end function f_IMS_TC_516_004