feat: 配置平台(CMDB) 相关插件支持 云区域:IP #7432

Author: lTimej

pipeline_plugins/components/collections/sites/open/cc/base.py

@@ -121,10 +121,10 @@ def cc_get_host_id_by_innerip(executor, bk_biz_id, ip_list, supplier_account):
         hosts = []
         c_hosts = []
         for host in host_list:
-            if {host["bk_host_innerip"]: host["bk_cloud_id"]} in hosts:
+            if {host["bk_host_innerip"]: host.get("bk_cloud_id", "")} in hosts:
                 c_hosts.append(host["bk_host_innerip"])
             else:
-                hosts.append({host["bk_host_innerip"]: host["bk_cloud_id"]})
+                hosts.append({host["bk_host_innerip"]: host.get("bk_cloud_id", "")})
         if len(c_hosts) > 0:
             message = _(f"IP [{', '.join(c_hosts)}] 在本业务下重复: 请检查配置, 修复后重新执行 | cc_get_host_id_by_innerip")
             logger.error(message)

pipeline_plugins/tests/components/collections/sites/open/cc/base/test_cc_get_host_id_by_innerip.py

@@ -11,9 +11,8 @@
 specific language governing permissions and limitations under the License.
 """
 
-from mock import MagicMock, patch
-
 from django.test import TestCase
+from mock import MagicMock, patch
 
 from pipeline_plugins.components.collections.sites.open.cc.base import cc_get_host_id_by_innerip
 
@@ -33,7 +32,11 @@ def test__get_business_host_return_empty(self):
             data = cc_get_host_id_by_innerip(self.executor, self.bk_biz_id, self.ip_list, self.supplier_account)
 
         mock_cmdb.get_business_host.assert_called_once_with(
-            self.executor, self.bk_biz_id, self.supplier_account, ["bk_host_id", "bk_host_innerip"], self.ip_list
+            self.executor,
+            self.bk_biz_id,
+            self.supplier_account,
+            ["bk_host_id", "bk_host_innerip", "bk_cloud_id"],
+            self.ip_list,
         )
         self.assertFalse(data["result"])
         self.assertEqual(
@@ -55,7 +58,11 @@ def test__return_host_list_gt_ip_list(self):
             data = cc_get_host_id_by_innerip(self.executor, self.bk_biz_id, self.ip_list, self.supplier_account)
 
         mock_cmdb.get_business_host.assert_called_once_with(
-            self.executor, self.bk_biz_id, self.supplier_account, ["bk_host_id", "bk_host_innerip"], self.ip_list
+            self.executor,
+            self.bk_biz_id,
+            self.supplier_account,
+            ["bk_host_id", "bk_host_innerip", "bk_cloud_id"],
+            self.ip_list,
         )
         self.assertFalse(data["result"])
         self.assertEqual(data["message"], "IP [1.1.1.1, 2.2.2.2] 在本业务下重复: 请检查配置, 修复后重新执行 | cc_get_host_id_by_innerip")
@@ -69,7 +76,11 @@ def test__return_host_list_lt_ip_list(self):
             data = cc_get_host_id_by_innerip(self.executor, self.bk_biz_id, self.ip_list, self.supplier_account)
 
         mock_cmdb.get_business_host.assert_called_once_with(
-            self.executor, self.bk_biz_id, self.supplier_account, ["bk_host_id", "bk_host_innerip"], self.ip_list
+            self.executor,
+            self.bk_biz_id,
+            self.supplier_account,
+            ["bk_host_id", "bk_host_innerip", "bk_cloud_id"],
+            self.ip_list,
         )
         self.assertFalse(data["result"])
         self.assertEqual(data["message"], "IP [3.3.3.3] 在本业务下不存在: 请检查配置, 修复后重新执行 | cc_get_host_id_by_innerip")
@@ -87,7 +98,11 @@ def test__normal(self):
             data = cc_get_host_id_by_innerip(self.executor, self.bk_biz_id, self.ip_list, self.supplier_account)
 
         mock_cmdb.get_business_host.assert_called_once_with(
-            self.executor, self.bk_biz_id, self.supplier_account, ["bk_host_id", "bk_host_innerip"], self.ip_list
+            self.executor,
+            self.bk_biz_id,
+            self.supplier_account,
+            ["bk_host_id", "bk_host_innerip", "bk_cloud_id"],
+            self.ip_list,
         )
         self.assertTrue(data["result"])
         self.assertEqual(data["data"], ["1", "2", "3"])