Commit 21807dd8 authored by pintar's avatar pintar
Browse files

corrections due to validation of STF346 from week 47

parent 807895a8

BC/ttcn/AtsIms_Isc_TCFunctions.ttcn

+6 −6
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ group InitialRequest { 
		f_awaitingINVITE(mw_INVITE_Request_Base);

		

		// 180 response including p-charging-vector

		f_sendResponse(m_Response_18XonINVITE_PchargingVector(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via));

		f_sendResponse(m_Response_18XonINVITE_PchargingVector(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, m_pChargingVector_termIoi_fixedValue(vc_userprofile.homeDomain)));



		

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -987,7 +987,7 @@ group InitialRequest { 
		f_awaitingINVITE(mw_INVITE_Request_Base); 



		// 2xx response including p-charging-vector

		f_sendResponse(m_Response_2xxonINVITE_PchargingVector(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_sendResponse(m_Response_2xxonINVITE_PchargingVector(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, vc_route, f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local)), vc_contact, m_pChargingVector_termIoi_fixedValue(vc_userprofile.homeDomain)));

		

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


		// 	MESSAGE UE1@AS1

 		LibIms_Steps.f_setHeadersMESSAGE(p_cSeq_s,c_userProfile_UE2atSUThome);

		f_SendMESSAGE(m_MESSAGE_Request_PCharging_IMS(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, omit, vc_route, omit, m_pChargingVector_fixedValue(vc_userprofile.homeDomain)));

		f_SendMESSAGE(m_MESSAGE_Request_PCharging_IMS(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, omit, vc_route, omit, m_pChargingVector_origIoi_fixedValue(vc_userprofile.homeDomain)));



		f_awaitingResponse(?);

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


		// 	MESSAGE UE1@AS1

		LibIms_Steps.f_setHeadersMESSAGE(p_cSeq_s,c_userProfile_UE2atSUThome);

		f_SendMESSAGE(m_MESSAGE_Request_PCharging_IMS(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, omit, vc_route, omit, m_pChargingVector_fixedValue1(vc_userprofile.homeDomain)));

		f_SendMESSAGE(m_MESSAGE_Request_PCharging_IMS(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, omit, vc_route, omit, m_pChargingVector_origIoi_fixedValue1(vc_userprofile.homeDomain)));



		f_awaitingResponse(?);
@@ -2986,7 +2986,7 @@ group TargetRefreshRequest { 


		f_awaitingINVITE(mw_INVITE_Request_callid(vc_callId)); //Re-INVITE

		// 2xx response including p-charging-vector

		f_sendResponse(m_Response_2xxonINVITE_PchargingVector(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_sendResponse(m_Response_2xxonINVITE_PchargingVector(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, vc_route, f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local)), vc_contact, m_pChargingVector_termIoi_fixedValue(vc_userprofile.homeDomain)));

		f_awaitingACK(mw_ACK_Request_Base(vc_callId));



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


		f_awaitingINVITE(mw_INVITE_Request_callid(vc_callId)); //Re-INVITE

		// 2xx response including p-charging-vector

		f_sendResponse(m_Response_2xxonINVITE_PchargingVector(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_sendResponse(m_Response_2xxonINVITE_PchargingVector(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, vc_route, f_recordroute(), valueof(m_MBody_SDP(vc_sdp_local)), vc_contact, m_pChargingVector_termIoi_fixedValue(vc_userprofile.homeDomain)));

		f_awaitingACK(mw_ACK_Request_Base(vc_callId));



		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

BC/ttcn/AtsIms_Mw_TCFunctions.ttcn

+323 −120

File changed.

Preview size limit exceeded, changes collapsed.

BC/ttcn/AtsIms_Mw_Testcases.ttcn

+21 −18
Original line number Diff line number Diff line
@@ -695,17 +695,18 @@ module AtsIms_Mw_Testcases 
		runs on ServerSyncComp

		system TestAdapter {

			//Variables

			var ImsComponent v_imsComponent_ue1, v_imsComponent_mw;

			f_cf_1Mwi1Gm_M3Up(v_imsComponent_ue1, v_imsComponent_mw);

			var ImsComponent v_imsComponent_ue1, v_imsComponent_mwi, v_imsComponent_mws;

			f_cf_1Mwi1Mws1Gm_M3Up(v_imsComponent_ue1, v_imsComponent_mwi, v_imsComponent_mws);



			//Start

			f_IncCSeq(p_cSeq_s); v_imsComponent_ue1.start(f_TC_IMST2_MW_REG_14_UE1(p_cSeq_s));

			f_IncCSeq(p_cSeq_s); v_imsComponent_mw.start(f_TC_IMST2_MW_REG_14_IMS(p_cSeq_s));

			f_IncCSeq(p_cSeq_s); v_imsComponent_mwi.start(f_TC_IMST2_MW_REG_14_IMSI(p_cSeq_s));

			f_IncCSeq(p_cSeq_s); v_imsComponent_mws.start(f_TC_IMST2_MW_REG_14_IMSS(p_cSeq_s));



			// synchronize both PTCs on 2 sychronization points

			f_serverSync2Clients({c_prDone, c_tbDone});

			// synchronize PTCs on 2 sychronization points

			f_serverSync3Clients({c_prDone, c_tbDone});



			f_cf_1Mwi1Gm_M3Down(v_imsComponent_ue1, v_imsComponent_mw);

			f_cf_1Mwi1Mws1Gm_M3Down(v_imsComponent_ue1, v_imsComponent_mwi, v_imsComponent_mws);



		} // end TC_IMST2_MW_REG_14
@@ -972,17 +973,18 @@ module AtsIms_Mw_Testcases 
		runs on ServerSyncComp

		system TestAdapter {

			//Variables

			var ImsComponent v_imsComponent_ue1, v_imsComponent_mw;

			f_cf_1Mwi1Gm_M3Up(v_imsComponent_ue1, v_imsComponent_mw);

			var ImsComponent v_imsComponent_ue1, v_imsComponent_mwi, v_imsComponent_mws;

			f_cf_1Mwi1Mws1Gm_M3Up(v_imsComponent_ue1, v_imsComponent_mwi, v_imsComponent_mws);



			//Start

			f_IncCSeq(p_cSeq_s); v_imsComponent_ue1.start(f_TC_IMST2_MW_INI_01_UE1(p_cSeq_s));

			f_IncCSeq(p_cSeq_s); v_imsComponent_mw.start(f_TC_IMST2_MW_INI_01_IMS(p_cSeq_s));

			f_IncCSeq(p_cSeq_s); v_imsComponent_mwi.start(f_TC_IMST2_MW_INI_01_IMSI(p_cSeq_s));

			f_IncCSeq(p_cSeq_s); v_imsComponent_mws.start(f_TC_IMST2_MW_INI_01_IMSS(p_cSeq_s));



			// synchronize both PTCs on 2 sychronization points

			f_serverSync2Clients({c_prDone, c_tbDone});

			f_serverSync3Clients({c_prDone, c_tbDone});



			f_cf_1Mwi1Gm_M3Down(v_imsComponent_ue1, v_imsComponent_mw);

			f_cf_1Mwi1Mws1Gm_M3Down(v_imsComponent_ue1, v_imsComponent_mwi, v_imsComponent_mws);



		} // end TC_IMST2_MW_INI_01
@@ -993,17 +995,18 @@ module AtsIms_Mw_Testcases 
		runs on ServerSyncComp

		system TestAdapter {

       		//Variables

			var ImsComponent v_imsComponent_ue1, v_imsComponent_mw;

			f_cf_1Mwi1Gm_M3Up(v_imsComponent_ue1, v_imsComponent_mw);

			var ImsComponent v_imsComponent_ue1, v_imsComponent_mwi, v_imsComponent_mws;

			f_cf_1Mwi1Mws1Gm_M3Up(v_imsComponent_ue1, v_imsComponent_mwi, v_imsComponent_mws);



			//Start

			f_IncCSeq(p_cSeq_s); v_imsComponent_ue1.start(f_TC_IMST2_MW_INI_02_UE1(p_cSeq_s));

			f_IncCSeq(p_cSeq_s); v_imsComponent_mw.start(f_TC_IMST2_MW_INI_02_IMS(p_cSeq_s));

			f_IncCSeq(p_cSeq_s); v_imsComponent_mwi.start(f_TC_IMST2_MW_INI_02_IMSI(p_cSeq_s));

			f_IncCSeq(p_cSeq_s); v_imsComponent_mws.start(f_TC_IMST2_MW_INI_02_IMSS(p_cSeq_s));



			// synchronize both PTCs on 2 sychronization points

			f_serverSync2Clients({c_prDone, c_tbDone});

			f_serverSync3Clients({c_prDone, c_tbDone});



			f_cf_1Mwi1Gm_M3Down(v_imsComponent_ue1, v_imsComponent_mw);

			f_cf_1Mwi1Mws1Gm_M3Down(v_imsComponent_ue1, v_imsComponent_mwi, v_imsComponent_mws);



		} // end TC_IMST2_MW_INI_02
@@ -1391,7 +1394,7 @@ module AtsIms_Mw_Testcases 


		} // end TC_IMST2_MW_INI_20

		

		/* @desc TC_IMST2_MW_INI_21 / Config Ref: CF_1Mw1Gm UserProfileRef: M4b

		/* @desc TC_IMST2_MW_INI_21 / Config Ref: CF_1Mw1Gm UserProfileRef: M4a

		* @param p_cSeq_s Transaction Id

		*/

		testcase TC_IMST2_MW_INI_21(inout CSeq p_cSeq_s)

BC/ttcn/AtsIms_TestConfiguration.ttcn

+57 −0
Original line number Diff line number Diff line
@@ -136,6 +136,38 @@ group auxSipFunction { 
			f_setVerdict(v_ret);

		}//end f_cf_1Mwi1Gm_M3Up

	

		/**

		 * 

		 * @desc Creates test configuration of CF_1Mwi1Gm_M3: UserProfileRef: M3 - PCSCF from SUT conected with component ICSCF and SCSCF from TS

		 * @param p_imsComponent_mwi1	mwi1 component

		 * @param p_imsComponent_mws1	mws1 component

		 * @param p_imsComponent_ue1	ue1 component

		 */

		function f_cf_1Mwi1Mws1Gm_M3Up(out ImsComponent p_imsComponent_ue1,

								   	   out ImsComponent p_imsComponent_mwi1,

									   out ImsComponent p_imsComponent_mws1)

		runs on ServerSyncComp 

		{

			//Variables

			var FncRetCode v_ret := e_success;



			//Create

			p_imsComponent_ue1 := ImsComponent.create ;

			p_imsComponent_mwi1 := ImsComponent.create ;

			p_imsComponent_mws1 := ImsComponent.create ;



			//Connect	

			connect(p_imsComponent_ue1:syncPort, self:syncPort) ;

			connect(p_imsComponent_mwi1:syncPort, self:syncPort) ;

			connect(p_imsComponent_mws1:syncPort, self:syncPort) ;	

			//Map 

			map(p_imsComponent_ue1:SIPP, system:UE1);// Init test Configuration

			map(p_imsComponent_mwi1:SIPP, system:MW_P1);// Init test Configuration

			map(p_imsComponent_mws1:SIPP, system:MW_P2);// Init test Configuration

			

			f_setVerdict(v_ret);

		}//end f_cf_1Mwi1Mws1Gm_M3Up

	

		/**

		 * 

		 * @desc Creates test configuration of CF_1Mwi1Gm_M4a: UserProfileRef: M4a - SCSCF from SUT conected with component ICSCF from TS
@@ -445,6 +477,31 @@ group auxSipFunction { 
			unmap(p_imsComponent_mwi1:SIPP, system:MW_P1);

		}//end f_cf_1Mwi1Gm_M3Down



		/**

		* 

		* @desc Deletes configuration of CF_1Mwi1Mws1Gm_M3: UserProfileRef: M3

		* @param p_imsComponent_mwi1	mwi1 component

		* @param p_imsComponent_mws1	mws1 component

		* @param p_imsComponent_ue1		ue1 component		

		*/

		function f_cf_1Mwi1Mws1Gm_M3Down( in ImsComponent p_imsComponent_ue1,

									  	  in ImsComponent p_imsComponent_mwi1,

										  in ImsComponent p_imsComponent_mws1

									  )

		runs on ServerSyncComp 

		{

			f_serverWaitForAllClientsToStop();



			//Disconnect

			disconnect(p_imsComponent_ue1:syncPort, self:syncPort);

			disconnect(p_imsComponent_mwi1:syncPort, self:syncPort);

			disconnect(p_imsComponent_mws1:syncPort, self:syncPort);

			//Unmap

			unmap(p_imsComponent_ue1:SIPP, system:UE1);

			unmap(p_imsComponent_mwi1:SIPP, system:MW_P1);

			unmap(p_imsComponent_mws1:SIPP, system:MW_P2);

		}//end f_cf_1Mwi1Mws1Gm_M3Down



		/**

		* 

		* @desc Deletes configuration of CF_1Mwi1Gm_M4a: UserProfileRef: M4a

BC/ttcn/AtsIms_TestSystem.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ module AtsIms_TestSystem 
		** @desc  The test system interface

		*/

		type component TestAdapter {

			port SipPort UE1, UE2, MW_P1, MW_I1, MW_S1, MW_I2, MW_S2, IC1, IC2, ISC1, ISC2;

			port SipPort UE1, UE2, MW_P1, MW_P2, MW_I1, MW_S1, MW_I2, MW_S2, IC1, IC2, ISC1, ISC2;

			port operatorPort_SIP opPortS;

		}

	} // end Group TestSystemInterfaces