Skip to content

Commit 9be5c9e

Browse files
iSecloudiSecloud
committed
refactor(backend): esb 切换 apigw #10100
# Reviewed, transaction id: 40185
1 parent 967bd17 commit 9be5c9e

File tree

8 files changed

+62
-69
lines changed

8 files changed

+62
-69
lines changed

‎dbm-ui/backend/components/cc/client.py

+49-49
Original file line numberDiff line numberDiff line change
@@ -28,185 +28,185 @@ class ErrorCode:
2828
def __init__(self):
2929
self.list_hosts_without_biz = self.generate_data_api(
3030
method="POST",
31-
url="list_hosts_without_biz/",
31+
url="/hosts/list_hosts_without_app",
3232
description=_("没有业务信息的主机查询"),
3333
)
3434
self.search_business = self.generate_data_api(
35-
method="POST", url="search_business/", description=_("查询业务"), cache_time=900
35+
method="POST", url="/biz/search/bk_supplier_account", description=_("查询业务"), cache_time=900
3636
)
3737
self.search_module = self.generate_data_api(
3838
method="POST",
39-
url="search_module/",
39+
url="/module/search/bk_supplier_account/{bk_biz_id}/{bk_set_id}",
4040
description=_("查询模块"),
4141
)
4242
self.create_set = self.generate_data_api(
4343
method="POST",
44-
url="create_set/",
44+
url="/set/{bk_biz_id}",
4545
description=_("创建集群"),
4646
)
4747
self.search_set = self.generate_data_api(
4848
method="POST",
49-
url="search_set/",
49+
url="/set/search/bk_supplier_account/{bk_biz_id}",
5050
description=_("查询集群"),
5151
)
5252
self.create_module = self.generate_data_api(
5353
method="POST",
54-
url="create_module/",
54+
url="/module/{bk_biz_id}/{bk_set_id}/",
5555
description=_("创建模块"),
5656
)
5757
self.delete_module = self.generate_data_api(
58-
method="POST",
59-
url="delete_module/",
58+
method="DELETE",
59+
url="/module/{bk_biz_id}/{bk_set_id}/{bk_module_id}",
6060
description=_("删除模块"),
6161
)
6262
self.transfer_host_across_biz = self.generate_data_api(
6363
method="POST",
64-
url="transfer_host_across_biz/",
64+
url="/hosts/modules/across/biz",
6565
description=_("跨业务转移主机"),
6666
)
6767
self.transfer_host_module = self.generate_data_api(
6868
method="POST",
69-
url="transfer_host_module/",
69+
url="/hosts/modules/",
7070
description=_("业务内主机转移模块"),
7171
)
72-
self.update_business = self.generate_data_api(method="POST", url="update_business/", description=_("修改业务"))
73-
self.update_host = self.generate_data_api(method="POST", url="update_host/", description=_("修改主机"))
72+
self.update_business = self.generate_data_api(
73+
method="PUT", url="/biz/bk_supplier_account/{bk_biz_id}", description=_("修改业务")
74+
)
75+
self.update_host = self.generate_data_api(method="PUT", url="/hosts/batch", description=_("修改主机"))
7476
self.batch_update_host = self.generate_data_api(
75-
method="POST", url="batch_update_host/", description=_("批量修改主机")
77+
method="PUT", url="/hosts/property/batch", description=_("批量修改主机")
7678
)
7779
self.create_biz_custom_field = self.generate_data_api(
7880
method="POST",
79-
url="create_biz_custom_field/",
81+
url="/create/objectattr/biz/{bk_biz_id}",
8082
description=_("创建自定义字段"),
8183
)
8284
self.search_object_attribute = self.generate_data_api(
83-
method="POST", url="search_object_attribute/", description=_("获取模型属性"), cache_time=60
85+
method="POST", url="/find/objectattr", description=_("获取模型属性"), cache_time=60
8486
)
8587
self.create_object_attribute = self.generate_data_api(
8688
method="POST",
87-
url="create_object_attribute/",
89+
url="/create/objectattr",
8890
description=_("创建模型属性"),
8991
)
9092
self.transfer_host_to_idlemodule = self.generate_data_api(
9193
method="POST",
92-
url="transfer_host_to_idlemodule/",
94+
url="/hosts/modules/idle",
9395
description=_("主机移动到空闲机模块"),
9496
)
9597
self.transfer_host_to_recyclemodule = self.generate_data_api(
9698
method="POST",
97-
url="transfer_host_to_recyclemodule/",
99+
url="/hosts/modules/recycle",
98100
description=_("主机移动到待回收模块"),
99101
)
100102
self.search_biz_inst_topo = self.generate_data_api(
101-
method="GET", url="search_biz_inst_topo/", description=_("查询业务实例拓扑"), cache_time=60
103+
method="POST", url="/find/topoinst/biz/{bk_biz_id}", description=_("查询业务实例拓扑"), cache_time=60
102104
)
103105
self.list_biz_hosts = self.generate_data_api(
104106
method="POST",
105-
url="list_biz_hosts/",
107+
url="/hosts/app/{bk_biz_id}/list_hosts",
106108
description=_("查询业务下的主机"),
107109
)
108110
self.list_biz_hosts_topo = self.generate_data_api(
109111
method="POST",
110-
url="list_biz_hosts_topo/",
112+
url="/hosts/app/{bk_biz_id}/list_hosts_topo",
111113
description=_("查询业务下的主机和拓扑信息"),
112114
)
113115
self.get_biz_internal_module = self.generate_data_api(
114-
method="GET", url="get_biz_internal_module/", description=_("查询业务的空闲机/故障机/待回收模块"), cache_time=60 * 60
116+
method="GET",
117+
url="/topo/internal/bk_supplier_account/{bk_biz_id}",
118+
description=_("查询业务的空闲机/故障机/待回收模块"),
119+
cache_time=60 * 60,
115120
)
116121
self.find_host_topo_relation = self.generate_data_api(
117122
method="POST",
118-
url="find_host_topo_relation/",
123+
url="/host/topo/relation/read",
119124
description=_("获取主机与拓扑的关系"),
120125
)
121126
self.search_cloud_area = self.generate_data_api(
122127
method="POST",
123-
url="search_cloud_area/",
128+
url="/findmany/cloudarea",
124129
cache_time=60,
125130
description=_("查询云区域"),
126131
)
127132
self.list_host_total_mainline_topo = self.generate_data_api(
128133
method="POST",
129-
url="list_host_total_mainline_topo/",
134+
url="/findmany/hosts/total_mainline_topo/biz/{bk_biz_id}",
130135
description=_("查询主机及其对应拓扑"),
131136
)
132137
self.create_service_instance = self.generate_data_api(
133138
method="POST",
134-
url="create_service_instance/",
139+
url="/create/proc/service_instance",
135140
description=_("创建服务实例"),
136141
)
137142
self.list_service_instance = self.generate_data_api(
138143
method="POST",
139-
url="list_service_instance/",
144+
url="/findmany/proc/service_instance",
140145
description=_("查询服务实例详细信息"),
141146
)
142147
self.list_service_instance_by_host = self.generate_data_api(
143148
method="POST",
144-
url="list_service_instance_by_host/",
149+
url="/findmany/proc/service_instance/with_host",
145150
description=_("直接通过bk_host_id查询服务实例详细信息"),
146151
)
147152
self.list_service_instance_detail = self.generate_data_api(
148153
method="POST",
149-
url="list_service_instance_detail/",
154+
url="/findmany/proc/service_instance/details",
150155
description=_("获取服务实例详细信息"),
151156
)
152157
self.add_label_for_service_instance = self.generate_data_api(
153158
method="POST",
154-
url="add_label_for_service_instance/",
159+
url="/createmany/proc/service_instance/labels",
155160
description=_("服务实例添加标签"),
156161
)
157162
self.remove_label_from_service_instance = self.generate_data_api(
158-
method="POST",
159-
url="remove_label_from_service_instance/",
163+
method="DELETE",
164+
url="/deletemany/proc/service_instance/labels",
160165
description=_("从服务实例移除标签"),
161166
)
162167
self.delete_service_instance = self.generate_data_api(
163-
method="POST",
164-
url="delete_service_instance/",
168+
method="DELETE",
169+
url="/deletemany/proc/service_instance",
165170
description=_("删除服务实例"),
166171
)
167172
self.create_process_instance = self.generate_data_api(
168173
method="POST",
169-
url="create_process_instance/",
174+
url="/create/proc/process_instance",
170175
description=_("创建实例进程"),
171176
)
172177
self.delete_process_instance = self.generate_data_api(
173-
method="POST",
174-
url="delete_process_instance/",
178+
method="DELETE",
179+
url="/delete/proc/process_instance",
175180
description=_("删除实例进程"),
176181
)
177182
self.list_process_instance = self.generate_data_api(
178183
method="POST",
179-
url="list_process_instance/",
184+
url="/findmany/proc/process_instance",
180185
description=_("查询实例进程列表"),
181186
)
182187
self.update_process_instance = self.generate_data_api(
183188
method="POST",
184-
url="update_process_instance/",
189+
url="/update/proc/process_instance",
185190
description=_("更新实例进程"),
186191
)
187-
self.delete_module = self.generate_data_api(
188-
method="POST",
189-
url="delete_module/",
190-
description=_("删除模块"),
191-
)
192192
self.find_module_with_relation = self.generate_data_api(
193-
method="POST",
194-
url="find_module_with_relation/",
193+
method="PUT",
194+
url="/update/proc/process_instance",
195195
description=_("根据条件查询业务下的模块"),
196196
)
197197
self.find_module_host_relation = self.generate_data_api(
198198
method="POST",
199-
url="find_module_host_relation/",
199+
url="/findmany/module/with_relation/biz/{bk_biz_id}",
200200
description=_("根据模块ID查询主机和模块的关系"),
201201
)
202202
self.find_host_biz_relations = self.generate_data_api(
203203
method="POST",
204-
url="find_host_biz_relations/",
204+
url="/hosts/modules/read",
205205
description=_("查询主机业务关系信息"),
206206
)
207207
self.find_module_batch = self.generate_data_api(
208208
method="POST",
209-
url="find_module_batch/",
209+
url="/findmany/module/bk_biz_id/{bk_biz_id}",
210210
description=_("批量查询某业务的模块详情"),
211211
)
212212

