Commit bbafd89a authored by bergengruen's avatar bergengruen
Browse files

Reorganization with Stephan and Patrick

Corrections to pointed out by Message Magic
parent 9785b2ee
Loading
Loading
Loading
Loading
+37 −29
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ module AtsImsIot_Functions {
 
 	import from AtsImsIot_TestSystem {type ImsTestCoordinator;}

 	import from LibUpperTester {type EquipmentUser;}

 	import from LibIot_PIXITS {modulepar PX_MAX_MSG_WAIT;}

 	import from AtsImsIot_TypesAndValues {type SipMessage;}
@@ -16,7 +14,9 @@ module AtsImsIot_Functions {

 	import from LibIms_UpperTester all;

 	import from LibIot_TestInterface {type InterfaceMonitor, TestCoordinator;}
	import from LibIot_TestInterface {type InterfaceMonitor, TestCoordinator, EquipmentUser;}
 	
 	import from LibIot_Functions {function f_getE2EVerdict;}
 	
 	group ue {
 		
@@ -28,14 +28,15 @@ module AtsImsIot_Functions {
		  *     true in case of successfull execution of the trigger command
		  *     otherwise false
		  */
 		function f_mtc_userTriggerRegistration(EquipmentUser p_userCompRef, integer p_productIdx) runs on TestCoordinator return boolean {
 		function f_mtc_userTriggerRegistration(EquipmentUser p_userCompRef, ImsUserInfo p_userInfo) 
 		runs on TestCoordinator 
 		return boolean {
      		var boolean v_status := true; 
     		var ImsUserInfo v_userInfo;
     		// TODO Investigate if f_PR_user_home_registration is to be removed
     		// Reason: Thre is no difference when triggering UE to register in home or visiting NW
     		if( not f_getUserInfo(p_productIdx, v_userInfo) ) { return false; } 
     		if( p_userInfo.publicId  == "dummy" ) { return false; } 
     		
     		v_status := f_mtc_userRegister(p_userCompRef, v_userInfo.publicId, v_userInfo.privateId, v_userInfo.password); 		
     		v_status := f_mtc_userRegister(p_userCompRef, p_userInfo.publicId, p_userInfo.privateId, p_userInfo.password); 		
 			return v_status;
 		}
 		
@@ -48,12 +49,11 @@ module AtsImsIot_Functions {
		  *     true in case of successfull execution of the trigger command
		  *     otherwise false
		  */
 		function f_mtc_userCheckRegistration(EquipmentUser p_userCompRef, integer p_productIdx) 
 		function f_mtc_userCheckRegistration(EquipmentUser p_userCompRef, ImsUserInfo p_userInfo) 
            runs on TestCoordinator return boolean {
     		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); 		
			if( p_userInfo.publicId  == "dummy" ) { return false; }       		
     		v_status := f_mtc_userCheckRegistrationSuccessful(p_userCompRef); 		
 			return v_status;
     		}
 		
@@ -75,21 +75,21 @@ module AtsImsIot_Functions {
 			
 			p_userCompRef.done;
 			
 			if(vc_e3e_verdict.verdict == pass) {
 			if(f_getE2EVerdict() == pass) {
 				v_success := true;	
 			}
     		
     		return v_success;
 		}

 		function f_userCheckUEisRegistered(EquipmentUser p_userCompRef) runs on TestCoordinator return boolean {
 		function f_mtc_userCheckRegistrationSuccessful(EquipmentUser 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) {
 			if(f_getE2EVerdict() == pass) {
 				v_success := true;	
 			}
     		
@@ -112,7 +112,7 @@ module AtsImsIot_Functions {
 			
 			p_userCompRef.done;
     		
     		if(vc_e3e_verdict.verdict == pass) {
     		if( f_getE2EVerdict() == pass) {
 				v_success := true;	
 			}
     		
@@ -132,7 +132,7 @@ module AtsImsIot_Functions {
 			
 			p_userCompRef.done;
     		
      		if(vc_e3e_verdict.verdict == pass) {
      		if(f_getE2EVerdict() == pass) {
      			v_success := true;
      		}
     		
@@ -152,23 +152,32 @@ module AtsImsIot_Functions {
 			
 			p_userCompRef.done;
     		
            if(vc_e3e_verdict.verdict == pass) {
            if(f_getE2EVerdict() == pass) {
      			v_success := true;
  			}
     		
     		return v_success;
 		}
 		
 		function f_getUserInfo(integer p_productIdx, out ImsUserInfo p_userInfo) return boolean {
 		function f_getAnyValidUser(integer p_productIdx) return ImsUserInfo {
 		  var integer v_size := sizeof(PX_IMS_USER_DATA);
 		  const ImsUserInfo c_dummyInfo := { "dummy", "dummy", "dummy", "dummy", "dummy" };
		  var ImsUserIdentity v_userid;
 		  
 		  for(var integer i := 0; i < v_size; i := i+1) {
 		     if(PX_IMS_USER_DATA[i].productIndex == p_productIdx) {
 		      p_userInfo :=  PX_IMS_USER_DATA[i].userInfos[0]; // TODO improve this
 		      return true;
 		    }
 		  }
 		  return false;
				var integer v_size_j := sizeof(PX_IMS_USER_DATA[i].userIds);
				for(var integer j := 0; j < v_size_j; j := j+1) {
 		     	   if ( ischosen(PX_IMS_USER_DATA[i].userIds[j].genUserId )) {
 		     	   	 return PX_IMS_USER_DATA[i].userIds[j].genUserId;
 		     	   }  // end if
				} // end for j
				log("f_getAnyValidUser: Did not find specified user id in specified product in PX_IMS_USER_DATA");
				return c_dummyInfo;
 		    } // end if
 		  } // end for i
		  log("f_getAnyValidUser: Did not find specified product in PX_IMS_USER_DATA");
 		  return c_dummyInfo;
 		}
 		
		// TODO 
@@ -195,13 +204,12 @@ module AtsImsIot_Functions {
    	 * @param p_userCompRef Reference ot IMS UE user component
    	 * @return true in case of successfull execution otherwise false
    	 */
     	function f_PR_user_home_registration(EquipmentUser p_userCompRef, integer p_productIdx) runs on TestCoordinator return boolean {
     	function f_PR_user_home_registration(EquipmentUser p_userCompRef, ImsUserInfo p_userInfo) 
     	runs on TestCoordinator return boolean {
     		var boolean v_status := true; 
     		var ImsUserInfo v_userInfo;
     		
     		if( not f_getUserInfo(p_productIdx, v_userInfo) ) { return false; } 
			if( p_userInfo.publicId  == "" ) { return false; } 
     		
     		v_status := f_mtc_userRegister(p_userCompRef, v_userInfo.publicId, v_userInfo.privateId, v_userInfo.password); 
     		v_status := f_mtc_userRegister(p_userCompRef, p_userInfo.publicId, p_userInfo.privateId, p_userInfo.password); 
     		
     		return v_status;
     	}
+40 −40
Original line number Diff line number Diff line
@@ -48,9 +48,9 @@ module AtsImsIot_TestCases {
		//* interface monitor name Isc B
		const charstring c_isc_B := "Isc B";
		//* eut trigger name User A
		const charstring c_trigger_A := "User A";
		const charstring c_userUE_A := "User A";
		//* eut trigger name User B
		const charstring c_trigger_B := "User B";
		const charstring c_userUE_B := "User B";
	}
	
	/**
@@ -60,8 +60,8 @@ module AtsImsIot_TestCases {
	 */
	testcase TC_IMS_0001() runs on ImsTestCoordinator system IotSystemInterface {
		// create components
		var IotEquipmentUser v_ueA := f_cf_create_IotEquipmentUser(c_trigger_A);
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_trigger_B);
		var IotEquipmentUser v_ueA := f_cf_create_IotEquipmentUser(c_userUE_A);
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);
		var ImsInterfaceMonitor v_gmA := f_cf_create_monitor(c_gm_A);
		var ImsInterfaceMonitor v_mw := f_cf_create_monitor(c_mw);
		
@@ -72,8 +72,8 @@ module AtsImsIot_TestCases {
		f_cf_monitor_up(v_mw);
		
		// preamble
		f_PR_user_home_registration(v_ueA, PX_EUT_A);
		f_PR_user_home_registration(v_ueB, PX_EUT_B);
		f_PR_user_home_registration(v_ueA, f_getAnyValidUser(PX_EUT_A));
		f_PR_user_home_registration(v_ueB, f_getAnyValidUser(PX_EUT_B));
		
		// test body
		f_mtc_userSendMessage(v_ueA, "body>1300Bytes"); // TODO add body here
@@ -99,7 +99,7 @@ module AtsImsIot_TestCases {
	 */
	testcase TC_IMS_0002() runs on ImsTestCoordinator system IotSystemInterface {
		// create components
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_trigger_B);
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);
		var ImsInterfaceMonitor v_gmA := f_cf_create_monitor(c_gm_A);
		var ImsInterfaceMonitor v_mw := f_cf_create_monitor(c_mw);
		var Request v_Register_Step3;
@@ -115,18 +115,18 @@ module AtsImsIot_TestCases {
		f_cf_monitor_up(v_mw);
		
		// test body
		f_mtc_userTriggerRegistration(v_ueB, PX_EUT_B); 
		f_mtc_userTriggerRegistration(v_ueB, f_getAnyValidUser(PX_EUT_B)); 
		
		f_mtc_check_TP_IMS_5011_01_gm(v_gmA);
		
		v_Register_Step3 := f_mtc_check_TP_IMS_5011_01_mw(v_mw); // TP1
		v_401Unauthorited_Step4 := f_mtc_check_TP_IMS_5089_01_mw(v_mw); // TP4
		v_Register_Step7 := f_mtc_check_TP_IMS_5011_02_mw(v_mw);  // TP2
		v_200OK_Step8 := f_mtc_check_TP_IMS_5092_01_mw(v_mw); // TP5
		v_Subscribe_Step10 := f_mtc_check_TP_IMS_5044_01_mw(v_mw, v_200OK_Step8); // TP3
		f_mtc_check_TP_IMS_5096_01_mw(v_mw, v_Subscribe_Step10); // TP6
		v_Register_Step3 := f_mtc_check_TP_IMS_5011_01_mw(v_mw); // Check1
		v_401Unauthorited_Step4 := f_mtc_check_TP_IMS_5089_01_mw(v_mw); // Check4
		v_Register_Step7 := f_mtc_check_TP_IMS_5011_02_mw(v_mw);  // Check2
		v_200OK_Step8 := f_mtc_check_TP_IMS_5092_01_mw(v_mw); // Check5
		v_Subscribe_Step10 := f_mtc_check_TP_IMS_5044_01_mw(v_mw, v_200OK_Step8); // Check3
		f_mtc_check_TP_IMS_5096_01_mw(v_mw, v_Subscribe_Step10); // Check6
		
		f_mtc_userCheckRegistration(v_ueB, PX_EUT_B);
		f_mtc_userCheckRegistration(v_ueB, f_getAnyValidUser(PX_EUT_B));
		
		// postamble
		f_PO_user_home_deregistration(v_ueB);
@@ -143,7 +143,7 @@ module AtsImsIot_TestCases {
	 */
	testcase TC_IMS_0003() runs on ImsTestCoordinator system IotSystemInterface {
		// create components
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_trigger_B);
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);
		var ImsInterfaceMonitor v_gmA := f_cf_create_monitor(c_gm_A);
		var ImsInterfaceMonitor v_mw := f_cf_create_monitor(c_mw);
		var Request v_Register_Step4;
@@ -155,14 +155,14 @@ module AtsImsIot_TestCases {
		f_cf_monitor_up(v_mw);
		
		// test body
		f_mtc_userTriggerRegistration(v_ueB, PX_EUT_A); 
		f_mtc_userTriggerRegistration(v_ueB, f_getAnyValidUser(PX_EUT_A)); 
		
		f_mtc_check_TP_IMS_5203_01_gm(v_gmA);

		v_Register_Step4 := f_mtc_check_TP_IMS_5203_01_mw(v_mw); // TP1 (not really tested)
		v_200OK_Step9 := f_mtc_check_TP_IMS_5092_01_mw(v_mw); // TP2
		v_Register_Step4 := f_mtc_check_TP_IMS_5203_01_mw(v_mw); // Check1 (not really tested)
		v_200OK_Step9 := f_mtc_check_TP_IMS_5092_01_mw(v_mw); // Check2
		
		f_mtc_userCheckRegistration(v_ueB, PX_EUT_B);
		f_mtc_userCheckRegistration(v_ueB, f_getAnyValidUser(PX_EUT_B));
		
		// postamble
		f_PO_user_home_deregistration(v_ueB);
@@ -180,7 +180,7 @@ module AtsImsIot_TestCases {
	 */
	testcase TC_IMS_0003H() runs on ImsTestCoordinator system IotSystemInterface {
		// create components
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_trigger_B);
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);
		var ImsInterfaceMonitor v_gmA := f_cf_create_monitor(c_gm_A);
		var ImsInterfaceMonitor v_mw := f_cf_create_monitor(c_mw);
		var Request v_Register_Step4;
@@ -191,13 +191,13 @@ module AtsImsIot_TestCases {
		f_cf_monitor_up(v_mw);
		
		// test body
		f_mtc_userTriggerRegistration(v_ueB, PX_EUT_A); 
		f_mtc_userTriggerRegistration(v_ueB, f_getAnyValidUser(PX_EUT_A)); 
		
		f_mtc_check_TP_IMS_5402_01_gm(v_gmA);
		
		v_Register_Step4 := f_mtc_check_TP_IMS_5402_01_mw(v_mw); // TP1
		v_Register_Step4 := f_mtc_check_TP_IMS_5402_01_mw(v_mw); // Check1
		
		f_mtc_userCheckRegistration(v_ueB, PX_EUT_B);
		f_mtc_userCheckRegistration(v_ueB, f_getAnyValidUser(PX_EUT_B));
		
		// postamble
		f_PO_user_home_deregistration(v_ueB);
@@ -214,7 +214,7 @@ module AtsImsIot_TestCases {
	 */
	testcase TC_IMS_0004() runs on ImsTestCoordinator system IotSystemInterface {
		// create components
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_trigger_B);
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);
		var ImsInterfaceMonitor v_gmA := f_cf_create_monitor(c_gm_A);
		var ImsInterfaceMonitor v_mw := f_cf_create_monitor(c_mw);
		
@@ -224,11 +224,11 @@ module AtsImsIot_TestCases {
		f_cf_monitor_up(v_mw);
		
		// test body
		f_mtc_userTriggerRegistration(v_ueB, PX_EUT_A); 
		f_mtc_userTriggerRegistration(v_ueB, f_getAnyValidUser(PX_EUT_A)); 
		
		f_mtc_check_TP_IMS_5129_01_gm(v_gmA);

		f_mtc_check_TP_IMS_5129_01_mw(v_mw); // TP1
		f_mtc_check_TP_IMS_5129_01_mw(v_mw); // Check1
		
		// f_mtc_userCheckRegistration(v_ueB, PX_EUT_B);
		
@@ -248,7 +248,7 @@ module AtsImsIot_TestCases {
	 */
	testcase TC_IMS_0004H() runs on ImsTestCoordinator system IotSystemInterface {
		// create components
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_trigger_B);
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);
		var ImsInterfaceMonitor v_gmA := f_cf_create_monitor(c_gm_A);
		var ImsInterfaceMonitor v_mw := f_cf_create_monitor(c_mw);
		
@@ -258,13 +258,13 @@ module AtsImsIot_TestCases {
		f_cf_monitor_up(v_mw);
		
		// test body
		f_mtc_userTriggerRegistration(v_ueB, PX_EUT_A); 
		f_mtc_userTriggerRegistration(v_ueB, f_getAnyValidUser(PX_EUT_A)); 
		
		f_mtc_check_TP_IMS_5411_01_gm(v_gmA);

		f_mtc_check_TP_IMS_5411_01_mw(v_mw); // TP1
		f_mtc_check_TP_IMS_5411_01_mw(v_mw); // Check1
		
		// f_mtc_userCheckRegistration(v_ueB, PX_EUT_B);
		// f_mtc_userCheckRegistration(v_ueB, f_getAnyValidUser(PX_EUT_B));
		
		// postamble
		// f_PO_user_home_deregistration(v_ueB);
@@ -285,7 +285,7 @@ module AtsImsIot_TestCases {
	*/
	testcase TC_IMS_0005() runs on ImsTestCoordinator system IotSystemInterface {
		// create components
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_trigger_B);
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);
		var ImsInterfaceMonitor v_gmA := f_cf_create_monitor(c_gm_A);
		var ImsInterfaceMonitor v_mw := f_cf_create_monitor(c_mw);
		
@@ -295,11 +295,11 @@ module AtsImsIot_TestCases {
		f_cf_monitor_up(v_mw);
		
		// test body
		f_mtc_userTriggerRegistration(v_ueB, PX_EUT_B);
		f_mtc_userTriggerRegistration(v_ueB, f_getAnyValidUser(PX_EUT_B));
		
		f_mtc_check_TP_IMS_5088_01_gm(v_gmA);
		f_mtc_check_TP_IMS_5088_01_mw(v_mw);
		f_mtc_userCheckRegistration(v_ueB, PX_EUT_B);
		f_mtc_userCheckRegistration(v_ueB, f_getAnyValidUser(PX_EUT_B));
		
		// postamble
		f_PO_user_home_deregistration(v_ueB);
@@ -317,7 +317,7 @@ module AtsImsIot_TestCases {
	*/
	testcase TC_IMS_0006() runs on ImsTestCoordinator system IotSystemInterface {
		// create components
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_trigger_B);
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);
		var ImsInterfaceMonitor v_gmA := f_cf_create_monitor(c_gm_A);
		var ImsInterfaceMonitor v_mw := f_cf_create_monitor(c_mw);
		
@@ -331,7 +331,7 @@ module AtsImsIot_TestCases {
		
		f_mtc_check_TP_IMS_5093_01_UE_mw(v_mw);
		f_mtc_check_TP_IMS_5093_01_IMS_mw(v_mw);
		f_mtc_userCheckRegistration(v_ueB, PX_EUT_A);
		f_mtc_userCheckRegistration(v_ueB, f_getAnyValidUser(PX_EUT_A));
		
		// postamble
		f_PO_user_home_deregistration(v_ueB);
@@ -347,7 +347,7 @@ module AtsImsIot_TestCases {
	*/
	testcase TC_IMS_0007() runs on ImsTestCoordinator system IotSystemInterface {
		// create components
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_trigger_B);
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);
		var ImsInterfaceMonitor v_gmA := f_cf_create_monitor(c_gm_A);
		var ImsInterfaceMonitor v_mw := f_cf_create_monitor(c_mw);
		
@@ -361,7 +361,7 @@ module AtsImsIot_TestCases {
		f_mtc_check_TP_IMS_5094_01_UE(v_mw);
		f_mtc_check_TP_IMS_5094_01_UE(v_gmA); 
		f_mtc_check_TP_IMS_5094_01_IMS(v_mw);
		f_mtc_userCheckRegistration(v_ueB, PX_EUT_A);
		f_mtc_userCheckRegistration(v_ueB, f_getAnyValidUser(PX_EUT_A));
		
		// postamble
		f_PO_user_home_deregistration(v_ueB);
@@ -387,8 +387,8 @@ module AtsImsIot_TestCases {
		f_cf_user_up(v_ueB2);
		
		// preamble
		f_PR_user_home_registration(v_ueA, PX_EUT_A);
		f_PR_user_home_registration(v_ueB2,PX_EUT_B);
		f_PR_user_home_registration(v_ueA, f_getAnyValidUser(PX_EUT_A));
		f_PR_user_home_registration(v_ueB2,f_getAnyValidUser(PX_EUT_B));
		
		// test body
		
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ module AtsImsIot_TestSystem {

	import from AtsImsIot_TypesAndValues {type SipMessage;}

	import from LibUpperTester {type EquipmentAccessPort;}
	import from LibIot_TestInterface {type EquipmentAccessPort;}

	import from LibIot_TestInterface all;
	
+40 −23
Original line number Diff line number Diff line
@@ -10,11 +10,10 @@ module LibIms_UpperTester {

	import from LibUpperTester {
		template m_EQ_Request;
		type EquipmentUser;
		type EquipmentCommand;
	}

	import from LibIot_TestInterface {type TestCoordinator;}
	import from LibIot_TestInterface {type TestCoordinator, EquipmentUser;}
 	
	group ue {
		group ueTypes {
@@ -61,12 +60,12 @@ module LibIms_UpperTester {
			 */
			function f_userRegistration(in charstring p_publicId, in charstring p_privateId, in charstring p_pw) 
			runs on EquipmentUser {
				f_sendEquipmentCmd(m_EQ_Request(c_UE_REGISTRATION, {p_publicId, p_privateId, p_pw}));
				f_sendEquipmentCmd(valueof(m_EQ_Request(c_UE_REGISTRATION, {p_publicId, p_privateId, p_pw})));
			}

			function f_checkUserIsRegistered() 
			runs on EquipmentUser {
				f_sendEquipmentCmd(m_EQ_Request(c_UE_CHECKisREGISTERED, {}));
				f_sendEquipmentCmd(valueof(m_EQ_Request(c_UE_CHECKisREGISTERED, {})));
			}
			
			
@@ -78,7 +77,7 @@ module LibIms_UpperTester {
			 */
			function f_userDeregistration(in charstring p_publicId) 
			runs on EquipmentUser {
				f_sendEquipmentCmd(m_EQ_Request(c_UE_DEREGISTRATION, {p_publicId}));
				f_sendEquipmentCmd(valueof(m_EQ_Request(c_UE_DEREGISTRATION, {p_publicId})));
			}
			
			/**
@@ -87,7 +86,7 @@ module LibIms_UpperTester {
			 */
			function f_userSendMessage(in charstring p_body) 
			runs on EquipmentUser {
				f_sendEquipmentCmd(m_EQ_Request(c_UE_SEND_MESSAGE, {p_body}));
				f_sendEquipmentCmd(valueof(m_EQ_Request(c_UE_SEND_MESSAGE, {p_body})));
			}
			
			/**
@@ -95,7 +94,7 @@ module LibIms_UpperTester {
			 * @desc Trigger checking the receipt of instant message at UE
			 */
			function f_userCheckMessageReceipt() runs on EquipmentUser {
				f_sendEquipmentCmd(m_EQ_Request(c_UE_CHECK_MESSAGE_RECEIPT, {}));
				f_sendEquipmentCmd(valueof(m_EQ_Request(c_UE_CHECK_MESSAGE_RECEIPT, {})));
			}
				
 			
@@ -114,18 +113,24 @@ module LibIms_UpperTester {
		* @member domainProxy Entry point to either home or roaming IMS network
		*/
		type record ImsUserInfo {
			charstring publicId,
			charstring publicId, // (default) id to be used by UE
			charstring privateId,
			charstring password,
			charstring domain,
			charstring domainProxy
		}
		
		type union ImsUserIdentity {
			ImsUserInfo genUserId,
			ImsUserInfo sipUserId,
			ImsUserInfo telUserId
		}
	
		/**
		* 
		* @desc List of IMS user information 
		*/
		type record of ImsUserInfo ImsUserInfoList ;
		type record of ImsUserIdentity ImsUserIdentityList ;
 
		/**
		* 
@@ -135,7 +140,7 @@ module LibIms_UpperTester {
		*/
		type record CoreImsUserInfo {
			integer       productIndex,
			ImsUserInfoList  userInfos
			ImsUserIdentityList  userIds
		}
	
		/**
@@ -152,42 +157,54 @@ module LibIms_UpperTester {
		modulepar CoreImsUserInfoList PX_IMS_USER_DATA := {
			{
				productIndex := 0,
				userInfos := {
				userIds := {
					{
						publicId := "userSIP",
						privateId := "3344123432",
				      genUserId := {
						publicId := "userGEN",
						privateId := "userGEN_priv",
						password := "123456",
						domain := "etsi.net",
						domainProxy := "pcscf.etsi.net" //pcscf domain or IPaddress

					},
					}},
					{
						publicId := "userTel",
						privateId := "3344123442",
					  sipUserId := {
						publicId := "userSIP",
						privateId := "userSIP_priv",
						password := "123456",
						domain := "etsi.net",
						domainProxy := "pcscf.etsi.net" //pcscf domain or IPaddress
					}

					}},
					{
					  telUserId := {
						publicId := "tel: 3344123432",
						privateId := "userTEL_priv",
						password := "123456",
						domain := "etsi.net",
						domainProxy := "pcscf.etsi.net" //pcscf domain or IPaddress
					}}
				}
			},
			{
				productIndex := 1,
				userInfos := {
				userIds := {
					{
					  sipUserId := {
						publicId := "userSIP",
						privateId := "3344123433",
						privateId := "userSIP_priv",
						password := "123456",
						domain := "TT.net",
						domainProxy := "pcscf.TT.net" //pcscf domain or IPaddress
					},
					}},
					{
						publicId := "userTel",
						privateId := "3344123443",
					  telUserId := {
						publicId := "tel: 3344123443",
						privateId := "userTEL_priv",
						password := "123456",
						domain := "TT.net",
						domainProxy := "pcscf.TT.net" //pcscf domain or IPaddress
					}
					}}
				}
			}
		}// end modulepar
+23 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ module LibIot_Functions {
	}

	import from LibIot_TestInterface {
		type IotEquipmentUser, OracleClient, OracleServer, TestCoordinator;
		type IotEquipmentUser, OracleClient, OracleServer, TestCoordinator, EquipmentUser;
	}
	
	
@@ -55,6 +55,26 @@ module LibIot_Functions {
    		vPort.send(v_verdict);
    	}
    
    	/**
    	 * @desc Gets the conformance verdict on the oracle client
    	 * @return conformance verdict of oracle server
    	 */
    	function f_getConformanceVerdict()
    	runs on OracleServer
		return verdicttype {
    		return vc_conf_verdict.verdict;
    	}
    
    	/**
    	 * @desc Gets the end-to-end verdict on the oracle client
    	 * @return end-to-end verdict of oracle server
    	 */
    	function f_getE2EVerdict()
    	runs on OracleServer
		return verdicttype {
    		return vc_e3e_verdict.verdict;
    	}
    
    	/**
    	* @desc Computes and logs overall verdict for end-to-end and conformance separately on oracle server
    	* @param p_verdict the verdict received
@@ -140,7 +160,7 @@ module LibIot_Functions {
	}
	
	group equipmentOperationFunctions { // TODO Update!
		function f_sendEquipmentCmd(in EquipmentOperationReq p_req) runs on IotEquipmentUser {
		function f_sendEquipmentCmd(in EquipmentOperationReq p_req) runs on EquipmentUser {
			var EquipmentOperationRsp v_response;
			var charstring v_reason := "";
			
Loading