Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vmware_guest_disk: Add iolimit modifications on an existing disk with… #1466

Merged
merged 7 commits into from
Sep 29, 2022
Merged

vmware_guest_disk: Add iolimit modifications on an existing disk with… #1466

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0cd9296
vmware_guest_disk: Add iolimit modifications on an existing disk with…
yo000 Sep 21, 2022
f681ea3
style updates (tox compliance)
yo000 Sep 21, 2022
b3c409a
Fix W504 line break after binary operator
mariolenz Sep 22, 2022
4004387
Fix E502: the backslash is redundant between brackets
mariolenz Sep 22, 2022
fb5fd3e
Fix E999 SyntaxError: invalid syntax
mariolenz Sep 22, 2022
2c2dce3
Fix bug when changing iolimit and size, use get_ioandshares_diskconfig()
yo000 Sep 27, 2022
31e651a
changelog update
yo000 Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion plugins/modules/vmware_guest_disk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,8 @@ def ensure_disks(self, vm_obj=None):
results = dict(changed=False, disk_data=None, disk_changes=dict())
new_added_disk_ctl = list()

sharesval = {'low': 500, 'normal': 1000, 'high': 2000}

# Deal with controller
for disk in disk_data:
ctl_found = False
Expand Down Expand Up @@ -706,8 +708,32 @@ def ensure_disks(self, vm_obj=None):
disk_found = True
if disk['state'] == 'present':
disk_spec = vim.vm.device.VirtualDeviceSpec()
# set the operation to edit so that it knows to keep other settings
disk_spec.device = disk_device
# Deal with iolimit. Note that if iolimit is set, you HAVE TO both set limit and shares,
# or ansible will break with "'NoneType' object is not subscriptable"
if 'iolimit' in disk:
if disk['iolimit']['limit'] != disk_spec.device.storageIOAllocation.limit:
# set the operation to edit so that it knows to keep other settings
disk_spec.operation = vim.vm.device.VirtualDeviceSpec.Operation.edit
disk_spec.device.storageIOAllocation.limit = disk['iolimit']['limit']
self.config_spec.deviceChange.append(disk_spec)
disk_change = True
disk_change_list.append(disk_change)
if 'shares' in disk['iolimit']:
if (disk['iolimit']['shares']['level'] != 'custom' and
mariolenz marked this conversation as resolved.
Show resolved Hide resolved
and sharesval.get(disk['iolimit']['shares']['level'], 0) != disk_spec.device.storageIOAllocation.shares.shares) or \
(disk['iolimit']['shares']['level'] == 'custom'
and disk['iolimit']['shares']['level_value'] != disk_spec.device.storageIOAllocation.shares.shares):
# set the operation to edit so that it knows to keep other settings
disk_spec.operation = vim.vm.device.VirtualDeviceSpec.Operation.edit
disk_spec.device.storageIOAllocation.shares = vim.SharesInfo()
disk_spec.device.storageIOAllocation.shares.level = disk['iolimit']['shares']['level']
if disk_spec.device.storageIOAllocation.shares.level == 'custom':
disk_spec.device.storageIOAllocation.shares.shares = disk['iolimit']['shares']['level_value']
self.config_spec.deviceChange.append(disk_spec)
disk_change = True
disk_change_list.append(disk_change)

# If this is an RDM ignore disk size
if disk['disk_type'] != 'rdm':
if disk['size'] < disk_spec.device.capacityInKB:
Expand All @@ -716,6 +742,7 @@ def ensure_disks(self, vm_obj=None):
% (disk['disk_index'], disk['size'],
disk_spec.device.capacityInKB))
if disk['size'] != disk_spec.device.capacityInKB:
# set the operation to edit so that it knows to keep other settings
disk_spec.operation = vim.vm.device.VirtualDeviceSpec.Operation.edit
if disk['disk_type'] != 'vpmemdisk':
disk_spec = self.get_ioandshares_diskconfig(disk_spec, disk)
Expand Down