Skip to content
Snippets Groups Projects
Commit 1b5ba6ae authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 64370dc1
No related branches found
No related tags found
2 merge requests!142Release TeraFlowSDN 2.1,!133Integration of TE component
...@@ -206,27 +206,21 @@ class ServiceServiceServicerImpl(ServiceServiceServicer): ...@@ -206,27 +206,21 @@ class ServiceServiceServicerImpl(ServiceServiceServicer):
pathcomp_request = PathCompRequest() pathcomp_request = PathCompRequest()
pathcomp_request.services.append(service_with_uuids) # pylint: disable=no-member pathcomp_request.services.append(service_with_uuids) # pylint: disable=no-member
tasks_scheduler = TasksScheduler(self.service_handler_factory) if num_disjoint_paths is None or num_disjoint_paths in {0, 1}:
if len(service_with_uuids.service_endpoint_ids) >= num_expected_endpoints: pathcomp_request.shortest_path.Clear() # pylint: disable=no-member
pathcomp_request = PathCompRequest() else:
pathcomp_request.services.append(service_with_uuids) # pylint: disable=no-member pathcomp_request.k_disjoint_path.num_disjoint = num_disjoint_paths # pylint: disable=no-member
if num_disjoint_paths is None or num_disjoint_paths in {0, 1}: LOGGER.info('pathcomp_request={:s}'.format(grpc_message_to_json_string(pathcomp_request)))
pathcomp_request.shortest_path.Clear() # pylint: disable=no-member pathcomp = PathCompClient()
else: pathcomp_reply = pathcomp.Compute(pathcomp_request)
pathcomp_request.k_disjoint_path.num_disjoint = num_disjoint_paths # pylint: disable=no-member pathcomp.close()
LOGGER.info('pathcomp_reply={:s}'.format(grpc_message_to_json_string(pathcomp_reply)))
LOGGER.info('pathcomp_request={:s}'.format(grpc_message_to_json_string(pathcomp_request)))
pathcomp = PathCompClient() # Feed TaskScheduler with this path computation reply. TaskScheduler identifies inter-dependencies among
pathcomp_reply = pathcomp.Compute(pathcomp_request) # the services and connections retrieved and produces a schedule of tasks (an ordered list of tasks to be
pathcomp.close() # executed) to implement the requested create/update operation.
LOGGER.info('pathcomp_reply={:s}'.format(grpc_message_to_json_string(pathcomp_reply))) tasks_scheduler.compose_from_pathcompreply(pathcomp_reply, is_delete=False)
# 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 return service_with_uuids.service_id
...@@ -414,4 +408,4 @@ class ServiceServiceServicerImpl(ServiceServiceServicer): ...@@ -414,4 +408,4 @@ class ServiceServiceServicerImpl(ServiceServiceServicer):
updated_service_with_uuids, old_connection, new_connection) updated_service_with_uuids, old_connection, new_connection)
tasks_scheduler.execute_all() tasks_scheduler.execute_all()
return Empty() return Empty()
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment