From 67d1b6c4139981239acafe499538e09a186e40d6 Mon Sep 17 00:00:00 2001 From: alexander <79072457+abakanovskii@users.noreply.github.com> Date: Mon, 28 Oct 2024 23:11:39 +0300 Subject: [PATCH] one_image/one_image_info: Fix class typo (#9056) * Fix one_image class method args * Add CHANGELOG fragment * PR fix * PR fixes --- changelogs/fragments/9056-fix-one_image-modules.yml | 3 +++ plugins/modules/one_image.py | 12 ++++++------ plugins/modules/one_image_info.py | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 changelogs/fragments/9056-fix-one_image-modules.yml diff --git a/changelogs/fragments/9056-fix-one_image-modules.yml b/changelogs/fragments/9056-fix-one_image-modules.yml new file mode 100644 index 0000000000..31b85904fa --- /dev/null +++ b/changelogs/fragments/9056-fix-one_image-modules.yml @@ -0,0 +1,3 @@ +bugfixes: + - one_image - fix module failing due to a class method typo (https://github.com/ansible-collections/community.general/pull/9056). + - one_image_info - fix module failing due to a class method typo (https://github.com/ansible-collections/community.general/pull/9056). diff --git a/plugins/modules/one_image.py b/plugins/modules/one_image.py index 86db3b0405..5877142cdf 100644 --- a/plugins/modules/one_image.py +++ b/plugins/modules/one_image.py @@ -462,7 +462,7 @@ class ImageModule(OpenNebulaModule): if changed and not self.module.check_mode: self.one.image.enable(image.ID, enable) - result = OpenNebulaModule.get_image_info(image) + result = self.get_image_info(image) result['changed'] = changed return result @@ -486,7 +486,7 @@ class ImageModule(OpenNebulaModule): if changed and not self.module.check_mode: self.one.image.persistent(image.ID, enable) - result = OpenNebulaModule.get_image_info(image) + result = self.get_image_info(image) result['changed'] = changed return result @@ -497,7 +497,7 @@ class ImageModule(OpenNebulaModule): tmp_image = self.get_image_by_name(new_name) if tmp_image: - result = OpenNebulaModule.get_image_info(tmp_image) + result = self.get_image_info(image) result['changed'] = False return result @@ -509,7 +509,7 @@ class ImageModule(OpenNebulaModule): self.wait_for_ready(new_id) image = self.one.image.info(new_id) - result = OpenNebulaModule.get_image_info(image) + result = self.get_image_info(image) result['changed'] = True return result @@ -519,7 +519,7 @@ class ImageModule(OpenNebulaModule): self.module.fail_json(msg="'new_name' option has to be specified when the state is 'renamed'") if new_name == image.NAME: - result = OpenNebulaModule.get_image_info(image) + result = self.get_image_info(image) result['changed'] = False return result @@ -530,7 +530,7 @@ class ImageModule(OpenNebulaModule): if not self.module.check_mode: self.one.image.rename(image.ID, new_name) - result = OpenNebulaModule.get_image_info(image) + result = self.get_image_info(image) result['changed'] = True return result diff --git a/plugins/modules/one_image_info.py b/plugins/modules/one_image_info.py index 2ad0f3c493..4bc48dfda1 100644 --- a/plugins/modules/one_image_info.py +++ b/plugins/modules/one_image_info.py @@ -307,7 +307,7 @@ class ImageInfoModule(OpenNebulaModule): images = self.get_all_images().IMAGE self.result = { - 'images': [OpenNebulaModule.get_image_info(image) for image in images] + 'images': [self.get_image_info(image) for image in images] } self.exit()