From 7b59e9862312eb9a07a877308011d702f959e675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=80=86=E6=B5=81=E8=80=8C=E4=B8=8A?= <62740231+DokiDoki1103@users.noreply.github.com> Date: Wed, 17 Jan 2024 12:16:31 +0800 Subject: [PATCH] feat: support config name search (#1430) * feat: support config name search * feat: support config name search * :wq --- console/services/app_config/mnt_service.py | 6 ++++-- console/views/app_config/app_mnt.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/console/services/app_config/mnt_service.py b/console/services/app_config/mnt_service.py index 1d73e5c1d..dace35c0d 100644 --- a/console/services/app_config/mnt_service.py +++ b/console/services/app_config/mnt_service.py @@ -55,7 +55,8 @@ def get_service_mnt_details(self, tenant, service, volume_types, page=1, page_si }) return mounted_dependencies, total - def get_service_unmount_volume_list(self, tenant, service, service_ids, page, page_size, is_config, dep_app_group): + def get_service_unmount_volume_list(self, tenant, service, service_ids, page, page_size, is_config, dep_app_group, + config_name): """ 1. 获取租户下其他所有组件列表，方便后续进行名称的冗余 2. 获取其他组件的所有可共享的存储 @@ -98,7 +99,8 @@ def get_service_unmount_volume_list(self, tenant, service, service_ids, page, pa gs_rel = group_service_relation_repo.get_group_by_service_id(volume.service_id) group = group_repo.get_group_by_pk(tenant.tenant_id, service.service_region, gs_rel.group_id) group_name = group.group_name if group else '未分组' - if dep_app_group == "" or dep_app_group == group_name: + if (dep_app_group == "" or dep_app_group == group_name) and (config_name == "" or config_name in volume.volume_name + or config_name in volume.volume_path): un_mount_dependencies.append({ "dep_app_name": services.get(service_id=volume.service_id).service_cname, "dep_app_group": group_name, diff --git a/console/views/app_config/app_mnt.py b/console/views/app_config/app_mnt.py index aa56f3930..61e3fb710 100644 --- a/console/views/app_config/app_mnt.py +++ b/console/views/app_config/app_mnt.py @@ -57,6 +57,7 @@ def get(self, request, *args, **kwargs): dep_app_group = request.GET.get("dep_app_group", "") if dep_app_group == "undefined": dep_app_group = "" + config_name = request.GET.get("config_name", "") query_type = request.GET.get("type", "mnt") page = request.GET.get("page", 1) page_size = request.GET.get("page_size", 10) @@ -72,7 +73,7 @@ def get(self, request, *args, **kwargs): services = app_service.get_app_list(self.tenant.tenant_id, self.service.service_region, dep_app_name) services_ids = [s.service_id for s in services] mnt_list, total = mnt_service.get_service_unmount_volume_list(self.tenant, self.service, services_ids, page, - page_size, is_config, dep_app_group) + page_size, is_config, dep_app_group, config_name) else: return Response(general_message(400, "param error", "参数错误"), status=400) result = general_message(200, "success", "查询成功", list=mnt_list, total=total)