feat: agent安装配置中的zone_id和city_id从cc获取 (closed #2387)

apps/backend/subscription/steps/agent_adapter/config_context/context_helper.py

@@ -99,8 +99,8 @@ def __post_init__(self):
                     self.host.node_type == constants.NodeType.PROXY
                 ],
                 cloud_id=self.host.bk_cloud_id,
-                zone_id=self.ap.region_id,
-                city_id=self.ap.city_id,
+                zone_id=str(self.host.bk_idc_area_id or self.ap.region_id),
+                city_id=self.host.idc_city_id or self.ap.city_id,
                 # 管控区域为0, 且使用到Proxy场景的Agent需要设置为true
                 # 暂时不考虑当直连区域的安装通道机器并不是 Proxy 的场景
                 enable_static_access=["false", "true"][

apps/backend/subscription/steps/agent_adapter/legacy.py

@@ -468,6 +468,7 @@ def generate_gse_config(
     :param ap: 接入点对象
     :param proxies: Proxy 主机列表
     :param install_channel: 安装通道
+    :param target_version: 目标版本
     :return:
     """
     agent_config = ap.get_agent_config(host.os_type)
@@ -607,8 +608,8 @@ def generate_gse_config(
             "inner_ip": host.inner_ip,
             "outer_ip": host.outer_ip,
             "proxy_servers": [host.inner_ip],
-            "region_id": ap.region_id,
-            "city_id": ap.city_id,
+            "region_id": str(host.bk_idc_area_id or ap.region_id),
+            "city_id": host.idc_city_id or ap.city_id,
             "dataipc": dataipc,
             "peer_exchange_switch_for_agent": host.extra_data.get("peer_exchange_switch_for_agent", 0),
             "bt_speed_limit": host.extra_data.get("bt_speed_limit"),

apps/backend/tests/subscription/agent_adapter/test_adapter.py

@@ -190,3 +190,25 @@ def test_get_config__extra_env(self):
         config: str = self.get_config(self.agent_step_adapter.get_main_config_filename())
         self.assertTrue('"bind_ip": "::"' in config)
         self.assertTrue('"enable_compression": false' in config)
+
+
+class Agent2GenerateConfigTestCase(Agent2StepAdapterTestCase):
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+
+    def test_get_config(self):
+        # 使用主机的区域ID和城市ID
+        self.host = models.Host.objects.get(bk_host_id=common_unit.host.DEFAULT_HOST_ID)
+        self.host.bk_idc_area_id = common_unit.host.DEFAULT_HOST_ID
+        self.host.idc_city_id = str(common_unit.host.DEFAULT_HOST_ID)
+        config: str = self.get_config(self.agent_step_adapter.get_main_config_filename())
+        self.assertTrue('"zone_id": "1"' in config)
+        self.assertTrue('"city_id": "1"' in config)
+
+        # 使用接入点的区域ID和城市ID
+        self.host.bk_idc_area_id = None
+        self.host.idc_city_id = ""
+        config: str = self.get_config(self.agent_step_adapter.get_main_config_filename())
+        self.assertTrue('"zone_id": "test"' in config)
+        self.assertTrue('"city_id": "test"' in config)

apps/node_man/constants.py

@@ -696,6 +696,8 @@ class BkappRunEnvType(Enum):
     "bk_supplier_account",
     "bk_cpu_architecture",
     "dept_name",
+    "bk_idc_area_id",
+    "idc_city_id",
 ]
 
 # 限流窗口配置，用于控制CMDB订阅触发的变更频率

apps/node_man/migrations/0084_auto_20240930_1658.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+"""
+TencentBlueKing is pleased to support the open source community by making 蓝鲸智云-节点管理(BlueKing-BK-NODEMAN) available.
+Copyright (C) 2017-2022 THL A29 Limited, a Tencent company. All rights reserved.
+Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
+You may obtain a copy of the License at https://opensource.org/licenses/MIT
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+"""
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('node_man', '0083_subscription_operate_info'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='host',
+            name='bk_idc_area_id',
+            field=models.IntegerField(db_index=True, null=True, verbose_name='区域ID'),
+        ),
+        migrations.AddField(
+            model_name='host',
+            name='idc_city_id',
+            field=models.CharField(blank=True, db_index=True, default='', max_length=16, null=True, verbose_name='城市ID'),
+        ),
+    ]

apps/node_man/models.py

@@ -271,6 +271,8 @@ class Host(models.Model):
     created_at = models.DateTimeField(_("创建时间"), auto_now_add=True, db_index=True)
     updated_at = models.DateTimeField(_("更新时间"), null=True, auto_now=False, db_index=True)
     dept_name = models.CharField(_("运维部门"), max_length=128, db_index=True, blank=True, null=True, default="")
+    bk_idc_area_id = models.IntegerField(_("区域ID"), null=True, db_index=True)
+    idc_city_id = models.CharField(_("城市ID"), max_length=16, db_index=True, blank=True, null=True, default="")
 
     extra_data = JSONField(_("额外数据"), blank=True, null=True)
 

apps/node_man/periodic_tasks/sync_cmdb_host.py

@@ -177,6 +177,8 @@ def _generate_host(biz_id, host, ap_id, is_os_type_priority=False, is_sync_cmdb_
         else constants.NodeType.PAGENT,
         ap_id=ap_id,
         dept_name=host.get("dept_name", ""),
+        bk_idc_area_id=host.get("bk_idc_area_id"),
+        idc_city_id=host.get("idc_city_id", ""),
     )
 
     identify_data = models.IdentityData(
@@ -279,6 +281,8 @@ def update_or_create_host_base(biz_id, ap_map_config, is_gse2_gray, task_id, cmd
             "inner_ipv6": (host.get("bk_host_innerip_v6") or "").split(",")[0],
             "outer_ipv6": (host.get("bk_host_outerip_v6") or "").split(",")[0],
             "dept_name": host.get("dept_name", ""),
+            "bk_idc_area_id": host.get("bk_idc_area_id"),
+            "idc_city_id": host.get("idc_city_id", ""),
         }
         outer_ip = host.get("bk_host_outerip") or ""
         outer_ip_list = outer_ip.split(",")

apps/node_man/tests/test_pericdic_tasks/test_sync_cmdb_host.py

@@ -9,6 +9,7 @@
 specific language governing permissions and limitations under the License.
 """
 import copy
+import random
 from unittest.mock import patch
 
 from apps.backend.views import LPUSH_AND_EXPIRE_FUNC
@@ -178,3 +179,28 @@ def test_transfer_module_proxy(self):
         clear_need_delete_host_ids_task()
         # 验证转移业务/模块的proxy主未被删除
         self.assertEqual(Host.objects.filter(bk_host_id=100, node_type=constants.NodeType.PROXY).count(), 1)
+
+
+class TestSyncCMDBAreaIdAndCityId(CustomBaseTestCase):
+    @staticmethod
+    def list_biz_hosts(*args, **kwargs):
+        return_value = MockClient.cc.list_resource_pool_hosts(*args, **kwargs)
+        host_info = return_value["info"]
+        for host in host_info:
+            host["bk_idc_area_id"] = random.randint(1, 3)
+            host["idc_city_id"] = str(random.randint(20, 30))
+        return return_value
+
+    def start_patch(self):
+        MockClient.cc.list_biz_hosts = self.list_biz_hosts
+
+    @patch("apps.node_man.periodic_tasks.sync_cmdb_host.client_v2", MockClient)
+    def test_sync_area_id_and_city_id(self):
+        self.start_patch()
+        sync_cmdb_host_periodic_task(bk_biz_id=2)
+        hosts = Host.objects.values("bk_idc_area_id", "idc_city_id")
+        bk_idc_area_ids = list(range(1, 4))
+        idc_city_ids = [str(idc_city_id) for idc_city_id in range(20, 31)]
+        for host in hosts:
+            self.assertIn(host["bk_idc_area_id"], bk_idc_area_ids)
+            self.assertIn(host["idc_city_id"], idc_city_ids)