From ffdb5bc10e94c907111fb0fae02e35cdcd47b7b0 Mon Sep 17 00:00:00 2001 From: gqp <446105468@qq.com> Date: Tue, 7 Jan 2025 18:18:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20CC=E6=8E=A5=E5=8F=A3=E9=99=90=E9=A2=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20(closed=20#2531)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/backend/subscription/tools.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/apps/backend/subscription/tools.py b/apps/backend/subscription/tools.py index 531a2ee1d..883efe982 100644 --- a/apps/backend/subscription/tools.py +++ b/apps/backend/subscription/tools.py @@ -492,6 +492,11 @@ def get_service_instance_by_inst(bk_biz_id, inst_list, module_to_topo): @RetryHandler(interval=3, retry_times=2) def get_service_instance_by_set_templates(bk_biz_id: int, set_template_ids: List[int]): + """ + 通过集群模板获取服务实例详情 + :param bk_biz_id: 业务ID + :param set_template_ids: 集群模板id列表 + """ params = [ { "func": CCApi.list_service_instance_by_set_template, @@ -507,15 +512,21 @@ def get_service_instance_by_set_templates(bk_biz_id: int, set_template_ids: List for set_template_id in set_template_ids ] - service_instance_infos = batch_call( - batch_request, params, extend_result=True, interval=constants.LIST_SERVICE_INSTANCE_BY_SET_TEMPLATE_INTERVAL - ) + service_instance_ids: List[int] = [ + service_instance["id"] + for service_instance in batch_call( + func=batch_request, + params_list=params, + extend_result=True, + interval=constants.LIST_SERVICE_INSTANCE_BY_SET_TEMPLATE_INTERVAL, + ) + ] service_instance_details = batch_request( CCApi.list_service_instance_detail, params={ "bk_biz_id": int(bk_biz_id), - "service_instance_ids": [service_instance_info["id"] for service_instance_info in service_instance_infos], + "service_instance_ids": service_instance_ids, "no_request": True, }, sort="id",