‎dbm-ui/backend/components/gse/client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class _GseApi(BaseApi):
2020
BASE = GSE_APIGW_DOMAIN
2121

2222
class Constants:
23-
GSE_AGENT_RUNNING_CODE = 2
23+
GSE_AGENT_RUNNING_CODE = 1
2424

2525
def __init__(self):
2626
self.get_agent_status = self.generate_data_api(

‎dbm-ui/backend/components/itsm/client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(self):
2626
description=_("创建单据"),
2727
)
2828
self.get_ticket_status = self.generate_data_api(
29-
method="POST",
29+
method="GET",
3030
url="get_ticket_status/",
3131
description=_("单据状态查询"),
3232
)

‎dbm-ui/backend/db_meta/models/cluster_monitor.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,8 @@ def init_topo(cls):
253253
res = CCApi.create_set(
254254
params={
255255
"bk_biz_id": env.DBA_APP_BK_BIZ_ID,
256-
"data": {
257-
"bk_parent_id": env.DBA_APP_BK_BIZ_ID,
258-
"bk_set_name": bk_set_name,
259-
},
256+
"bk_parent_id": env.DBA_APP_BK_BIZ_ID,
257+
"bk_set_name": bk_set_name,
260258
}
261259
)
262260
bk_set_id = res["bk_set_id"]

