From 28004da5170a2c47f803043c763f889ffc9792c8 Mon Sep 17 00:00:00 2001
From: Abhijeet Kasurde <akasurde@redhat.com>
Date: Mon, 10 Dec 2018 23:57:39 +0530
Subject: [PATCH] [Backport 2.6] VMware: update docs and return docs for
 vmware_host_service_facts

Follow up of 45155

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
(cherry picked from commit be21140384403219dd1dc834364c1d246a5ec2ab)
---
 ...vmware_host_service_facts-update_docs.yaml |  2 ++
 .../cloud/vmware/vmware_host_service_facts.py | 36 +++++++++++++++++--
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/fragments/45155-vmware_host_service_facts-update_docs.yaml

diff --git a/changelogs/fragments/45155-vmware_host_service_facts-update_docs.yaml b/changelogs/fragments/45155-vmware_host_service_facts-update_docs.yaml
new file mode 100644
index 00000000000..e247fab19d6
--- /dev/null
+++ b/changelogs/fragments/45155-vmware_host_service_facts-update_docs.yaml
@@ -0,0 +1,2 @@
+minor_changes:
+- Update docs and return section of vmware_host_service_facts module.
diff --git a/lib/ansible/modules/cloud/vmware/vmware_host_service_facts.py b/lib/ansible/modules/cloud/vmware/vmware_host_service_facts.py
index 07095b5c8cc..fe3bc47c567 100644
--- a/lib/ansible/modules/cloud/vmware/vmware_host_service_facts.py
+++ b/lib/ansible/modules/cloud/vmware/vmware_host_service_facts.py
@@ -24,6 +24,7 @@ author:
 - Abhijeet Kasurde (@Akasurde)
 notes:
 - Tested on vSphere 6.5
+- If source package name is not available then fact is populated as null.
 requirements:
 - python >= 2.6
 - PyVmomi
@@ -59,7 +60,36 @@ EXAMPLES = r'''
   register: host_services
 '''
 
-RETURN = r'''#
+RETURN = r'''
+host_service_facts:
+    description:
+    - dict with hostname as key and dict with host service config facts
+    returned: always
+    type: dict
+    sample: {
+        "10.76.33.226": [
+            {
+                "key": "DCUI",
+                "label": "Direct Console UI",
+                "policy": "on",
+                "required": false,
+                "running": true,
+                "uninstallable": false,
+                "source_package_name": "esx-base",
+                "source_package_desc": "This VIB contains all of the base functionality of vSphere ESXi."
+            },
+            {
+                "key": "TSM",
+                "label": "ESXi Shell",
+                "policy": "off",
+                "required": false,
+                "running": false,
+                "uninstallable": false,
+                "source_package_name": "esx-base",
+                "source_package_desc": "This VIB contains all of the base functionality of vSphere ESXi."
+            },
+        ]
+    }
 '''
 
 from ansible.module_utils.basic import AnsibleModule
@@ -89,8 +119,8 @@ class VmwareServiceManager(PyVmomi):
                             uninstallable=service.uninstallable,
                             running=service.running,
                             policy=service.policy,
-                            source_package_name=service.sourcePackage.sourcePackageName if service.sourcePackage else 'NA',
-                            source_package_desc=service.sourcePackage.description if service.sourcePackage else 'NA',
+                            source_package_name=service.sourcePackage.sourcePackageName if service.sourcePackage else None,
+                            source_package_desc=service.sourcePackage.description if service.sourcePackage else None,
                         )
                     )
             hosts_facts[host.name] = host_service_facts