Bug fixed in AtsMec_QoSMeasurementAPI (b530d2d6) · Commits · MEC - Multi-access Edge Computing / MEC TTCN-3 Test Suite

ttcn/AtsMec_QoSMeasurement/AtsMec_QoSMeasurementAPI_TestCases.ttcn

+9 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2828,10 +2828,8 @@ module AtsMec_QoSMeasurementAPI_TestCases {
	-,		-,
	-,		-,
	mw_http_message_body_json(		mw_http_message_body_json(
	mw_body_json_qos_event_subscription(		mw_body_json_qos_measure_notification(
	mw_qos_event_subscription(		mw_qos_measure_notification(
	PX_QOS_EVENT_SUB_CALLBACK_URI,
	PX_MEASURING_PERIOD,
	mw_links		mw_links
	)))))) {		)))))) {
	tc_wait.stop;		tc_wait.stop;
	@@ -2857,7 +2855,7 @@ module AtsMec_QoSMeasurementAPI_TestCases {
	} // End of testcase TC_MEC_MEC045_SRV_QOS_EVENT_SUB_NOT_004_OK_01		} // End of testcase TC_MEC_MEC045_SRV_QOS_EVENT_SUB_NOT_004_OK_01

	/**		/**
	* @desc Check that the IUT provides a test notification when requested by a MEC Application		* @desc Check that the IUT provides a notification when requested by a MEC Application
	*/		*/
	testcase TC_MEC_MEC045_SRV_QOS_EVENT_SUB_NOT_004_OK_02() runs on HttpComponent system HttpTestAdapter {		testcase TC_MEC_MEC045_SRV_QOS_EVENT_SUB_NOT_004_OK_02() runs on HttpComponent system HttpTestAdapter {
	// Local variables		// Local variables
	@@ -2890,8 +2888,11 @@ module AtsMec_QoSMeasurementAPI_TestCases {
	-,		-,
	-,		-,
	mw_http_message_body_json(		mw_http_message_body_json(
	mw_body_json_qos_test_notification		mw_body_json_qos_event_notification(
	)))) {		mw_qos_event_notification(
			mw_links(
			{ href := pattern "http?+" & PICS_ROOT_API & PX_QOS_API_LIST_SUBS & "/" & v_subscription_id}
			))))))) {
	tc_wait.stop;		tc_wait.stop;

	f_init_default_headers_list(-, -, v_headers);		f_init_default_headers_list(-, -, v_headers);

ttcn/AtsMec_QoSMeasurement/module.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ modules := ../LibCommon \
	../LibMec/IoTAPI \		../LibMec/IoTAPI \
	../LibMec/FederationEnablementAPI \		../LibMec/FederationEnablementAPI \
	../LibMec/QoSMeasurementAPI \		../LibMec/QoSMeasurementAPI \
			../LibMec/SensorsSharingService \
	../../titan-test-system-framework/ccsrc/Framework \		../../titan-test-system-framework/ccsrc/Framework \
	../../titan-test-system-framework/ccsrc/loggers \		../../titan-test-system-framework/ccsrc/loggers \
	../../titan-test-system-framework/ccsrc/Protocols/Http \		../../titan-test-system-framework/ccsrc/Protocols/Http \

ttcn/LibMec/QoSMeasurementAPI/ttcn/QoSMeasurementAPI_Templates.ttcn

+66 −66

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,7 @@ module QoSMeasurementAPI_Templates {
	measuringTime := p_measuringTime,		measuringTime := p_measuringTime,
	metricType := p_metricType,		metricType := p_metricType,
	expiryDeadline := p_expiryDeadline		expiryDeadline := p_expiryDeadline
	} // End of template m_qo_s_measure_subscription		} // End of template m_qos_measure_subscription

	template (omit) QoSMeasureSubscription m_qos_measure_subscription_wrong(		template (omit) QoSMeasureSubscription m_qos_measure_subscription_wrong(
	in MetricTypes p_metricType,		in MetricTypes p_metricType,
	@@ -340,7 +340,7 @@ module QoSMeasurementAPI_Templates {
	links := p_links		links := p_links
	} // End of template mw_test_notification		} // End of template mw_test_notification

	template (omit) QoSMeasureNotification m_qo_s_measure_notification(		template (omit) QoSMeasureNotification m_qos_measure_notification(
	in template (value) Links p_links,		in template (value) Links p_links,
	in template (omit) SubscriptionState p_subscriptionState := omit,		in template (omit) SubscriptionState p_subscriptionState := omit,
	in template (omit) QoSMeasureResults p_qoSMeasureResult := omit,		in template (omit) QoSMeasureResults p_qoSMeasureResult := omit,
	@@ -351,9 +351,9 @@ module QoSMeasurementAPI_Templates {
	subscriptionState := p_subscriptionState,		subscriptionState := p_subscriptionState,
	qoSMeasureResult := p_qoSMeasureResult,		qoSMeasureResult := p_qoSMeasureResult,
	links := p_links		links := p_links
	} // End of template m_qo_s_measure_notification		} // End of template m_qos_measure_notification

	template (present) QoSMeasureNotification mw_qo_s_measure_notification(		template (present) QoSMeasureNotification mw_qos_measure_notification(
	template (present) Links p_links := ?,		template (present) Links p_links := ?,
	template SubscriptionState p_subscriptionState := *,		template SubscriptionState p_subscriptionState := *,
	template QoSMeasureResults p_qoSMeasureResult := *,		template QoSMeasureResults p_qoSMeasureResult := *,
	@@ -364,9 +364,9 @@ module QoSMeasurementAPI_Templates {
	subscriptionState := p_subscriptionState,		subscriptionState := p_subscriptionState,
	qoSMeasureResult := p_qoSMeasureResult,		qoSMeasureResult := p_qoSMeasureResult,
	links := p_links		links := p_links
	} // End of template mw_qo_s_measure_notification		} // End of template mw_qos_measure_notification

	template (omit) QoSMeasureResult m_qo_s_measure_result(		template (omit) QoSMeasureResult m_qos_measure_result(
	in template (value) FlowFilter p_flow,		in template (value) FlowFilter p_flow,
	in template (omit) Json.AnyURI p_user := omit,		in template (omit) Json.AnyURI p_user := omit,
	in template (omit) MeasuringArea p_measuringArea := omit,		in template (omit) MeasuringArea p_measuringArea := omit,
	@@ -386,9 +386,9 @@ module QoSMeasurementAPI_Templates {
	throughput := p_throughput,		throughput := p_throughput,
	loss_rate := p_loss_rate,		loss_rate := p_loss_rate,
	error_rate := p_error_rate		error_rate := p_error_rate
	} // End of template m_qo_s_measure_result		} // End of template m_qos_measure_result

	template (present) QoSMeasureResult mw_qo_s_measure_result(		template (present) QoSMeasureResult mw_qos_measure_result(
	template (present) FlowFilter p_flow := ?,		template (present) FlowFilter p_flow := ?,
	template Json.AnyURI p_user := *,		template Json.AnyURI p_user := *,
	template MeasuringArea p_measuringArea := *,		template MeasuringArea p_measuringArea := *,
	@@ -408,9 +408,9 @@ module QoSMeasurementAPI_Templates {
	throughput := p_throughput,		throughput := p_throughput,
	loss_rate := p_loss_rate,		loss_rate := p_loss_rate,
	error_rate := p_error_rate		error_rate := p_error_rate
	} // End of template mw_qo_s_measure_result		} // End of template mw_qos_measure_result

	template (omit) QoSEventNotification m_qo_s_event_notification(		template (omit) QoSEventNotification m_qos_event_notification(
	in template (value) Links p_links,		in template (value) Links p_links,
	in template (value) FlowFilters p_flow,		in template (value) FlowFilters p_flow,
	in template (value) MetricType p_metricType,		in template (value) MetricType p_metricType,
	@@ -429,9 +429,9 @@ module QoSMeasurementAPI_Templates {
	qosEvent := p_qosEvent,		qosEvent := p_qosEvent,
	measuringArea := p_measuringArea,		measuringArea := p_measuringArea,
	links := p_links		links := p_links
	} // End of template m_qo_s_event_notification		} // End of template m_qos_event_notification

	template (present) QoSEventNotification mw_qo_s_event_notification(		template (present) QoSEventNotification mw_qos_event_notification(
	template (present) Links p_links := ?,		template (present) Links p_links := ?,
	template (present) FlowFilters p_flow := ?,		template (present) FlowFilters p_flow := ?,
	template (present) MetricType p_metricType := ?,		template (present) MetricType p_metricType := ?,
	@@ -450,7 +450,7 @@ module QoSMeasurementAPI_Templates {
	qosEvent := p_qosEvent,		qosEvent := p_qosEvent,
	measuringArea := p_measuringArea,		measuringArea := p_measuringArea,
	links := p_links		links := p_links
	} // End of template mw_qo_s_event_notification		} // End of template mw_qos_event_notification

	template (value) Point m_point(		template (value) Point m_point(
	in Json.Number p_latitude,		in Json.Number p_latitude,

ttcn/patch_lib_http/module.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	sources := \		sources := \
	ttcn/LibHttp_JsonMessageBodyTypes.ttcn \		ttcn/LibHttp_JsonMessageBodyTypes.ttcn \
	ttcn/LibHttp_JsonTemplates.ttcn \		ttcn/LibHttp_JsonTemplates.ttcn \

ttcn/patch_lib_http/ttcn/LibHttp_JsonMessageBodyTypes.ttcn

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -184,6 +184,8 @@ module LibHttp_JsonMessageBodyTypes {
	QoSMeasurementAPI_TypesAndValues.NotificationSubscriptionList notification_subscription_list, // ETSI GS MEC 045 V3.1.1 (2024-03) Clause 6.3.1 Type: NotificationSubscriptionList		QoSMeasurementAPI_TypesAndValues.NotificationSubscriptionList notification_subscription_list, // ETSI GS MEC 045 V3.1.1 (2024-03) Clause 6.3.1 Type: NotificationSubscriptionList
	QoSMeasureSubscription qos_measure_subscription, // ETSI GS MEC 045 V3.1.1 (2024-03) Clause 6.3.2 Type: QoSMeasureSubscription		QoSMeasureSubscription qos_measure_subscription, // ETSI GS MEC 045 V3.1.1 (2024-03) Clause 6.3.2 Type: QoSMeasureSubscription
	QoSEventSubscription qos_event_subscription, // ETSI GS MEC 045 V3.1.1 (2024-03) Clause 6.3.3 Type: QoSEventSubscription		QoSEventSubscription qos_event_subscription, // ETSI GS MEC 045 V3.1.1 (2024-03) Clause 6.3.3 Type: QoSEventSubscription
			QoSMeasureNotification qos_measure_notification, // ETSI GS MEC 045 V3.1.1 (2024-03) Clause 6.4.2 Type: QoSMeasureNotification
			QoSEventNotification qos_event_notification, // ETSI GS MEC 045 V3.1.1 (2024-03) Clause 6.4.3 Type: QoSEventNotification
	QoSMeasurementAPI_TypesAndValues.TestNotification qos_test_notification, // ETSI GS MEC 045 V3.1.1 (2024-03) Clause 6.4.1 Type: TestNotification		QoSMeasurementAPI_TypesAndValues.TestNotification qos_test_notification, // ETSI GS MEC 045 V3.1.1 (2024-03) Clause 6.4.1 Type: TestNotification
	SensorDiscoveryInfos sensor_discovery_infos, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.2.1 Type: SensorDiscoveryInfo		SensorDiscoveryInfos sensor_discovery_infos, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.2.1 Type: SensorDiscoveryInfo
	SensorDiscoveryInfo sensor_discovery_info, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.2.1 Type: SensorDiscoveryInfo		SensorDiscoveryInfo sensor_discovery_info, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.2.1 Type: SensorDiscoveryInfo
	@@ -191,10 +193,14 @@ module LibHttp_JsonMessageBodyTypes {
	SensorDiscoveryEventSubscription sensor_discovery_event_subscription, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.3.1 Type: SensorDiscoveryEventSubscription		SensorDiscoveryEventSubscription sensor_discovery_event_subscription, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.3.1 Type: SensorDiscoveryEventSubscription
	SensorStatusSubscription sensor_status_subscription, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.3.2 Type: SensorStatusSubscription		SensorStatusSubscription sensor_status_subscription, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.3.2 Type: SensorStatusSubscription
	SensorDataSubscription sensor_data_subscription, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.3.3 Type: SensorDataSubscription		SensorDataSubscription sensor_data_subscription, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.3.3 Type: SensorDataSubscription
			SensorDiscoveryEventNotification sensor_discovery_event_notification, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.4.1 Type: SensorDiscoveryEventNotification
			SensorStatusNotification sensor_status_notification, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.4.2 Type: SensorStatusNotification
			SensorDataNotification sensor_data_notification, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.4.3 Type: SensorDataNotification
	SensorDatas sensor_datas, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.2.3 Type: SensorData		SensorDatas sensor_datas, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.2.3 Type: SensorData
	SensorData sensor_data, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.2.3 Type: SensorData		SensorData sensor_data, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.2.3 Type: SensorData
	SensorCharacteristics sensor_characteristics, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.5.4 Type: SensorCharacteristic		SensorCharacteristics sensor_characteristics, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.5.4 Type: SensorCharacteristic
	SensorCharacteristicInfos sensor_characteristic_infos, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause		SensorCharacteristicInfos sensor_characteristic_infos, // ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.5.4 Type: SensorCharacteristic
			SensorsSharingService_TypesAndValues.TestNotification sens_test_notification,
	// TODO Add here your custom variants		// TODO Add here your custom variants
	universal charstring raw		universal charstring raw
	} with {		} with {

Admin message