From 8a87f316df4e79039fa4262dd22c11aaa090ad74 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 19 Jun 2019 19:29:12 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=85=BC=E5=AE=B9=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84protocols=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/serializers/asset.py | 4 ++++ apps/assets/tasks.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py index 2ef970b23..c66004ba0 100644 --- a/apps/assets/serializers/asset.py +++ b/apps/assets/serializers/asset.py @@ -27,6 +27,10 @@ class ProtocolsRelatedField(serializers.RelatedField): return str(value) def to_internal_value(self, data): + print(data) + print(type(data)) + if isinstance(data, dict): + return data if '/' not in data: raise ValidationError("protocol not contain /: {}".format(data)) v = data.split("/") diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py index fff623413..81fbf5880 100644 --- a/apps/assets/tasks.py +++ b/apps/assets/tasks.py @@ -199,7 +199,7 @@ def test_asset_connectivity_util(assets, task_name=None): contacted=defaultdict(dict), dark=defaultdict(dict), success=True ) created_by = assets[0].org_id - for _, value in hosts_category.items(): + for k, value in hosts_category.items(): if not value['hosts']: continue task, created = update_or_create_ansible_task( @@ -324,7 +324,7 @@ def test_system_user_connectivity_util(system_user, assets, task_name): results_summary = dict( contacted=defaultdict(dict), dark=defaultdict(dict), success=True ) - for _, value in hosts_category.items(): + for k, value in hosts_category.items(): if not value['hosts']: continue task, created = update_or_create_ansible_task(