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

vmware_guest_disk_facts: return controller_bus_number and controller_type (#58117)

Browse source 
Fixes: #57608
Fixes: #57998
This commit is contained in:
pratikgadiya12 2019-06-20 20:07:17 +05:30 committed by Abhijeet Kasurde
parent ffd117132f
commit 2b5ad94a96
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,6 +114,7 @@ guest_disk_facts:
"capacity_in_kb": 10240, "capacity_in_kb": 10240,
"controller_bus_number": 0, "controller_bus_number": 0,
"controller_key": 1000, "controller_key": 1000,
"controller_type": "paravirtual",
"key": 2000, "key": 2000,
"label": "Hard disk 1", "label": "Hard disk 1",
"summary": "10,240 KB", "summary": "10,240 KB",
@ -131,6 +132,7 @@ guest_disk_facts:
"capacity_in_kb": 15360, "capacity_in_kb": 15360,
"controller_bus_number": 0, "controller_bus_number": 0,
"controller_key": 1000, "controller_key": 1000,
"controller_type": "paravirtual",
"key": 2001, "key": 2001,
"label": "Hard disk 3", "label": "Hard disk 3",
"summary": "15,360 KB", "summary": "15,360 KB",
@ -167,11 +169,20 @@ class PyVmomiHelper(PyVmomi):
if vm_obj is None: if vm_obj is None:
return disks_facts return disks_facts
controller_types = {
vim.vm.device.VirtualLsiLogicController: 'lsilogic',
vim.vm.device.ParaVirtualSCSIController: 'paravirtual',
vim.vm.device.VirtualBusLogicController: 'buslogic',
vim.vm.device.VirtualLsiLogicSASController: 'lsilogicsas',
vim.vm.device.VirtualIDEController: 'ide'
}
controller_index = 0 controller_index = 0
for controller in vm_obj.config.hardware.device: for controller in vm_obj.config.hardware.device:
if isinstance(controller, vim.vm.device.ParaVirtualSCSIController): if isinstance(controller, tuple(controller_types.keys())):
controller_facts[controller_index] = dict( controller_facts[controller_index] = dict(
key=controller.key, key=controller.key,
controller_type=controller_types[type(controller)],
bus_number=controller.busNumber, bus_number=controller.busNumber,
devices=controller.device devices=controller.device
) )
@ -248,6 +259,7 @@ class PyVmomiHelper(PyVmomi):
for controller_index in range(len(controller_facts)): for controller_index in range(len(controller_facts)):
if controller_facts[controller_index]['key'] == disks_facts[disk_index]['controller_key']: 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'] disks_facts[disk_index]['controller_bus_number'] = controller_facts[controller_index]['bus_number']
disks_facts[disk_index]['controller_type'] = controller_facts[controller_index]['controller_type']
disk_index += 1 disk_index += 1
return disks_facts return disks_facts