‎dbm-ui/backend/db_periodic_task/local_tasks/db_meta/update_app_cache.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ def update_app_cache():
4242
if env.BK_APP_ABBR and env.BK_APP_ABBR != CC_APP_ABBR_ATTR:
4343
# db_app_abbr为空才同步
4444
if not db_app_abbr and db_app_abbr != bk_app_abbr:
45-
CCApi.update_business(
46-
{"bk_biz_id": biz["bk_biz_id"], "data": {"db_app_abbr": bk_app_abbr}}, use_admin=True
47-
)
45+
CCApi.update_business({"bk_biz_id": biz["bk_biz_id"], "db_app_abbr": bk_app_abbr}, use_admin=True)
4846
db_app_abbr = bk_app_abbr
4947

5048
# update or create fields
@@ -105,9 +103,7 @@ def get_app_abbr(biz):
105103
# db_app_abbr 为空才同步，bk_app_abbr 只在create时插入，更新后，不能随便同步回来
106104
if not db_app_abbr and db_app_abbr != bk_app_abbr and REGEX_APP_ABBR.match(bk_app_abbr):
107105
logger.warning("bulk_update_app_cache: set [%s]'s bk_app_abbr to [%s]", biz["bk_biz_id"], bk_app_abbr)
108-
CCApi.update_business(
109-
{"bk_biz_id": biz["bk_biz_id"], "data": {"db_app_abbr": bk_app_abbr}}, use_admin=True
110-
)
106+
CCApi.update_business({"bk_biz_id": biz["bk_biz_id"], "db_app_abbr": bk_app_abbr}, use_admin=True)
111107
db_app_abbr = bk_app_abbr
112108

