Commit cda6097d authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Fix on publish service

parent 5cc4ed81

services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py

+9 −4
Original line number Original line Diff line number Diff line
@@ -289,6 +289,13 @@ class PublishServiceOperations(Resource): 
                           service_api_descriptions=[service_api_description_updated]).send_event()

                           service_api_descriptions=[service_api_description_updated]).send_event()

                current_app.logger.debug("1")

                current_app.logger.debug("1")

                current_app.logger.debug(serviceapidescription_old)

                current_app.logger.debug(serviceapidescription_old)

                my_service_api = dict_to_camel_case(serviceapidescription_old)

                current_app.logger.debug("2")

                current_app.logger.debug(my_service_api)

                my_service_api = clean_empty(my_service_api)

                current_app.logger.debug("3")

                current_app.logger.debug(my_service_api)

                my_service_old = ServiceAPIDescription.from_dict(json.dumps(my_service_api, cls=CustomJSONEncoder))

                # my_service_api = dict_to_camel_case(serviceapidescription_old)

                # my_service_api = dict_to_camel_case(serviceapidescription_old)

                # current_app.logger.debug("2")

                # current_app.logger.debug("2")

                # current_app.logger.debug(my_service_api)

                # current_app.logger.debug(my_service_api)
@@ -301,7 +308,7 @@ class PublishServiceOperations(Resource): 
                # current_app.logger.debug(my_service_api)

                # current_app.logger.debug(my_service_api)

                self.send_events_on_update(

                self.send_events_on_update(

                    service_api_id,

                    service_api_id,

                    serviceapidescription_old,

                    my_service_old,

                    result)

                    result)





            return response

            return response
@@ -316,11 +323,9 @@ class PublishServiceOperations(Resource): 
                              service_api_description_old,

                              service_api_description_old,

                              service_api_description_new):

                              service_api_description_new):

        current_app.logger.debug("send Events if needed")

        current_app.logger.debug("send Events if needed")

        # current_app.logger.debug(json.dumps(service_api_description_old, indent=4))

        service_api_status_event_old = self.service_api_availability_event(

        service_api_status_event_old = self.service_api_availability_event(

            service_api_description_old)

            service_api_description_old)

        current_app.logger.debug("A1")

        current_app.logger.debug("A1")

        # current_app.logger.debug(json.dumps(service_api_status_event_new, indent=4))

        service_api_status_event_new = self.service_api_availability_event(

        service_api_status_event_new = self.service_api_availability_event(

            service_api_description_old)

            service_api_description_old)

        current_app.logger.debug("A2")

        current_app.logger.debug("A2")
@@ -343,7 +348,7 @@ class PublishServiceOperations(Resource): 




    def service_api_availability_event(self, service_api_description):

    def service_api_availability_event(self, service_api_description):

        service_api_status = ""

        service_api_status = ""

        if ServiceAPIDescription.return_supp_feat_dict(service_api_description.get("supported_features", None))["ApiStatusMonitoring"]:

        if ServiceAPIDescription.return_supp_feat_dict(service_api_description.supported_features)["ApiStatusMonitoring"]:

            if service_api_description.api_status is None or len(service_api_description.api_status.aef_ids) > 0:

            if service_api_description.api_status is None or len(service_api_description.api_status.aef_ids) > 0:

                current_app.logger.info(

                current_app.logger.info(

                    "Service available, at least one AEF is available")

                    "Service available, at least one AEF is available")