Commit 337ad0cc authored by bergengruen's avatar bergengruen
Browse files

Trigger functions updated

parent 56b4d4ff

AtsImsIot/AtsImsIot_Functions.ttcn

+23 −12
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ module AtsImsIot_Functions { 
     		if( not f_getUserInfo(p_productIdx, v_userInfo) ) { return false; } 

     		

     		v_status := f_mtc_userRegister(p_userCompRef, v_userInfo.publicId, v_userInfo.privateId, v_userInfo.password); 		

     		

 			return true;

 			return v_status;

 		}

 		

 		/**
@@ -42,16 +41,13 @@ module AtsImsIot_Functions { 
		  *     true in case of successfull execution of the trigger command

		  *     otherwise false

		  */

 		function f_mtc_userCheckRegistration(EutTrigger p_userCompRef) 

 		function f_mtc_userCheckRegistration(EutTrigger p_userCompRef, integer p_productIdx) 

            runs on TestCoordinator return boolean {

            var boolean v_success := false;

            p_userCompRef.start(f_userCheckUEisRegistered());

            p_userCompRef.done;

            if(vc_e3e_verdict.verdict == pass) {

      			v_success := true;

  			}    		

     		return v_success;

     		

     		var ImsUserInfo v_userInfo;

            var boolean v_status := true; 

     		if( not f_getUserInfo(p_productIdx, v_userInfo) ) { return false; }      		

     		v_status := f_userCheckUEisRegistered(p_userCompRef); 		

 			return v_status;

     		}

 		

 		/**
@@ -79,6 +75,21 @@ module AtsImsIot_Functions { 
     		return v_success;

 		}



 		function f_userCheckUEisRegistered(EutTrigger p_userCompRef) runs on TestCoordinator return boolean {

 			var boolean v_success := false;

 			

 			p_userCompRef.start(f_checkUserIsRegistered());

 			

 			p_userCompRef.done;

 			

 			if(vc_e3e_verdict.verdict == pass) {

 				v_success := true;	

 			}

     		

     		return v_success;

 		}



		

 		/**

		  * @desc Starts user component behaviour for registration from test coordinator

		  * @param p_userCompRef Reference ot IMS UE user component

AtsImsIot/AtsImsIot_Templates.ttcn

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ module AtsImsIot_Templates { 
				pVisitedNetworkID := ?

			}

		}







	}//end group

	

}//end module
 
 No newline at end of file

LibIms_ConfigAndTigger/LibIms_ConfigAndTrigger.ttcn

+5 −0
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ module LibIms_ConfigAndTrigger { 
				f_sendTriggerCmd(c_UE_REGISTRATION, {p_publicId, p_privateId, p_pw});

			}



			function f_checkUserIsRegistered() 

			runs on EutTrigger {

				f_sendTriggerCmd(c_UE_CHECKisREGISTERED, {});

			}

			

			

			/**

			 *