Просмотр исходного кода

Merge pull request #131 from aznashwan/replica-list-task-sort

Sort tasks during Replica listing operations.
Nashwan Azhari 6 лет назад
Родитель
Сommit
a462c99edc
1 измененных файлов с 7 добавлено и 0 удалено
  1. 7 0
      coriolis/api/v1/views/replica_view.py

+ 7 - 0
coriolis/api/v1/views/replica_view.py

@@ -5,6 +5,8 @@ import itertools
 
 from oslo_config import cfg as conf
 
+from coriolis.api.v1.views import replica_tasks_execution_view as view
+
 
 REPLICA_API_OPTS = [
     conf.BoolOpt("include_task_info_in_replicas_api",
@@ -25,6 +27,11 @@ def _format_replica(req, replica, keys=None):
     replica_dict = dict(itertools.chain.from_iterable(
         transform(k, v) for k, v in replica.items()))
 
+    executions = replica_dict.get('executions', [])
+    replica_dict['executions'] = [
+        view.format_replica_tasks_execution(req, ex)
+        for ex in executions]
+
     if not CONF.include_task_info_in_replicas_api and (
             "info" in replica_dict):
         replica_dict.pop("info")