Commit f0318e43 authored by wattelet's avatar wattelet
Browse files

MW REG TC update 2

parent f2519031

BC/ttcn/AtsIms_Mw_TCFunctions.ttcn

+37 −41
Original line number Diff line number Diff line
@@ -1259,9 +1259,9 @@ module AtsIms_Mw_TCFunctions 
			f_IMS_preamble_woRegistration(c_userProfile_UE1atSUTvisiting, p_cSeq_s); // assignment of PIXIT values to component variable



			f_setHeaders_REGISTER(p_cSeq_s);

			// send REGISTER //TODO security association - security-client

			// send REGISTER

			f_SendREGISTER(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

												 m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms

												 m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}), omit ,omit)); //LibIms

		

			f_awaitingResponse(mw_Response_Base(c_statusLine401, vc_callId, p_cSeq_s));
@@ -1270,9 +1270,9 @@ module AtsIms_Mw_TCFunctions 
			

			// set headers via, cseq and authorization

			f_setHeaders_2ndREGISTER(p_cSeq_s);

			// Re-send protected REGISTER //TODO security association - security-client, security-verify must be omit

			// Re-send protected REGISTER

			f_SendREGISTER(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

												 m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms	

												 m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}), omit ,omit)); //LibIms	

		

			f_awaitingResponse(mw_Response_Base(mw_statusLine4xx, vc_callId, p_cSeq_s));
@@ -1324,9 +1324,9 @@ module AtsIms_Mw_TCFunctions 
			f_IMS_preamble_woRegistration(c_userProfile_UE1atSUTvisiting, p_cSeq_s); // assignment of PIXIT values to component variable



			f_setHeaders_REGISTER(p_cSeq_s);

			// send REGISTER //TODO security association - security-client

			// send REGISTER

			f_SendREGISTER(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

												 m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms

												 m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}), omit ,omit)); //LibIms

		

			f_awaitingResponse(mw_Response_Base(c_statusLine401, vc_callId, p_cSeq_s));
@@ -1335,9 +1335,9 @@ module AtsIms_Mw_TCFunctions 
			

			// set headers via, cseq and authorization

			f_setHeaders_2ndREGISTER(p_cSeq_s);

			// Re-send protected REGISTER //TODO security association - security-client, security-verify must be different than 401.security-server

			// Re-send protected REGISTER

			f_SendREGISTER(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

												 m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms	

												 m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}),  m_securityVerify({PX_SecMechanism}) ,omit)); //LibIms	

		

			f_awaitingResponse(mw_Response_Base(mw_statusLine4xx, vc_callId, p_cSeq_s));
@@ -1364,23 +1364,25 @@ module AtsIms_Mw_TCFunctions 
		*/

		function f_TC_IMST2_MW_REG_08_UE1(in CSeq p_cSeq_s) runs on ImsComponent {

		

			var SecurityVerify v_securityVerify;

			f_IMS_preamble_woRegistration(c_userProfile_UE1atSUTvisiting, p_cSeq_s); // assignment of PIXIT values to component variable



			f_setHeaders_REGISTER(p_cSeq_s);

			// send REGISTER //TODO security association - security-client

			// send REGISTER

			f_SendREGISTER(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

												 m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms

												 m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}), omit ,omit)); //LibIms

		

			f_awaitingResponse(mw_Response_Base(c_statusLine401, vc_callId, p_cSeq_s));

            v_securityVerify := vc_response.msgHeader.securityVerify;



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

			// TESTBODY

			

			// set headers via, cseq and authorization

			f_setHeaders_2ndREGISTER(p_cSeq_s);

			// Re-send protected REGISTER //TODO security association - security-client, security-verify 

			// Re-send protected REGISTER

			f_SendREGISTER(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

												 m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms	

												 m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}), v_securityVerify ,omit)); //LibIms	

		

			f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, p_cSeq_s));
