Add missing fields in... (529166f3) · Commits · MEC - Multi-access Edge Computing / MEC TTCN-3 Test Suite

ccsrc/Protocols/Json/json_codec_mec013.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -201,7 +201,7 @@ int json_codec_mec013::decode (const OCTETSTRING& p_data, LibHttp__JsonMessageBo
	LocationAPI__TypesAndValues::UserDistanceSubscription user_distance_subscription;		LocationAPI__TypesAndValues::UserDistanceSubscription user_distance_subscription;
	user_distance_subscription.decode(LocationAPI__TypesAndValues::UserDistanceSubscription_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);		user_distance_subscription.decode(LocationAPI__TypesAndValues::UserDistanceSubscription_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);
	msg.userDistanceSubscription() = user_distance_subscription;		msg.userDistanceSubscription() = user_distance_subscription;
	} else if (it->second.find("\"userDistanceNotification\"") != std::string::npos) {		} else if (it->second.find("\"UserDistanceNotification\"") != std::string::npos) {
	int idx_begin = it->second.find(":");		int idx_begin = it->second.find(":");
	int idx_end = it->second.rfind("}") - 1; // Remove the last '}'		int idx_end = it->second.rfind("}") - 1; // Remove the last '}'
	str = it->second.substr(idx_begin + 1, idx_end - idx_begin);		str = it->second.substr(idx_begin + 1, idx_end - idx_begin);

etc/AtsMec_Location/AtsMec_Location_Sandbox.cf_

+2 −2

ttcn/AtsMec_Location/AtsMec_LocationAPI_TestCases.ttcn

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1380,9 +1380,11 @@ module AtsMec_LocationAPI_TestCases {
	-,		-,
	-,		-,
	mw_http_message_body_json(		mw_http_message_body_json(
	mw_body_json_user_distance_subscription(		mw_body_json_user_distance_notification(
	v_user_distance_subscription		mw_user_distance_notification(
	))))) {		-, -,
			v_user_distance_subscription.links_
			)))))) {
	tc_ac.stop;		tc_ac.stop;

	// Send response		// Send response
	@@ -1393,6 +1395,10 @@ module AtsMec_LocationAPI_TestCases {
	log("* " & testcasename() & ": PASS: IUT successfully responds with a userDistanceNotification *");		log("* " & testcasename() & ": PASS: IUT successfully responds with a userDistanceNotification *");
	f_selfOrClientSyncAndVerdict(c_tbDone, e_success);		f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
	}		}
			[] httpPort_notif.receive {
			log("* " & testcasename() & ": INFO: Unsollicited message received *");
			repeat;
			}
	[] tc_ac.timeout {		[] tc_ac.timeout {
	log("* " & testcasename() & ": INCONC: Expected message not received *");		log("* " & testcasename() & ": INCONC: Expected message not received *");
	f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);		f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);

ttcn/LibMec/ApplicationPackageLifecycleAndOperationGrantingAPI/ttcn/ApplicationPackageLifecycleAndOperationGrantingAPI_Templates.ttcn

+37 −8

