From b04940d2567fa5c4779e3bb6073f7388e619bcd9 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Sat, 16 Nov 2019 21:34:13 +0530 Subject: [PATCH] =?UTF-8?q?VMware:=20Re-introduce=20backing=5Fdisk=5Fmode?= =?UTF-8?q?=20in=20vmware=5Fguest=5Fdisk=5Fin=E2=80=A6=20(#63244)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This info about backing_disk_mode was renamed to backing_diskmode, to keep backward compatability re-introducing backing_disk_mode along with backing_diskmode info. Signed-off-by: Abhijeet Kasurde --- changelogs/fragments/vmware_guest_disk_info_disk_mode.yml | 2 ++ lib/ansible/modules/cloud/vmware/vmware_guest_disk_info.py | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 changelogs/fragments/vmware_guest_disk_info_disk_mode.yml diff --git a/changelogs/fragments/vmware_guest_disk_info_disk_mode.yml b/changelogs/fragments/vmware_guest_disk_info_disk_mode.yml new file mode 100644 index 00000000000..9deefa26ce2 --- /dev/null +++ b/changelogs/fragments/vmware_guest_disk_info_disk_mode.yml @@ -0,0 +1,2 @@ +minor_changes: + - Added missing backing_disk_mode information about disk which was removed by mistake in vmware_guest_disk_info. diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest_disk_info.py b/lib/ansible/modules/cloud/vmware/vmware_guest_disk_info.py index cacc30d545e..da495a2d872 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_guest_disk_info.py +++ b/lib/ansible/modules/cloud/vmware/vmware_guest_disk_info.py @@ -121,6 +121,7 @@ guest_disk_info: "0": { "backing_datastore": "datastore2", "backing_disk_mode": "persistent", + "backing_diskmode": "persistent", "backing_eagerlyscrub": false, "backing_filename": "[datastore2] VM_225/VM_225.vmdk", "backing_thinprovisioned": false, @@ -141,6 +142,7 @@ guest_disk_info: "backing_datastore": "datastore3", "backing_devicename": "vml.012345678901234567890123456789012345678901234567890123", "backing_disk_mode": "independent_persistent", + "backing_diskmode": "independent_persistent", "backing_filename": "[datastore3] VM_226/VM_226.vmdk", "backing_lunuuid": "012345678901234567890123456789012345678901234567890123", "backing_type": "RawDiskMappingVer1", @@ -244,6 +246,7 @@ class PyVmomiHelper(PyVmomi): disks_info[disk_index]['backing_type'] = 'RawDiskMappingVer1' disks_info[disk_index]['backing_devicename'] = disk.backing.deviceName disks_info[disk_index]['backing_diskmode'] = disk.backing.diskMode + disks_info[disk_index]['backing_disk_mode'] = disk.backing.diskMode disks_info[disk_index]['backing_lunuuid'] = disk.backing.lunUuid disks_info[disk_index]['backing_uuid'] = disk.backing.uuid @@ -255,12 +258,14 @@ class PyVmomiHelper(PyVmomi): elif isinstance(disk.backing, vim.vm.device.VirtualDisk.SeSparseBackingInfo): disks_info[disk_index]['backing_type'] = 'SeSparse' disks_info[disk_index]['backing_diskmode'] = disk.backing.diskMode + disks_info[disk_index]['backing_disk_mode'] = disk.backing.diskMode disks_info[disk_index]['backing_writethrough'] = bool(disk.backing.writeThrough) disks_info[disk_index]['backing_uuid'] = disk.backing.uuid elif isinstance(disk.backing, vim.vm.device.VirtualDisk.SparseVer1BackingInfo): disks_info[disk_index]['backing_type'] = 'SparseVer1' disks_info[disk_index]['backing_diskmode'] = disk.backing.diskMode + disks_info[disk_index]['backing_disk_mode'] = disk.backing.diskMode disks_info[disk_index]['backing_spaceusedinkb'] = disk.backing.spaceUsedInKB disks_info[disk_index]['backing_split'] = bool(disk.backing.split) disks_info[disk_index]['backing_writethrough'] = bool(disk.backing.writeThrough) @@ -268,6 +273,7 @@ class PyVmomiHelper(PyVmomi): elif isinstance(disk.backing, vim.vm.device.VirtualDisk.SparseVer2BackingInfo): disks_info[disk_index]['backing_type'] = 'SparseVer2' disks_info[disk_index]['backing_diskmode'] = disk.backing.diskMode + disks_info[disk_index]['backing_disk_mode'] = disk.backing.diskMode disks_info[disk_index]['backing_spaceusedinkb'] = disk.backing.spaceUsedInKB disks_info[disk_index]['backing_split'] = bool(disk.backing.split) disks_info[disk_index]['backing_writethrough'] = bool(disk.backing.writeThrough)