Commit 53d6e1d2 authored by poglitsch's avatar poglitsch
Browse files

minor changes

parent 8c28edab
Loading
Loading
Loading
Loading
+14 −26
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@

module AtsImsIot_TestConfiguration {
	
	import from LibIms_UpperTester language "TTCN-3:2008 Amendment 1" {
		modulepar PX_IMS_USER_DATA;
	}

	import from LibIot_TypesAndValues {
		type StartTrafficCaptureRsp, StopTrafficCaptureRsp;
	}
@@ -492,15 +496,12 @@ module AtsImsIot_TestConfiguration {
				 *     ports and initialize the test adapter.
				 *     More information can be found in ETSI TS 186 011-2 V2.3.1 Cause
		 *     4.3.4.
				 * @param p_GmA Gm A Interface Monitor component
				 * @param p_Gm Gm A Interface Monitor component
				 * @param p_Mw Mw Interface Monitor component
				 * @param p_GmB
				 *     Gm B Interface Monitor component (optional, can be omitted)
				 */
			function f_cf_roam_call_up(
				inout ImsInterfaceMonitor p_GmA, 
				inout ImsInterfaceMonitor p_Mw,
				inout ImsInterfaceMonitor p_GmB
				inout ImsInterfaceMonitor p_Gm, 
				inout ImsInterfaceMonitor p_Mw
			) runs on ImsTestCoordinator {
				// Initialize the Adapter (including the TrafficCapture process).
				timer tc_configureGuard;
@@ -536,18 +537,18 @@ module AtsImsIot_TestConfiguration {
					}
				} 
				
				f_cf_monitor_up(p_GmA);
				f_cf_monitor_up(p_Gm);
				f_cf_monitor_up(p_Mw);
				f_cf_monitor_up(p_GmB);
				
				// TODO UE IP address and port is missing
				p_GmA.start(f_cf_setFilter(
				// TODO UE IP address and port is missing
				p_Gm.start(f_cf_setFilter(
					valueof (m_SetFilterReq(
						e_sip, 
						{f_getInterfaceInfo("Gm", PX_PRODUCTS[PX_EUT_A])}
						f_getInterfaceInfoList("Gm", PX_EUT_A, PX_EUT_B)
					)
				)));
				p_GmA.done;
				p_Gm.done;
				
				p_Mw.start(f_cf_setFilter(
					valueof(m_SetFilterReq(
@@ -557,15 +558,6 @@ module AtsImsIot_TestConfiguration {
				)));
				p_Mw.done;
				
				p_GmB.start(f_cf_setFilter(
					valueof (m_SetFilterReq(
						e_sip, 
						{f_getInterfaceInfo("Gm", PX_PRODUCTS[PX_EUT_B])}
					)
				)));
				p_GmB.done;

				
				// Start traffic capture processing.
				tc_configureGuard.start(PX_MAX_MSG_WAIT);
				acPort.send(m_startTrafficCaptureReq);
@@ -594,13 +586,10 @@ module AtsImsIot_TestConfiguration {
				 *     186 011-2 V2.3.1 Cause 4.3.4.
				 * @param p_GmA Gm A Interface Monitor component
				 * @param p_Mw Mw Interface Monitor component
				 * @param p_GmB
				 *     Gm B Interface Monitor component (optional, can be omitted)
				 */
			function f_cf_roam_call_down(
				inout ImsInterfaceMonitor p_GmA, 
				inout ImsInterfaceMonitor p_Mw,
				inout ImsInterfaceMonitor p_GmB
				inout ImsInterfaceMonitor p_Mw
			) runs on ImsTestCoordinator {
				// Stop traffic capture processing.
				timer tc_configureGuard;
@@ -623,7 +612,6 @@ module AtsImsIot_TestConfiguration {
				} 
				f_cf_monitor_down(p_GmA);
				f_cf_monitor_down(p_Mw);
				f_cf_monitor_down(p_GmB);
			}