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

Fix os_type comparison in azure_rm_manageddisk with existing disk #621

Merged
merged 6 commits into from
Apr 14, 2022
Merged

Fix os_type comparison in azure_rm_manageddisk with existing disk #621

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c8b2ddf
Fix os_type comparison in azure_rm_manageddisk with existing disk
nbr23 Aug 27, 2021
d4004ed
Update str to OperatingSystemTypes conversion, leveraging the sdk cap…
nbr23 Aug 27, 2021
24db5e8
Fix bug in os_type comparison when curren os_type is None
nbr23 Aug 27, 2021
c79ce72
Merge branch 'dev' into manageddisk_ostype
xuzhang3 Aug 31, 2021
951f578
Merge branch 'dev' into manageddisk_ostype
xuzhang3 Sep 6, 2021
e600de6
Merge branch 'dev' into manageddisk_ostype
xuzhang3 Sep 8, 2021
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
8 changes: 2 additions & 6 deletions plugins/modules/azure_rm_manageddisk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,11 +454,7 @@ def generate_managed_disk_property(self):
creation_data['create_option'] = self.compute_models.DiskCreateOption.copy
creation_data['source_resource_id'] = self.source_uri
if self.os_type:
typecon = {
'linux': self.compute_models.OperatingSystemTypes.linux,
'windows': self.compute_models.OperatingSystemTypes.windows
}
disk_params['os_type'] = typecon[self.os_type]
disk_params['os_type'] = self.compute_models.OperatingSystemTypes(self.os_type.capitalize())
else:
disk_params['os_type'] = None
disk_params['creation_data'] = creation_data
Expand All @@ -483,7 +479,7 @@ def is_different(self, found_disk, new_disk):
if not found_disk['disk_size_gb'] == new_disk['disk_size_gb']:
resp = True
if new_disk.get('os_type'):
if not found_disk['os_type'] == new_disk['os_type']:
if found_disk['os_type'] is None or not self.compute_models.OperatingSystemTypes(found_disk['os_type'].capitalize()) == new_disk['os_type']:
resp = True
if new_disk.get('sku'):
if not found_disk['storage_account_type'] == new_disk['sku'].name:
Expand Down