Commit d4bd9dd0 authored Dec 17, 2024 by Stavros

Merge branch 'staging' into OCF102-not-stored-fields-when-vendor-extensibility-enabled-in-publish

parents 20adf2b8 6775b068

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,7 @@ from api_invoker_management.models.api_invoker_enrolment_details import APIInvok
	from .redis_event import RedisEvent		from .redis_event import RedisEvent
	from .redis_internal_event import RedisInternalEvent		from .redis_internal_event import RedisInternalEvent
	from .publisher import Publisher		from .publisher import Publisher
			import os

	publisher_ops = Publisher()		publisher_ops = Publisher()

	@@ -101,8 +102,7 @@ class InvokerManagementOperations(Resource):

	res = make_response(object=serialize_clean_camel_case(		res = make_response(object=serialize_clean_camel_case(
	apiinvokerenrolmentdetail), status=201)		apiinvokerenrolmentdetail), status=201)
	res.headers['Location'] = "/api-invoker-management/v1/onboardedInvokers/" + \		res.headers['Location'] = f"https://{os.getenv("CAPIF_HOSTNAME")}/api-invoker-management/v1/onboardedInvokers/{str(api_invoker_id)}"
	str(api_invoker_id)

	if res.status_code == 201:		if res.status_code == 201:
	current_app.logger.info("Invoker Created")		current_app.logger.info("Invoker Created")

services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/provider_enrolment_details_api.py

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -11,6 +11,7 @@ from .auth_manager import AuthManager

	from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails # noqa: E501		from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails # noqa: E501
	from .redis_internal_event import RedisInternalEvent		from .redis_internal_event import RedisInternalEvent
			import os


	class ProviderManagementOperations(Resource):		class ProviderManagementOperations(Resource):
	@@ -73,8 +74,7 @@ class ProviderManagementOperations(Resource):
	res = make_response(object=serialize_clean_camel_case(		res = make_response(object=serialize_clean_camel_case(
	api_provider_enrolment_details), status=201)		api_provider_enrolment_details), status=201)

	res.headers['Location'] = "/api-provider-management/v1/registrations/" + \		res.headers['Location'] = f"https://{os.getenv("CAPIF_HOSTNAME")}/api-provider-management/v1/registrations/{str(api_provider_enrolment_details.api_prov_dom_id)}"
	str(api_provider_enrolment_details.api_prov_dom_id)
	return res		return res

	except Exception as e:		except Exception as e:

services/TS29222_CAPIF_Events_API/capif_events/core/events_apis.py

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -83,7 +83,7 @@ class EventSubscriptionsOperations(Resource):
	self.auth_manager.add_auth_event(subscription_id, subscriber_id)		self.auth_manager.add_auth_event(subscription_id, subscriber_id)

	res = make_response(object=serialize_clean_camel_case(event_subscription), status=201)		res = make_response(object=serialize_clean_camel_case(event_subscription), status=201)
	res.headers['Location'] = f"http://{os.getenv("CAPIF_HOSTNAME")}/capif-events/v1/{str(subscriber_id)}/subscriptions/{str(subscription_id)}"		res.headers['Location'] = f"https://{os.getenv("CAPIF_HOSTNAME")}/capif-events/v1/{str(subscriber_id)}/subscriptions/{str(subscription_id)}"

	return res		return res

services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/invocationlogs.py

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -136,9 +136,8 @@ class LoggingInvocationOperations(Resource):
	log.api_id: log.api_name for log in invocationlog.logs}		log.api_id: log.api_name for log in invocationlog.logs}

	current_app.logger.debug(f"Added log entry to apis: {apis_added}")		current_app.logger.debug(f"Added log entry to apis: {apis_added}")
			res.headers['Location'] = f"https://{os.getenv("CAPIF_HOSTNAME")}/api-invocation-logs/v1/{str(aef_id)}/logs/{str(log_id)}"

	res.headers['Location'] = "https://{}/api-invocation-logs/v1/{}/logs/{}".format(
	os.getenv('CAPIF_HOSTNAME'), str(aef_id), str(log_id))
	return res		return res

	except Exception as e:		except Exception as e:

services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -173,6 +173,13 @@ def apf_id_service_apis_service_api_id_put(service_api_id, apf_id, body): # noq
	current_app.logger.info(		current_app.logger.info(
	"Updating service api id with id: " + service_api_id)		"Updating service api id with id: " + service_api_id)

			if 'supportedFeatures' not in body:
			return bad_request_error(
			detail="supportedFeatures not present in request",
			cause="supportedFeatures not present",
			invalid_params=[{"param": "supportedFeatures", "reason": "not defined"}]
			)

	if request.is_json:		if request.is_json:
	body = ServiceAPIDescription.from_dict(request.get_json()) # noqa: E501		body = ServiceAPIDescription.from_dict(request.get_json()) # noqa: E501