Resolve FIXME on mw_error_IndicationIEs template using superset (98c18647) · Commits · INT - Core Network and Interoperability Testing / Evolved_Packet_Core / S1AP

ttcn3/LibS1AP/LibS1AP_Templates.ttcn

+66 −69

Original line number	Diff line number	Diff line
		@@ -1495,19 +1495,16 @@ module LibS1AP_Templates {
		* @desc Receive template for ERROR_INDICATION message
		* @param p_MME_value The expected MME UE S1AP ID value. Default: ?
		* @param p_eNB_value The expected eNB UE S1AP ID value. Default: ?
		* @param p_cause The expected Cause value. Default: ?
		* @param p_criticalityDiagnostics Information about which IEs were not comprehended or were missing. Default: ?
		* @param p_value The expected Cause value or CriticalityDiagnostics value. Default: ?
		*/
		template (present) RecordOf_ProtocolIE mw_error_IndicationIEs(
		template (present) MME_UE_S1AP_ID p_MME_value := ?,
		template (present) ENB_UE_S1AP_ID p_eNB_value := ?,
		template (present) Cause p_cause := ?,
		template (present) CriticalityDiagnostics p_criticalityDiagnostics := ?
		template (present) ProtocolIE p_value
		) := {
		mw_MME_UE_S1AP_ID(p_MME_value),
		mw_eNB_UE_S1AP_ID(p_eNB_value),
		mw_cause_IE(p_cause), // FIXME 'ifpresent' is not correct, how to achieve cause or criticalityDiagnostics condiftion?
		mw_criticalityDiagnostics_IE(p_criticalityDiagnostics)
		p_value
		} // End of template mw_error_IndicationIEs

		} // End of group Error_Indication_receive

+173 −149

Original line number	Diff line number	Diff line
		@@ -2010,10 +2010,24 @@ module S1AP_TCFunctions {
		} else {
		// 2. sends a ERROR_INDICATION
		f_recv_Error_Indication(
		superset (
		all from
		mw_error_IndicationIEs(
		vc_MME_UE_ID,
		vc_eNB_UE_ID // TODO To be refined
		));
		vc_eNB_UE_ID,
		mw_cause_IE(
		-
		)
		),
		mw_error_IndicationIEs(
		vc_MME_UE_ID,
		vc_eNB_UE_ID,
		mw_criticalityDiagnostics_IE(
		-
		)
		)
		)
		);
		}
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		@@ -3320,10 +3334,20 @@ module S1AP_TCFunctions {
		} else {
		// 2. sends a ERROR INDICATION
		f_recv_Error_Indication(
		superset (
		all from
		mw_error_IndicationIEs(
		vc_MME_UE_ID,
		vc_eNB_UE_ID // TODO To be refined
		));
		vc_eNB_UE_ID,
		mw_cause_IE
		),
		mw_error_IndicationIEs(
		vc_MME_UE_ID,
		vc_eNB_UE_ID,
		mw_criticalityDiagnostics_IE
		)
		)
		);
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
		}

+1 −1

File changed.

Contains only whitespace changes.