From ad49adc481b6ec1446453459308d0e9314374924 Mon Sep 17 00:00:00 2001 From: homholueng Date: Thu, 11 Apr 2019 11:19:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feature:=20JOB=20=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8F=92=E4=BB=B6=E4=B8=8D=E5=A1=AB=20IP=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=20JOB=20=E4=BE=A7=E9=85=8D=E7=BD=AE=E7=9A=84=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/collections/sites/open/job.py | 9 +++++---- 1 file changed, 5 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..449dad34a6 100644 --- a/pipeline_plugins/components/collections/sites/open/job.py +++ b/pipeline_plugins/components/collections/sites/open/job.py @@ -133,10 +133,11 @@ 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 ip_list: + global_vars.append({ + 'name': _value['name'], + 'ip_list': ip_list, + }) else: global_vars.append({ 'name': _value['name'], From 91997a00044ab797eb8c6bcba7de6d98c56318bb Mon Sep 17 00:00:00 2001 From: homholueng Date: Mon, 15 Apr 2019 15:08:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?improvement:=20=E4=BD=BF=E7=94=A8=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BC=A0=E5=85=A5=E7=9A=84=20IP=20=E8=80=8C=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=9A=84=20IP=20?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9D=A5=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BC=A0=E5=85=A5=20IP=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pipeline_plugins/components/collections/sites/open/job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline_plugins/components/collections/sites/open/job.py b/pipeline_plugins/components/collections/sites/open/job.py index 449dad34a6..bdb2b430a3 100644 --- a/pipeline_plugins/components/collections/sites/open/job.py +++ b/pipeline_plugins/components/collections/sites/open/job.py @@ -133,7 +133,7 @@ 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']] - if ip_list: + if _value['value']: global_vars.append({ 'name': _value['name'], 'ip_list': ip_list, From 888d919ca3ac1c8c9e4d4980be4f7d7fb7ee9e5c Mon Sep 17 00:00:00 2001 From: homholueng Date: Mon, 15 Apr 2019 15:19:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?improvement:=20JOB=20=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8F=92=E4=BB=B6=E5=BD=93=E4=BB=8E=20CC=20?= =?UTF-8?q?=E4=B8=AD=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E4=BB=BB=E4=BD=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BC=A0=E5=85=A5=E7=9A=84=20IP=20=E6=97=B6?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pipeline_plugins/components/collections/sites/open/job.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pipeline_plugins/components/collections/sites/open/job.py b/pipeline_plugins/components/collections/sites/open/job.py index bdb2b430a3..f5d2e221d5 100644 --- a/pipeline_plugins/components/collections/sites/open/job.py +++ b/pipeline_plugins/components/collections/sites/open/job.py @@ -133,7 +133,10 @@ 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']] - if _value['value']: + if _value['value'].strip() and not ip_list: + data.outputs.ex_data = _(u"无法从 CC 查询到对应 IP，请确认输入的 IP 是否合法") + return False + if ip_list: global_vars.append({ 'name': _value['name'], 'ip_list': ip_list, From a0be56ea112eacd1ad0e469cc60c317d45fdb2bd Mon Sep 17 00:00:00 2001 From: homholueng Date: Mon, 15 Apr 2019 16:38:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?minor:=20=E5=BC=82=E5=B8=B8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pipeline_plugins/components/collections/sites/open/job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline_plugins/components/collections/sites/open/job.py b/pipeline_plugins/components/collections/sites/open/job.py index f5d2e221d5..edb341c385 100644 --- a/pipeline_plugins/components/collections/sites/open/job.py +++ b/pipeline_plugins/components/collections/sites/open/job.py @@ -134,7 +134,7 @@ def execute(self, data, parent_data): use_cache=False) ip_list = [{'ip': _ip['InnerIP'], 'bk_cloud_id': _ip['Source']} for _ip in var_ip['ip_result']] if _value['value'].strip() and not ip_list: - data.outputs.ex_data = _(u"无法从 CC 查询到对应 IP，请确认输入的 IP 是否合法") + data.outputs.ex_data = _(u"无法从配置平台(CMDB)查询到对应 IP，请确认输入的 IP 是否合法") return False if ip_list: global_vars.append({