From 3acf13aeffa9aa679fb31661a9a61e3d076bbaa6 Mon Sep 17 00:00:00 2001
From: homholueng <homholueng@gmail.com>
Date: Mon, 15 Apr 2019 16:55:43 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20JOB=20=E6=89=A7=E8=A1=8C=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E6=8F=92=E4=BB=B6=E4=B8=8D=E5=A1=AB=20IP=20=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=BD=BF=E7=94=A8=20JOB=20?=
 =?UTF-8?q?=E4=BE=A7=E9=85=8D=E7=BD=AE=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=20(#88)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feature: JOB 执行作业插件不填 IP 参数为空时使用 JOB 侧配置的默认值
* improvement: JOB 执行作业插件当从 CC 中获取不到任何用户传入的 IP 时直接报错
---
 .../components/collections/sites/open/job.py         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pipeline_plugins/components/collections/sites/open/job.py b/pipeline_plugins/components/collections/sites/open/job.py
index 2dbc2a6388..edb341c385 100644
--- a/pipeline_plugins/components/collections/sites/open/job.py
+++ b/pipeline_plugins/components/collections/sites/open/job.py
@@ -133,10 +133,14 @@ def execute(self, data, parent_data):
                     ip_str=_value['value'],
                     use_cache=False)
                 ip_list = [{'ip': _ip['InnerIP'], 'bk_cloud_id': _ip['Source']} for _ip in var_ip['ip_result']]
-                global_vars.append({
-                    'name': _value['name'],
-                    'ip_list': ip_list,
-                })
+                if _value['value'].strip() and not ip_list:
+                    data.outputs.ex_data = _(u"无法从配置平台(CMDB)查询到对应 IP，请确认输入的 IP 是否合法")
+                    return False
+                if ip_list:
+                    global_vars.append({
+                        'name': _value['name'],
+                        'ip_list': ip_list,
+                    })
             else:
                 global_vars.append({
                     'name': _value['name'],