Commit 6775b068 authored by Pelayo Torres's avatar Pelayo Torres
Browse files

Merge branch... 

Merge branch 'OCF92-review-all-location-resource-header-created-according-to-events-service' into 'staging'

Resolve "Review all Location resource Header created according to Events service"

Closes #92

See merge request !85
parents f401b016 b686ecb2

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py

+2 −2
Original line number 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_internal_event import RedisInternalEvent

from .publisher import Publisher

import os



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


        res = make_response(object=serialize_clean_camel_case(

            apiinvokerenrolmentdetail), status=201)

        res.headers['Location'] = "/api-invoker-management/v1/onboardedInvokers/" + \

            str(api_invoker_id)

        res.headers['Location'] = f"https://{os.getenv("CAPIF_HOSTNAME")}/api-invoker-management/v1/onboardedInvokers/{str(api_invoker_id)}"



        if res.status_code == 201:

            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 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 .redis_internal_event import RedisInternalEvent

import os





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

                api_provider_enrolment_details), status=201)



            res.headers['Location'] = "/api-provider-management/v1/registrations/" + \

                str(api_provider_enrolment_details.api_prov_dom_id)

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

            return res



        except Exception as e:

services/TS29222_CAPIF_Events_API/capif_events/core/events_apis.py

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



            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

services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/invocationlogs.py

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



            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



        except Exception as e:

services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py

+2 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ from ..models.service_api_description import ServiceAPIDescription 
import json

from ..encoder import CustomJSONEncoder

from ..vendor_specific import add_vend_spec_fields

import os



publisher_ops = Publisher()
@@ -127,8 +128,7 @@ class PublishServiceOperations(Resource): 


            res = make_response(object=clean_n_camel_case(

                serviceapidescription_dict), status=201)

            res.headers['Location'] = "http://localhost:8080/published-apis/v1/" + \

                str(apf_id) + "/service-apis/" + str(api_id)

            res.headers['Location'] = f"https://{os.getenv("CAPIF_HOSTNAME")}/published-apis/v1/{str(apf_id)}/service-apis/{str(api_id)}"



            if res.status_code == 201:

                current_app.logger.info("Service published")