From 9c1ba18607b662faea5ff88d2b324db008072c95 Mon Sep 17 00:00:00 2001
From: Abhijeet Kasurde <akasurde@redhat.com>
Date: Wed, 5 Sep 2018 10:35:13 +0530
Subject: [PATCH] VMware: Return Disk UUID information (#45157)

This fix adds feature of disk uuid for given virtual machine disk.

Fixes: #45149

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
---
 .../cloud/vmware/vmware_guest_disk_facts.py   | 11 +++++---
 .../vmware_guest_disk_facts/tasks/main.yml    | 27 ++++++++++++++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest_disk_facts.py b/lib/ansible/modules/cloud/vmware/vmware_guest_disk_facts.py
index b61c4b22a8..f77aa2590c 100644
--- a/lib/ansible/modules/cloud/vmware/vmware_guest_disk_facts.py
+++ b/lib/ansible/modules/cloud/vmware/vmware_guest_disk_facts.py
@@ -25,7 +25,8 @@ version_added: 2.6
 author:
     - Abhijeet Kasurde (@Akasurde) <akasurde@redhat.com>
 notes:
-    - Tested on vSphere 6.0 and 6.5
+    - Tested on vSphere 6.0 and 6.5.
+    - Disk UUID information is added in version 2.8.
 requirements:
     - "python >= 2.6"
     - PyVmomi
@@ -149,6 +150,7 @@ class PyVmomiHelper(PyVmomi):
                     backing_disk_mode=disk.backing.diskMode,
                     backing_writethrough=disk.backing.writeThrough,
                     backing_thinprovisioned=disk.backing.thinProvisioned,
+                    backing_uuid=disk.backing.uuid,
                     backing_eagerlyscrub=bool(disk.backing.eagerlyScrub),
                     controller_key=disk.controllerKey,
                     unit_number=disk.unitNumber,
@@ -167,8 +169,11 @@ def main():
         folder=dict(type='str'),
         datacenter=dict(type='str', required=True),
     )
-    module = AnsibleModule(argument_spec=argument_spec,
-                           required_one_of=[['name', 'uuid']])
+    module = AnsibleModule(
+        argument_spec=argument_spec,
+        required_one_of=[['name', 'uuid']],
+        supports_check_mode=True,
+    )
 
     if module.params['folder']:
         # FindByInventoryPath() does not require an absolute path
diff --git a/test/integration/targets/vmware_guest_disk_facts/tasks/main.yml b/test/integration/targets/vmware_guest_disk_facts/tasks/main.yml
index bec6b5f608..47217b7795 100644
--- a/test/integration/targets/vmware_guest_disk_facts/tasks/main.yml
+++ b/test/integration/targets/vmware_guest_disk_facts/tasks/main.yml
@@ -37,16 +37,37 @@
 
 - debug: var=vm1
 
-- name: create new VMs with non-existent network
+- name: Gather facts about virtual machine disks
   vmware_guest_disk_facts:
-    validate_certs: False
+    validate_certs: no
     hostname: "{{ vcsim }}"
     username: "{{ vcsim_instance['json']['username'] }}"
     password: "{{ vcsim_instance['json']['password'] }}"
     name: "{{ vm1 }}"
     datacenter: "{{ (vm1 | basename).split('_')[0] }}"
   register: disk_facts
-- debug: var=disk_facts
+
+- debug:
+    msg: '{{ disk_facts }}'
+
+- name: assert that no changes were made
+  assert:
+    that:
+        - "not disk_facts.changed"
+
+- name: Gather facts about virtual machine disks in check mode
+  vmware_guest_disk_facts:
+    validate_certs: no
+    hostname: "{{ vcsim }}"
+    username: "{{ vcsim_instance['json']['username'] }}"
+    password: "{{ vcsim_instance['json']['password'] }}"
+    name: "{{ vm1 }}"
+    datacenter: "{{ (vm1 | basename).split('_')[0] }}"
+  register: disk_facts
+  check_mode: yes
+
+- debug:
+    msg: '{{ disk_facts }}'
 
 - name: assert that no changes were made
   assert: