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

ovirt_vm: Fix issue in setting the custom_compatibility_version to NULL

Browse source 
Currently there is no way to reset the custom_compatibility_version to
NULL. If we provide a empty string('') to custom_compatibility_version,
it will fail with error "IndexError: list index out of range" at _get_minor
function.

To reset the custom_compatibility_version, we have to pass None value to
types.Version. The PR fixes the same.
This commit is contained in:
Nijin Ashok 2018-10-21 12:54:10 +05:30 committed by Toshio Kuratomi
parent a0f58fa2ef
commit bc741eb2a0
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/ovirt.py
View file

@ -790,14 +790,14 @@ class BaseModule(object):
return entity return entity
def _get_major(self, full_version): def _get_major(self, full_version):
if full_version is None: if full_version is None or full_version == "":
return None return None
if isinstance(full_version, otypes.Version): if isinstance(full_version, otypes.Version):
return int(full_version.major) return int(full_version.major)
return int(full_version.split('.')[0]) return int(full_version.split('.')[0])
def _get_minor(self, full_version): def _get_minor(self, full_version):
if full_version is None: if full_version is None or full_version == "":
return None return None
if isinstance(full_version, otypes.Version): if isinstance(full_version, otypes.Version):
return int(full_version.minor) return int(full_version.minor)

11
lib/ansible/modules/cloud/ovirt/ovirt_vm.py
View file

@ -1146,7 +1146,7 @@ class VmsModule(BaseModule):
custom_compatibility_version=otypes.Version( custom_compatibility_version=otypes.Version(
major=self._get_major(self.param('custom_compatibility_version')), major=self._get_major(self.param('custom_compatibility_version')),
minor=self._get_minor(self.param('custom_compatibility_version')), minor=self._get_minor(self.param('custom_compatibility_version')),
) if self.param('custom_compatibility_version') else None, ) if self.param('custom_compatibility_version') is not None else None,
description=self.param('description'), description=self.param('description'),
comment=self.param('comment'), comment=self.param('comment'),
time_zone=otypes.TimeZone( time_zone=otypes.TimeZone(
@ -1228,12 +1228,19 @@ class VmsModule(BaseModule):
return self.param('host') in [self._connection.follow_link(host).name for host in getattr(entity.placement_policy, 'hosts', None) or []] return self.param('host') in [self._connection.follow_link(host).name for host in getattr(entity.placement_policy, 'hosts', None) or []]
return True return True
def check_custom_compatibility_version():
if self.param('custom_compatibility_version') is not None:
return (self._get_minor(self.param('custom_compatibility_version')) == self._get_minor(entity.custom_compatibility_version) and
self._get_major(self.param('custom_compatibility_version')) == self._get_major(entity.custom_compatibility_version))
return True
cpu_mode = getattr(entity.cpu, 'mode') cpu_mode = getattr(entity.cpu, 'mode')
vm_display = entity.display vm_display = entity.display
return ( return (
check_cpu_pinning() and check_cpu_pinning() and
check_custom_properties() and check_custom_properties() and
check_host() and check_host() and
check_custom_compatibility_version() and
not self.param('cloud_init_persist') and not self.param('cloud_init_persist') and
not self.param('kernel_params_persist') and not self.param('kernel_params_persist') and
equal(self.param('cluster'), get_link_name(self._connection, entity.cluster)) and equal(convert_to_bytes(self.param('memory')), entity.memory) and equal(self.param('cluster'), get_link_name(self._connection, entity.cluster)) and equal(convert_to_bytes(self.param('memory')), entity.memory) and
@ -1252,8 +1259,6 @@ class VmsModule(BaseModule):
equal(self.param('io_threads'), entity.io.threads) and equal(self.param('io_threads'), entity.io.threads) and
equal(self.param('ballooning_enabled'), entity.memory_policy.ballooning) and equal(self.param('ballooning_enabled'), entity.memory_policy.ballooning) and
equal(self.param('serial_console'), getattr(entity.console, 'enabled', None)) and equal(self.param('serial_console'), getattr(entity.console, 'enabled', None)) and
equal(self._get_minor(self.param('custom_compatibility_version')), self._get_minor(entity.custom_compatibility_version)) and
equal(self._get_major(self.param('custom_compatibility_version')), self._get_major(entity.custom_compatibility_version)) and
equal(self.param('usb_support'), entity.usb.enabled) and equal(self.param('usb_support'), entity.usb.enabled) and
equal(self.param('sso'), True if entity.sso.methods else False) and equal(self.param('sso'), True if entity.sso.methods else False) and
equal(self.param('quota_id'), getattr(entity.quota, 'id', None)) and equal(self.param('quota_id'), getattr(entity.quota, 'id', None)) and