feat: 配置平台(CMDB) 相关插件支持 云区域:IP #7432 #7454
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 task
normal-wls
requested changes
Aug 15, 2024
| hosts = [] | ||
| c_hosts = [] | ||
| for host in host_list: | ||
| if {host["bk_host_innerip"]: host.get("bk_cloud_id", "")} in hosts: |
lTimej
force-pushed
the
release_3.32.2_by_master_7432
branch
from
11b160b
to
1d850f6
Compare
lTimej
force-pushed
the
release_3.32.2_by_master_7432
branch
from
18c3093
to
58349d4
Compare
normal-wls
requested changes
Aug 16, 2024
| :rtype: list | ||
| ["1", "2", "3", ...] | ||
| """ | ||
| ip_list = get_ip_by_regex(ip_str) |
There was a problem hiding this comment.
ip_list = ["0:1.1.1.1", "2.2.2.2"]
0:1:1.1.1.1 1:2:2.2.2.2
len(host_list) == len(ip_list)
| """ | ||
| ip_list = get_ip_by_regex(ip_str) | ||
| # 格式2 管控区域ID:IP | ||
| if plat_ip_reg.match(ip_str): |
| logger.error(message) | ||
| return {"result": False, "message": message} | ||
|
|
||
| return {"result": True, "data": [str(host["bk_host_id"]) for host in host_list]} |
There was a problem hiding this comment.
host_list 看上去会有冗余，这里不合理。假如1.1.1.1的机器有两台，那么这里我填了0:1.1.1.1之后，会得到两个 host_id
normal-wls
requested changes
Aug 16, 2024
| :rtype: list | ||
| ["1", "2", "3", ...] | ||
| """ | ||
| ip_list = get_ip_by_regex(ip_str) |
There was a problem hiding this comment.
ip_list = ["0:1.1.1.1", "2.2.2.2"]
0:1:1.1.1.1 1:2:2.2.2.2
len(host_list) == len(ip_list)
normal-wls
requested changes
Aug 21, 2024
| @@ -519,6 +562,23 @@ def get_host_topo(self, executor, biz_cc_id, supplier_account, host_attrs, ip_st | |||
| executor, biz_cc_id, supplier_account, host_attrs, ip_list=None, property_filters=property_filters | |||
| ) | |||
|
|
|||
| def get_host_list_by_cloud_id(self, executor, biz_cc_id, ip_str, supplier_account): | |||
There was a problem hiding this comment.
调整一下函数名：get_host_list_with_cloud_id
| :rtype: dict | ||
| """ | ||
| ip_dict = get_ip_or_cloudid_ip_by_regex(ip_list) | ||
| host_list = [] |
normal-wls
approved these changes
Aug 21, 2024
normal-wls
approved these changes
Aug 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.