replaced all mno references with call control (82d0e83b) · Commits · ITS - Intelligent Transport Systems / ECall_HLAP

ttcn/LibItsECall_Functions.ttcn

+12 −14

Original line number	Diff line number	Diff line
		@@ -461,7 +461,7 @@ module LibItsECall_Functions {
		}

		/**
		* @desc Wait for a specific mno event
		* @desc Wait for a specific call control event
		* @param p_e Expected event to be received
		* @param p_event_timeout Timeout value for receiving the event
		* @param p_ignoreOtherMessages Whether other events shall be ignored or not
		@@ -687,7 +687,7 @@ module LibItsECall_Functions {
		* @desc Setup function for IVS test system
		* @param p_configuration Simulator's configuration parameters (PSAP mode)
		*/
		function f_configIvsUp(in template (value) ModemConfiguration p_modemConfiguration := m_defaultPsapSimulatorConfiguration, in template(value) MnoConfiguration p_mnoConfiguraion := m_defaultMnoConfiguration) runs on PsapMtc {
		function f_configIvsUp(in template (value) ModemConfiguration p_modemConfiguration := m_defaultPsapSimulatorConfiguration, in template(value) CallControlConfiguration p_callControlConfiguraion := m_defaultCallControlConfiguration) runs on PsapMtc {
		vc_logComponent := LogComponent.create("Log Component");
		vc_uiComponent := UIComponent.create("UIComponent");

		@@ -700,19 +700,19 @@ module LibItsECall_Functions {
		vc_logComponent.start(f_logBehaviour());
		vc_uiComponent.start(f_uiComponentBehaviour());

		f_configMnoUp(p_mnoConfiguraion);
		f_configCallControlUp(p_callControlConfiguraion);
		f_configIvsModemUp(p_modemConfiguration);
		} // end f_configIvsUp

		/**
		* @desc Setup function for the MNO test system
		* @desc Setup function for the call control test system

		* @param p_mnoConfiguraion MNO configuration parameters
		* @param p_callControlConfiguraion call control configuration parameters
		* @verdict
		*/
		function f_configMnoUp(in template (value) MnoConfiguration p_mnoConfiguraion := m_defaultMnoConfiguration) runs on PsapMtc {
		function f_configCallControlUp(in template (value) CallControlConfiguration p_callControlConfiguraion := m_defaultCallControlConfiguration) runs on PsapMtc {
		map(self:callControl, system:callControl);
		} // end f_configMnoUp
		} // end f_configCallControlUp

		/**
		* @desc Setup function for modem test system (PSAP mode)
		@@ -747,7 +747,7 @@ module LibItsECall_Functions {
		}

		f_configIvsModemDown();
		f_configMnoDown();
		f_configCallControlDown();

		vc_logComponent.stop;
		vc_uiComponent.stop;
		@@ -758,13 +758,11 @@ module LibItsECall_Functions {
		} // end f_configIvsDown

		/**
		* @desc Setup function for the MNO test sysatem
		* @param p_mnoConfiguraion MNO configuration parameters
		* @verdict
		* @desc Setup function for the call control test sysatem
		*/
		function f_configMnoDown() runs on PsapMtc {
		function f_configCallControlDown() runs on PsapMtc {
		unmap(self:callControl, system:callControl);
		} // end f_configMnoDown
		} // end f_configCallControlDown

		/**
		* @desc Setup function for IVS test system
		@@ -1079,7 +1077,7 @@ module LibItsECall_Functions {
		}

		/**
		* @desc Wait for a specific mno event
		* @desc Wait for a specific call control event
		* @param p_e Expected event to be received
		* @param p_event_timeout Timeout value for receiving the event
		* @param p_ignoreOtherMessages Whether other events shall be ignored or not

ttcn/LibItsECall_Templates.ttcn

+5 −5

Original line number	Diff line number	Diff line
		@@ -85,9 +85,9 @@ module LibItsECall_Templates {
		}

		/**
		* @desc Default MNO configuration
		* @desc Default call control configuration
		*/
		template(value) MnoConfiguration m_defaultMnoConfiguration := {
		template(value) CallControlConfiguration m_defaultCallControlConfiguration := {

		}

		@@ -348,8 +348,8 @@ module LibItsECall_Templates {

		} // end eventTemplates

		group mnoEventTemplates {
		group anyMnoEventTemplates {
		group callControlEventTemplates {
		group anyCallControlEventTemplates {
		/**
		* @desc Receive template for any CallOutgoing event
		*/
		@@ -500,7 +500,7 @@ module LibItsECall_Templates {
		}
		}

		group mnoCommandTemplates {
		group callControlCommandTemplates {
		/**
		* @desc Send template for CallAccept command
		* @param p_modemInstance Target modem instance process

ttcn/LibItsECall_TypesAndValues.ttcn

+4 −4

Original line number	Diff line number	Diff line
		@@ -466,15 +466,15 @@ module LibItsECall_TypesAndValues {
		encode "SimulatorInterface";
		}

		group mno {
		group callControl {
		/**
		* @desc MNO configuration parameters
		* @desc call control configuration parameters
		*/
		type record MnoConfiguration {
		type record CallControlConfiguration {
		}

		/**
		* @desc Top-level aggregation type for MNO Events
		* @desc Top-level aggregation type for call control Events
		* @member callCanceled
		* @member callIncoming
		* @member callOutgoing