Commit 09bbf4c6 authored by rennoch's avatar rennoch
Browse files

corrections due to lib changes

parent 255c9b8d

AtsNIT_SipSip/ttcn/AtsNIT_SipSip_BC_TCFunctions.ttcn

+111 −9
Original line number Diff line number Diff line
@@ -45,7 +45,20 @@ module AtsNIT_SipSip_BC_TCFunctions { 
				* @param	p_CSeq_s Transaction Id

				*/

				function f_AtsNIT_TC_SS___XX__01UE1(in CSeq p_cSeq_s) runs on ImsComponent {

					f_IMS_preamble_withRegistrationBasic(c_userProfile_UE1atSUThome, p_cSeq_s); // assignment of PIXIT values to component variable

//BPIN	Basic used for MW registration - visiting over mw				f_IMS_preamble_withRegistrationBasic(c_userProfile_UE1atSUThome, p_cSeq_s); // assignment of PIXIT values to component variable

                		var REGISTER_Request v_register;

                

                		v_register :=

                			valueof(m_REGISTER_Request_Base(vc_requestUri, vc_callId,

                											p_cSeq_s, vc_from, vc_to,

                											vc_via_REG, vc_contact,

                											vc_authorization));

                											

                		// preamble with send REGISTER, await 401, send REGISTER, await

                		// 200 OK and user profile setting

                		f_IMS_preamble_withRegistration(c_userProfile_UE1atSUThome,

                										p_cSeq_s, v_register);

                										

					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());



					// Testbody
@@ -109,13 +122,27 @@ module AtsNIT_SipSip_BC_TCFunctions { 
				* @param	p_CSeq_s Transaction Id

				*/

				function f_AtsNIT_TC_SS___XX__01UE2(in CSeq p_cSeq_s) runs on ImsComponent {

					f_IMS_preamble_withRegistrationBasic(c_userProfile_UE2atSUThome, p_cSeq_s); // assignment of PIXIT values to component variable

                     var REGISTER_Request v_register;

                                

                     v_register :=

                      valueof(m_REGISTER_Request_Base(vc_requestUri, vc_callId,

                              p_cSeq_s, vc_from, vc_to,

                              vc_via_REG, vc_contact,

                              vc_authorization));



					// IMS1 component interface initialization

					f_init_interfaceprofile(c_interfaceProfile_IMS_SUT_PCSCF2);

					// preamble with send REGISTER, await 401, send REGISTER, await

					// 200 OK and user profile setting

					f_IMS_preamble_withRegistration(c_userProfile_UE2atSUThome,

													p_cSeq_s, v_register);

                                										

					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());



					// Testbody

					

            		f_awaitingINVITE(mw_INVITE_Request_require(

            			mw_Require_not_100rel

            			(mw_Require_not_100rel,omit)

            		)); 

					f_sendResponse(m_Response_18XonINVITE_Require_ifpresent(

						c_statusLine180,
@@ -168,7 +195,18 @@ module AtsNIT_SipSip_BC_TCFunctions { 
				*/

				function f_AtsNIT_TC_SS___XX__02UE1(in CSeq p_cSeq_s) runs on ImsComponent {

					var CSeq v_INVITE_CSeq;

					f_IMS_preamble_withRegistrationBasic(c_userProfile_UE1atSUThome, p_cSeq_s); // assignment of PIXIT values to component variable

					var REGISTER_Request v_register;

                

					v_register :=

						valueof(m_REGISTER_Request_Base(vc_requestUri, vc_callId,

														p_cSeq_s, vc_from, vc_to,

														vc_via_REG, vc_contact,

														vc_authorization));

					// preamble with send REGISTER, await 401, send REGISTER, await

					// 200 OK and user profile setting

					f_IMS_preamble_withRegistration(c_userProfile_UE1atSUThome,

													p_cSeq_s, v_register);

                										

					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());



					// Testbody
@@ -299,7 +337,21 @@ module AtsNIT_SipSip_BC_TCFunctions { 
				* @param	p_CSeq_s Transaction Id

				*/

				function f_AtsNIT_TC_SS___XX__02UE2(in CSeq p_cSeq_s) runs on ImsComponent {

					f_IMS_preamble_withRegistrationBasic(c_userProfile_UE2atSUThome, p_cSeq_s); // assignment of PIXIT values to component variable

					var REGISTER_Request v_register;

                

					v_register :=

						valueof(m_REGISTER_Request_Base(vc_requestUri, vc_callId,

														p_cSeq_s, vc_from, vc_to,

														vc_via_REG, vc_contact,

														vc_authorization));

					// IMS1 component interface initialization



					f_init_interfaceprofile(c_interfaceProfile_IMS_SUT_PCSCF2);

					// preamble with send REGISTER, await 401, send REGISTER, await

					// 200 OK and user profile setting

					f_IMS_preamble_withRegistration(c_userProfile_UE2atSUThome,

													p_cSeq_s, v_register);

                										

					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());



					// Testbody
@@ -388,7 +440,18 @@ module AtsNIT_SipSip_BC_TCFunctions { 
				* @param	p_CSeq_s Transaction Id

				*/

				function f_AtsNIT_TC_SS___XX__03UE1(in CSeq p_cSeq_s) runs on ImsComponent {

					f_IMS_preamble_withRegistrationBasic(c_userProfile_UE1atSUThome, p_cSeq_s); // assignment of PIXIT values to component variable

					var REGISTER_Request v_register;

                

					v_register :=

						valueof(m_REGISTER_Request_Base(vc_requestUri, vc_callId,

														p_cSeq_s, vc_from, vc_to,

														vc_via_REG, vc_contact,

														vc_authorization));

					// preamble with send REGISTER, await 401, send REGISTER, await

					// 200 OK and user profile setting

					f_IMS_preamble_withRegistration(c_userProfile_UE1atSUThome,

													p_cSeq_s, v_register);

                										

					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());



					// Testbody
@@ -458,7 +521,21 @@ module AtsNIT_SipSip_BC_TCFunctions { 
				* @param	p_CSeq_s Transaction Id

				*/

				function f_AtsNIT_TC_SS___XX__03UE2(in CSeq p_cSeq_s) runs on ImsComponent {

					f_IMS_preamble_withRegistrationBasic(c_userProfile_UE2atSUThome, p_cSeq_s); // assignment of PIXIT values to component variable

					var REGISTER_Request v_register;

                

					v_register :=

						valueof(m_REGISTER_Request_Base(vc_requestUri, vc_callId,

														p_cSeq_s, vc_from, vc_to,

														vc_via_REG, vc_contact,

														vc_authorization));



					// IMS1 component interface initialization

					f_init_interfaceprofile(c_interfaceProfile_IMS_SUT_PCSCF2);

					// preamble with send REGISTER, await 401, send REGISTER, await

					// 200 OK and user profile setting

					f_IMS_preamble_withRegistration(c_userProfile_UE2atSUThome,

													p_cSeq_s, v_register);

                										

					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());



					// Testbody
@@ -508,7 +585,18 @@ module AtsNIT_SipSip_BC_TCFunctions { 
				*/

				function f_AtsNIT_TC_SS___XX__04UE1(in CSeq p_cSeq_s) runs on ImsComponent {

					var CSeq v_INVITE_CSeq;

					f_IMS_preamble_withRegistrationBasic(c_userProfile_UE1atSUThome, p_cSeq_s); // assignment of PIXIT values to component variable

					var REGISTER_Request v_register;

                

					v_register :=

						valueof(m_REGISTER_Request_Base(vc_requestUri, vc_callId,

														p_cSeq_s, vc_from, vc_to,

														vc_via_REG, vc_contact,

														vc_authorization));

					// preamble with send REGISTER, await 401, send REGISTER, await

					// 200 OK and user profile setting

					f_IMS_preamble_withRegistration(c_userProfile_UE1atSUThome,

													p_cSeq_s, v_register);

                										

					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());



					// Testbody
@@ -645,7 +733,21 @@ module AtsNIT_SipSip_BC_TCFunctions { 
				* @param	p_CSeq_s Transaction Id

				*/

				function f_AtsNIT_TC_SS___XX__04UE2(in CSeq p_cSeq_s) runs on ImsComponent {

					f_IMS_preamble_withRegistrationBasic(c_userProfile_UE2atSUThome, p_cSeq_s); // assignment of PIXIT values to component variable

					var REGISTER_Request v_register;

                

					v_register :=

						valueof(m_REGISTER_Request_Base(vc_requestUri, vc_callId,

														p_cSeq_s, vc_from, vc_to,

														vc_via_REG, vc_contact,

														vc_authorization));



					// IMS1 component interface initialization

					f_init_interfaceprofile(c_interfaceProfile_IMS_SUT_PCSCF2);

					// preamble with send REGISTER, await 401, send REGISTER, await

					// 200 OK and user profile setting

					f_IMS_preamble_withRegistration(c_userProfile_UE2atSUThome,

													p_cSeq_s, v_register);

                										

					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());



					// Testbody

AtsNIT_SipSip/ttcn/AtsNIT_SipSip_SS_TCFunctions.ttcn

+47 −47

File changed.

Preview size limit exceeded, changes collapsed.

AtsNIT_SipSip/ttcn/AtsNIT_SipSip_Steps.ttcn

+3 −2
Original line number Diff line number Diff line
@@ -248,14 +248,15 @@ module AtsNIT_SipSip_Steps { 
		/**

		 * 

		 * @desc This function sends a re-INVITE request to put on hold a active call 

		 * @param	p_originating booleana indicator if user is originating party of the call

		 */

		function f_holdCall() runs on ImsComponent {

		function f_holdCall(in boolean p_orginatingSide) runs on ImsComponent {

			

			// change SDP to sendonly

			f_SIP_modSessionDirection(m_attribute_sendonly); 

			

			// prepare and send INVITE

    		LibIms_Steps.f_setHeadersReINVITE_(vc_cSeq);

    		LibIms_Steps.f_setHeadersReINVITE(vc_cSeq, p_orginatingSide);

    		f_SendINVITE(m_INVITE_Request_UE(

    			vc_requestUri, 

    			vc_callId,