From bb1a94124010d66e39a50523b76b592e28e0053d Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Fri, 21 Jun 2019 11:19:53 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=8F=AF=E8=BF=9E=E6=8E=A5=E6=80=A7=E6=97=B6=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=20(#2825)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/tasks.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py
index 81fbf5880..149e9fa2c 100644
--- a/apps/assets/tasks.py
+++ b/apps/assets/tasks.py
@@ -209,9 +209,13 @@ def test_asset_connectivity_util(assets, task_name=None):
         )
         result = task.run()
         summary = result[1]
-        results_summary['success'] &= summary['success']
-        results_summary['contacted'].update(summary['contacted'])
-        results_summary['dark'].update(summary['dark'])
+        success = summary.get('success', False)
+        contacted = summary.get('contacted', {})
+        dark = summary.get('dark', {})
+
+        results_summary['success'] &= success
+        results_summary['contacted'].update(contacted)
+        results_summary['dark'].update(dark)
 
     for asset in assets:
         if asset.hostname in results_summary.get('dark', {}):
@@ -330,14 +334,17 @@ def test_system_user_connectivity_util(system_user, assets, task_name):
         task, created = update_or_create_ansible_task(
             task_name=task_name, hosts=value['hosts'], tasks=value['tasks'],
             pattern='all', options=const.TASK_OPTIONS,
-            run_as=system_user.username,
-            created_by=system_user.org_id,
+            run_as=system_user.username, created_by=system_user.org_id,
         )
         result = task.run()
         summary = result[1]
-        results_summary['success'] &= summary['success']
-        results_summary['contacted'].update(summary['contacted'])
-        results_summary['dark'].update(summary['dark'])
+        success = summary.get('success', False)
+        contacted = summary.get('contacted', {})
+        dark = summary.get('dark', {})
+
+        results_summary['success'] &= success
+        results_summary['contacted'].update(contacted)
+        results_summary['dark'].update(dark)
 
     set_system_user_connectivity_info(system_user, results_summary)
     return results_summary