@@ -1432,9 +1434,6 @@ module AtsIms_Mw_TCFunctions 
		

		} // end function f_TC_IMST2_MW_REG_08_IMS









		/* 

		*  @desc	This is the test case function (SIP originating side - UE1 visiting IUT) for TC_IMST2_MW_REG_09_UE1

		*  @param	p_cSeq_s
@@ -1442,9 +1441,9 @@ module AtsIms_Mw_TCFunctions 
		function f_TC_IMST2_MW_REG_09_UE1(in CSeq p_cSeq_s) runs on ImsComponent {

		

			var REGISTER_Request v_register;

			//TODO security association - SecurityClient, SecurityVerify



			v_register := valueof(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

														m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms	

														m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}), m_securityClient({PX_SecClient}) ,omit)); //LibIms	

			// preamble with send REGISTER, await 401, send REGISTER, await 200 OK and user profile setting

			f_IMS_preamble_withRegistration(c_userProfile_UE1atSUTvisiting, p_cSeq_s, v_register);

			f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done
@@ -1452,9 +1451,9 @@ module AtsIms_Mw_TCFunctions 
						

			// set headers via, cseq and authorization

			f_setHeaders_2ndREGISTER(p_cSeq_s);

			// Re-send again protected REGISTER //TODO security association - security-client, security-verify 

			// Re-send again protected REGISTER

			f_SendREGISTER(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

				m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms

				m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}), m_securityClient({PX_SecClient}) ,omit)); //LibIms

			    

			// awaiting 200 OK REGISTER

			f_awaitingResponse(mw_Response_Base(c_statusLine200, vc_callId, p_cSeq_s));
@@ -1501,9 +1500,9 @@ module AtsIms_Mw_TCFunctions 
		function f_TC_IMST2_MW_REG_10_UE1(in CSeq p_cSeq_s) runs on ImsComponent {

		

			var REGISTER_Request v_register;

			//TODO security association - SecurityClient, SecurityVerify



			v_register := valueof(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

														m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms	

														m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}), m_securityVerify({PX_SecMechanism}) ,omit)); //LibIms	

			// preamble with send REGISTER, await 401, send REGISTER, await 200 OK and user profile setting

			f_IMS_preamble_withRegistration(c_userProfile_UE1atSUTvisiting, p_cSeq_s, v_register);

			f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done
@@ -1511,9 +1510,9 @@ module AtsIms_Mw_TCFunctions 
						

			// set headers via, cseq and authorization

			f_setHeaders_2ndREGISTER(p_cSeq_s);

			// Re-send again protected REGISTER wo security-client //TODO security association - security-verify 

			// Re-send again protected REGISTER wo security-client

			f_SendREGISTER(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

				m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms

				m_proxyRequire_secAgree, m_require_secAgree, omit, m_securityVerify({PX_SecClient}) ,omit)); //LibIms

			    

			// awaiting 4xx response

			f_awaitingResponse(mw_Response_Base(mw_statusLine4xx, vc_callId, p_cSeq_s));
@@ -1525,8 +1524,6 @@ module AtsIms_Mw_TCFunctions 
		

		} // end function f_TC_IMST2_MW_REG_10_UE1







		/* 

		*  @desc	This is the test case function (Mw interface - IUT P-CSCF) for TC_IMST2_MW_REG_10_IMS

		*  @param	p_cSeq_s
@@ -1545,9 +1542,9 @@ module AtsIms_Mw_TCFunctions 
		function f_TC_IMST2_MW_REG_11_UE1(in CSeq p_cSeq_s) runs on ImsComponent {

		

			var REGISTER_Request v_register;

			//TODO security association - SecurityClient, SecurityVerify



			v_register := valueof(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

														m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms	

														m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}), m_securityVerify({PX_SecClient}) ,omit)); //LibIms	

			// preamble with send REGISTER, await 401, send REGISTER, await 200 OK and user profile setting

			f_IMS_preamble_withRegistration(c_userProfile_UE1atSUTvisiting, p_cSeq_s, v_register);

			f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());// sync point preamble done
@@ -1555,9 +1552,9 @@ module AtsIms_Mw_TCFunctions 
						

			// set headers via, cseq and authorization with different UserName

			f_setHeaders_2ndREGISTER_authorizationWithDifferentUserName();

			// Re-send again protected REGISTER wo security-client //TODO security association - security-verify 

			// Re-send again protected REGISTER wo security-client

			f_SendREGISTER(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

				m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms

				m_proxyRequire_secAgree, m_require_secAgree, omit, m_securityVerify({PX_SecClient}) ,omit)); //LibIms

			    

			// awaiting 403 response

			f_awaitingResponse(mw_Response_Base(c_statusLine403, vc_callId, p_cSeq_s));
@@ -1594,9 +1591,9 @@ module AtsIms_Mw_TCFunctions 
			// TESTBODY



			f_setHeaders_REGISTER(p_cSeq_s);

			// send REGISTER //TODO security association - Security-client

			// send REGISTER

			f_SendREGISTER(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

												 m_proxyRequire_secAgree, m_require_secAgree, omit, omit ,omit)); //LibIms

												 m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}), omit ,omit)); //LibIms

		

			f_awaitingResponse(mw_Response_401onREGISTER_securityServer_UE(c_statusLine401, vc_callId, p_cSeq_s));
@@ -2778,7 +2775,8 @@ module AtsIms_Mw_TCFunctions 
			var REGISTER_Request v_register;

			

			//TODO security association

			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));	

			v_register := valueof(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

														m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}), m_securityVerify({PX_SecClient}) ,omit)); //LibIms	

			// 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());// sync point preamble done
@@ -4322,8 +4320,9 @@ module AtsIms_Mw_TCFunctions 
			// TESTBODY



			//receive MESSAGE from UE@TS

			f_awaitingMESSAGE(mw_MESSAGE_Request_noPchargingFunction_UE);

			// TODO check for Via header when sec. association will be known

			f_awaitingMESSAGE(mw_MESSAGE_Request_via (

				vc_callId, 

				mw_Via(mw_ViaBody_interface(mw_hostPort((PX_IMS_SUT_PCSCF1_IPADDR,PX_IMS_SUT_PCSCF1_HOME_DOMAIN), *)) ) ));



			//send response - 200 OK

			f_sendResponse(m_Response_Base(c_statusLine200,vc_callId, vc_cSeq,vc_caller_From, vc_caller_To, vc_via));
@@ -4945,8 +4944,8 @@ module AtsIms_Mw_TCFunctions 


			f_init_interfaceprofile(c_interfaceProfile_IMS_SUT_PCSCF1);

			

			//TODO security association

			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));	

			v_register := valueof(m_REGISTER_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via_REG, vc_contact, vc_authorization,

														m_proxyRequire_secAgree, m_require_secAgree, m_securityClient({PX_SecClient}), m_securityVerify({PX_SecClient}) ,omit)); //LibIms	

			// 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());// sync point preamble done
@@ -4960,12 +4959,9 @@ module AtsIms_Mw_TCFunctions 
			f_awaitingACK(mw_ACK_Request_Base(vc_callId));

	

			//await BYE and send 200OK

			f_awaitingBYE_sendReply(mw_BYE_Request_via_PChargingVector_UE(

			f_awaitingBYE_sendReply(mw_BYE_Request_via_UE(

				vc_callId, 

				mw_pChargingVector(complement("icid-value"),?) ifpresent,

				mw_Via(mw_ViaBody_interface(mw_hostPort((PX_IMS_SUT_PCSCF1_IPADDR,PX_IMS_SUT_PCSCF1_HOME_DOMAIN), *))

								)

				));

				mw_Via(mw_ViaBody_interface(mw_hostPort((PX_IMS_SUT_PCSCF1_IPADDR,PX_IMS_SUT_PCSCF1_HOME_DOMAIN), *)) ) ));

	

			f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());// sync point test body done

			// POSTAMBLE

BC/ttcn/AtsIms_Mw_Testcases.ttcn

+0 −22
Original line number Diff line number Diff line
@@ -665,28 +665,6 @@ module AtsIms_Mw_Testcases 


		} // end TC_IMST2_MW_REG_12

		

		/*

		* @desc TC_IMST2_MW_REG_13 / Config Ref: CF_1Mw1Gm UserProfileRef: M3

		* @param p_cSeq_s Transaction Id

		*/

		testcase TC_IMST2_MW_REG_13(inout CSeq p_cSeq_s) 

		runs on ServerSyncComp

		system TestAdapter {

			//Variables

			var ImsComponent v_imsComponent_ue1, v_imsComponent_mw;

			f_cf_1Mwi1Gm_M3Up(v_imsComponent_ue1, v_imsComponent_mw);



			//Start

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

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



			// synchronize both PTCs on 2 sychronization points

			f_serverSync2Clients({c_prDone, c_tbDone});



			f_cf_1Mwi1Gm_M3Down(v_imsComponent_ue1, v_imsComponent_mw);



		} // end TC_IMST2_MW_REG_13

		

		/*

		* @desc TC_IMST2_MW_REG_14 / Config Ref: CF_1Mw1Gm UserProfileRef: M3

		* @param p_cSeq_s Transaction Id