Original line number	Original line	Diff line number	Diff line
	@@ -233,13 +233,35 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_Templates {
	template (present) OnboardingState p_onboardingState := ?,		template (present) OnboardingState p_onboardingState := ?,
	template (present) AppPkgInfo_OperationalState p_operationalState := ?,		template (present) AppPkgInfo_OperationalState p_operationalState := ?,
	template (present) UsageState p_usageState := ?,		template (present) UsageState p_usageState := ?,
	template (present) AppPkgInfo_Links p_links := ?		template (present) AppPkgInfo_Links p_links := ?,
			template Json.String p_appDId := *,
			template Json.String p_appProvider := *,
			template Json.String p_appName := *,
			template Json.String p_appSoftwareVersion := *,
			template Json.String p_appDVersion := *,
			template Json.String p_signingCertificate := *,
			template AppPkgSWImageInfo p_softwareImages := *,
			template AppPkgArtifactInfo p_additionalArtifacts := *,
			template AppPkgInfo_MecInfo p_mecInfo := *,
			template ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues.KeyValuePairs p_userDefinedData := *,
			template ProblemDetails p_onboardingFailureDetails := *
	) := {		) := {
	id := p_id,		id := p_id,
			appDId := p_appDId,
			appProvider := p_appProvider,
			appName := p_appName,
			appSoftwareVersion := p_appSoftwareVersion,
			appDVersion := p_appDVersion,
	checksum := p_checksum,		checksum := p_checksum,
			signingCertificate := p_signingCertificate,
			softwareImages := p_softwareImages,
			additionalArtifacts := p_additionalArtifacts,
	onboardingState := p_onboardingState,		onboardingState := p_onboardingState,
	operationalState := p_operationalState,		operationalState := p_operationalState,
	usageState := p_usageState,		usageState := p_usageState,
			mecInfo := p_mecInfo,
			userDefinedData := p_userDefinedData,
			onboardingFailureDetails := p_onboardingFailureDetails,
	links := p_links		links := p_links
	} // End of template mw_app_pkg_info		} // End of template mw_app_pkg_info

	@@ -255,25 +277,32 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_Templates {
	template (present) AppPkgInfo_OperationalState p_operationalState := ?,		template (present) AppPkgInfo_OperationalState p_operationalState := ?,
	template (present) UsageState p_usageState := ?,		template (present) UsageState p_usageState := ?,
	template (present) AppPkgInfo_MecInfo p_mecInfo := ?,		template (present) AppPkgInfo_MecInfo p_mecInfo := ?,
	template (present) AppPkgInfo_Links p_links := ?		template (present) AppPkgInfo_Links p_links := ?,
			template Json.String p_appProvider := *,
			template Json.String p_signingCertificate := *,
			template AppPkgArtifactInfo p_additionalArtifacts := *,
			template ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues.KeyValuePairs p_userDefinedData := *,
			template ProblemDetails p_onboardingFailureDetails := *
	) := {		) := {

	id := p_id,		id := p_id,
	appDId := p_appDId,		appDId := p_appDId,
	appProvider := *,		appProvider := p_appProvider,
	appName := p_appName,		appName := p_appName,
	appSoftwareVersion := p_appSoftwareVersion,		appSoftwareVersion := p_appSoftwareVersion,
	appDVersion := p_appDVersion,		appDVersion := p_appDVersion,
	checksum := p_checksum,		checksum := p_checksum,
	signingCertificate := *,		signingCertificate := p_signingCertificate,
	softwareImages := p_softwareImages,		softwareImages := p_softwareImages,
	additionalArtifacts := *,		additionalArtifacts := p_additionalArtifacts,
	onboardingState := p_onboardingState,		onboardingState := p_onboardingState,
	operationalState := p_operationalState,		operationalState := p_operationalState,
	usageState := p_usageState,		usageState := p_usageState,
	mecInfo := p_mecInfo,		mecInfo := p_mecInfo,
	userDefinedData := *,		userDefinedData := p_userDefinedData,
	onboardingFailureDetails := *,		onboardingFailureDetails := p_onboardingFailureDetails,
	links := p_links		links := p_links

	} // End of template mw_app_pkg_info		} // End of template mw_app_pkg_info

	template (value) Checksum m_checksum(		template (value) Checksum m_checksum(

ttcn/LibMec/LocationAPI/ttcn/LocationAPI_Templates.ttcn

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,7 @@ module LocationAPI_Templates {
	accessPointId := p_access_point_id,		accessPointId := p_access_point_id,
	zoneId := p_zone_id,		zoneId := p_zone_id,
	resourceURL := p_resource_url,		resourceURL := p_resource_url,
	timestamp_ := p_timestamp,		timeStamp := p_timestamp,
	locationInfo := omit,		locationInfo := omit,
	civicInfo := omit,		civicInfo := omit,
	ancillaryInfo := omit,		ancillaryInfo := omit,
	@@ -42,7 +42,7 @@ module LocationAPI_Templates {
	accessPointId := p_access_point_id,		accessPointId := p_access_point_id,
	zoneId := p_zone_id,		zoneId := p_zone_id,
	resourceURL := p_resource_url,		resourceURL := p_resource_url,
	timestamp_ := p_timestamp,		timeStamp := p_timestamp,
	locationInfo := *,		locationInfo := *,
	civicInfo := *,		civicInfo := *,
	ancillaryInfo := *,		ancillaryInfo := *,
	@@ -84,7 +84,7 @@ module LocationAPI_Templates {
	offsetAngle := omit,		offsetAngle := omit,
	includedAngle := omit,		includedAngle := omit,
	shape := p_shape,		shape := p_shape,
	timestamp_ := omit,		timeStamp := omit,
	velocity := omit		velocity := omit
	} // End of template m_location_info		} // End of template m_location_info

	@@ -106,7 +106,7 @@ module LocationAPI_Templates {
	offsetAngle := *,		offsetAngle := *,
	includedAngle := *,		includedAngle := *,
	shape := p_shape,		shape := p_shape,
	timestamp_ := *,		timeStamp := *,
	velocity := *		velocity := *
	} // End of template mw_location_info		} // End of template mw_location_info

	@@ -907,13 +907,13 @@ module LocationAPI_Templates {
	template (value) TerminalDistance m_terminal_distance(in Json.Number p_distance) := {		template (value) TerminalDistance m_terminal_distance(in Json.Number p_distance) := {
	distance := p_distance,		distance := p_distance,
	accuracy := omit,		accuracy := omit,
	timestamp_ := omit		timeStamp := omit
	} // End of template m_terminal_distance		} // End of template m_terminal_distance

	template (present) TerminalDistance mw_terminal_distance(template (present) Json.Number p_distance := ?) := {		template (present) TerminalDistance mw_terminal_distance(template (present) Json.Number p_distance := ?) := {
	distance := p_distance,		distance := p_distance,
	accuracy := *,		accuracy := *,
	timestamp_ := *		timeStamp := *
	} // End of template mw_terminal_distance		} // End of template mw_terminal_distance

	} // End of module LocationAPI_Templates		} // End of module LocationAPI_Templates

Original line number	Original line	Diff line number	Diff line
	@@ -131,7 +131,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec_mec013)/TCP(debug=1
	# Check that the IUT acknowledges the UE distance subscription request when commanded by a MEC Application and notifies it when (all) the requested UE(s) is (are) within the specified distance		# Check that the IUT acknowledges the UE distance subscription request when commanded by a MEC Application and notifies it when (all) the requested UE(s) is (are) within the specified distance
	#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UEDISTSUB_001_OK_02		#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UEDISTSUB_001_OK_02
	# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application - Neither callbackReference nor websockNotifConfig provided		# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application - Neither callbackReference nor websockNotifConfig provided
	#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UEDISTSUB_001_BR		AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UEDISTSUB_001_BR
	# Check that the IUT acknowledges the cancellation of UE distance notifications when commanded by a MEC Application		# Check that the IUT acknowledges the cancellation of UE distance notifications when commanded by a MEC Application
	#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UEDISTSUB_002_OK		#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UEDISTSUB_002_OK
	# Check that the IUT responds with an error when a request for an URI that cannot be mapped to a valid resource URI is sent by a MEC Application		# Check that the IUT responds with an error when a request for an URI that cannot be mapped to a valid resource URI is sent by a MEC Application
	@@ -197,7 +197,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec_mec013)/TCP(debug=1
	# Check that the IUT acknowledges a request to modify a not existing subscription by a MEC Application		# Check that the IUT acknowledges a request to modify a not existing subscription by a MEC Application
	#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UELOCSUB_003_NF_02		#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UELOCSUB_003_NF_02
	# Check that the IUT provides a test notification when requested by a MEC Application		# Check that the IUT provides a test notification when requested by a MEC Application
	AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UETESTNOT_001_OK		#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UETESTNOT_001_OK
	# Check that the IUT responds with a list zones when queried by a MEC Application		# Check that the IUT responds with a list zones when queried by a MEC Application
	#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UEZONELOOK_001_OK		#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UEZONELOOK_001_OK
	# Check that the IUT responds with the subscription when queried by a MEC Application - Zone location Event		# Check that the IUT responds with the subscription when queried by a MEC Application - Zone location Event

Admin message