Commit 394c29be authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 1b5ba6ae

src/service/service/ServiceServiceServicerImpl.py

+4 −4
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ class ServiceServiceServicerImpl(ServiceServiceServicer): 
            context_client, service_id_with_uuids, rw_copy=False,

            include_config_rules=True, include_constraints=True, include_endpoint_ids=True)



        num_disjoint_paths = None

        num_disjoint_paths = 0

        for constraint in request.service_constraints:

            if constraint.WhichOneof('constraint') == 'sla_availability':

                num_disjoint_paths = constraint.sla_availability.num_disjoint_paths
@@ -211,18 +211,18 @@ class ServiceServiceServicerImpl(ServiceServiceServicer): 
            else:

                pathcomp_request.k_disjoint_path.num_disjoint = num_disjoint_paths  # pylint: disable=no-member



            LOGGER.info('pathcomp_request={:s}'.format(grpc_message_to_json_string(pathcomp_request)))

            LOGGER.debug('pathcomp_request={:s}'.format(grpc_message_to_json_string(pathcomp_request)))

            pathcomp = PathCompClient()

            pathcomp_reply = pathcomp.Compute(pathcomp_request)

            pathcomp.close()

            LOGGER.info('pathcomp_reply={:s}'.format(grpc_message_to_json_string(pathcomp_reply)))

            LOGGER.debug('pathcomp_reply={:s}'.format(grpc_message_to_json_string(pathcomp_reply)))



            # Feed TaskScheduler with this path computation reply. TaskScheduler identifies inter-dependencies among

            # the services and connections retrieved and produces a schedule of tasks (an ordered list of tasks to be

            # executed) to implement the requested create/update operation.

            tasks_scheduler.compose_from_pathcompreply(pathcomp_reply, is_delete=False)

            tasks_scheduler.execute_all()



        tasks_scheduler.execute_all()

        return service_with_uuids.service_id



    @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)