cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

VMware: return info about SCSI controller in vmware_guest_disk_facts (#56442)

Browse source 
vmware_guest_disk_facts module added bus number of the SCSI controller to the output
This commit is contained in:
spidermila 2019-05-16 06:57:17 +02:00 committed by Abhijeet Kasurde
parent 7636f36a8a
commit ca7ff2ad05
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/56442-spidermila-vmware_guest_disk_facts-scsi-controller-bus-number.yaml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- vmware_guest_disk_facts module - added bus number of the SCSI controller to the output (https://github.com/ansible/ansible/pull/56442)

18
lib/ansible/modules/cloud/vmware/vmware_guest_disk_facts.py
View file

@ -112,6 +112,7 @@ guest_disk_facts:
"backing_uuid": "200C3A00-f82a-97af-02ff-62a595f0020a", "backing_uuid": "200C3A00-f82a-97af-02ff-62a595f0020a",
"capacity_in_bytes": 10485760, "capacity_in_bytes": 10485760,
"capacity_in_kb": 10240, "capacity_in_kb": 10240,
"controller_bus_number": 0,
"controller_key": 1000, "controller_key": 1000,
"key": 2000, "key": 2000,
"label": "Hard disk 1", "label": "Hard disk 1",
@ -128,6 +129,7 @@ guest_disk_facts:
"backing_uuid": null, "backing_uuid": null,
"capacity_in_bytes": 15728640, "capacity_in_bytes": 15728640,
"capacity_in_kb": 15360, "capacity_in_kb": 15360,
"controller_bus_number": 0,
"controller_key": 1000, "controller_key": 1000,
"key": 2001, "key": 2001,
"label": "Hard disk 3", "label": "Hard disk 3",
@ -160,10 +162,21 @@ class PyVmomiHelper(PyVmomi):
Returns: A list of dict containing disks information Returns: A list of dict containing disks information
""" """
controller_facts = dict()
disks_facts = dict() disks_facts = dict()
if vm_obj is None: if vm_obj is None:
return disks_facts return disks_facts
controller_index = 0
for controller in vm_obj.config.hardware.device:
if isinstance(controller, vim.vm.device.ParaVirtualSCSIController):
controller_facts[controller_index] = dict(
key=controller.key,
bus_number=controller.busNumber,
devices=controller.device
)
controller_index += 1
disk_index = 0 disk_index = 0
for disk in vm_obj.config.hardware.device: for disk in vm_obj.config.hardware.device:
if isinstance(disk, vim.vm.device.VirtualDisk): if isinstance(disk, vim.vm.device.VirtualDisk):
@ -231,6 +244,11 @@ class PyVmomiHelper(PyVmomi):
disks_facts[disk_index]['backing_split'] = bool(disk.backing.split) disks_facts[disk_index]['backing_split'] = bool(disk.backing.split)
disks_facts[disk_index]['backing_writethrough'] = bool(disk.backing.writeThrough) disks_facts[disk_index]['backing_writethrough'] = bool(disk.backing.writeThrough)
disks_facts[disk_index]['backing_uuid'] = disk.backing.uuid disks_facts[disk_index]['backing_uuid'] = disk.backing.uuid
for controller_index in range(len(controller_facts)):
if controller_facts[controller_index]['key'] == disks_facts[disk_index]['controller_key']:
disks_facts[disk_index]['controller_bus_number'] = controller_facts[controller_index]['bus_number']
disk_index += 1 disk_index += 1
return disks_facts return disks_facts