113109
return db_app_abbr

‎dbm-ui/backend/db_services/cmdb/biz.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def set_db_app_abbr(bk_biz_id: int, db_app_abbr: str):
108108
use_admin=True,
109109
)["info"][0].get(CC_APP_ABBR_ATTR, "")
110110
if not abbr:
111-
CCApi.update_business({"bk_biz_id": bk_biz_id, "data": {CC_APP_ABBR_ATTR: db_app_abbr}}, use_admin=True)
111+
CCApi.update_business({"bk_biz_id": bk_biz_id, CC_APP_ABBR_ATTR: db_app_abbr}, use_admin=True)
112112
AppCache.objects.update_or_create(defaults={"db_app_abbr": db_app_abbr}, bk_biz_id=bk_biz_id)
113113
return
114114
logger.warning(BkAppAttrAlreadyExistException().message)
@@ -171,7 +171,8 @@ def get_or_create_cmdb_module_with_name(bk_biz_id: int, bk_set_id: int, bk_modul
171171
{
172172
"bk_biz_id": bk_biz_id,
173173
"bk_set_id": bk_set_id,
174-
"data": {"bk_parent_id": bk_set_id, "bk_module_name": bk_module_name},
174+
"bk_parent_id": bk_set_id,
175+
"bk_module_name": bk_module_name,
175176
},
176177
use_admin=True,
177178
)
@@ -210,10 +211,8 @@ def get_or_create_set_with_name(bk_biz_id: int, bk_set_name: str) -> int:
210211
res = CCApi.create_set(
211212
params={
212213
"bk_biz_id": bk_biz_id,
213-
"data": {
214-
"bk_parent_id": bk_biz_id,
215-
"bk_set_name": bk_set_name,
216-
},
214+
"bk_parent_id": bk_biz_id,
215+
"bk_set_name": bk_set_name,
217216
},
218217
use_admin=True,
219218
)

‎dbm-ui/backend/flow/utils/cc_manage.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def update_host_properties(
236236
for fail_update in failed_updates:
237237
for key, value in fail_update["properties"].items():
238238
try:
239-
CCApi.update_host({"bk_host_id": fail_update["bk_host_id"], "data": {key: value}}, use_admin=True)
239+
CCApi.update_host({"bk_host_id": fail_update["bk_host_id"], key: value}, use_admin=True)
240240
except Exception as e: # pylint: disable=wildcard-import
241241
logger.error("[update_host_dbmeta] single update error: %s:%s (%s)", key, value, e)
242242

‎helm-charts/bk-dbm/templates/configmaps/dbm-configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ data:
4545
LOGIN_URL: "{{ .Values.bk.bkLoginUrl }}"
4646
# 蓝鲸配置平台
4747
BK_CMDB_URL: "{{ .Values.bk.bkCmdbUrl }}"
48-
CC_APIGW_DOMAIN: "{{ .Values.bk.bkCmdbUrl }}"
48+
CC_APIGW_DOMAIN: "{{ .Values.bk.bkCmdbApiUrl }}"
4949
# 蓝鲸作业平台
5050
BK_JOB_URL: "{{ .Values.bk.bkJobUrl }}"
5151
JOB_APIGW_DOMAIN: "{{ .Values.bk.bkJobApiUrl }}"

0 commit comments

Comments
 (0)