From fb62a77a84897010b1481ec5423ac8eac3008d47 Mon Sep 17 00:00:00 2001 From: TSKushal <44438079+TSKushal@users.noreply.github.com> Date: Sat, 15 Jul 2023 19:58:27 +0530 Subject: [PATCH] Fix for get_volume_inventory (#6883) * Fix for get_volume_inventory * Adding changelog fragment * Update changelogs/fragments/6883-redfish-utils-changing-variable-names-in-get-volume-inventory.yml --------- Co-authored-by: Kushal Co-authored-by: Felix Fontein (cherry picked from commit c70edfa84b770c2e6682f85db61d527341030ccf) --- ...ng-variable-names-in-get-volume-inventory.yml | 2 ++ plugins/module_utils/redfish_utils.py | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 changelogs/fragments/6883-redfish-utils-changing-variable-names-in-get-volume-inventory.yml diff --git a/changelogs/fragments/6883-redfish-utils-changing-variable-names-in-get-volume-inventory.yml b/changelogs/fragments/6883-redfish-utils-changing-variable-names-in-get-volume-inventory.yml new file mode 100644 index 00000000000..91932c4dd6a --- /dev/null +++ b/changelogs/fragments/6883-redfish-utils-changing-variable-names-in-get-volume-inventory.yml @@ -0,0 +1,2 @@ +bugfixes: + - refish_utils module utils - changing variable names to avoid issues occuring when fetching Volumes data (https://github.com/ansible-collections/community.general/pull/6883). diff --git a/plugins/module_utils/redfish_utils.py b/plugins/module_utils/redfish_utils.py index d8ae93429e4..5cd03f6607d 100644 --- a/plugins/module_utils/redfish_utils.py +++ b/plugins/module_utils/redfish_utils.py @@ -851,19 +851,19 @@ def get_volume_inventory(self, systems_uri): response = self.get_request(self.root_uri + data['Controllers'][u'@odata.id']) if response['ret'] is False: return response - data = response['data'] + c_data = response['data'] - if data.get('Members') and data['Members']: - response = self.get_request(self.root_uri + data['Members'][0][u'@odata.id']) + if c_data.get('Members') and c_data['Members']: + response = self.get_request(self.root_uri + c_data['Members'][0][u'@odata.id']) if response['ret'] is False: return response - data = response['data'] + member_data = response['data'] - if data: - if 'Name' in data: - controller_name = data['Name'] + if member_data: + if 'Name' in member_data: + controller_name = member_data['Name'] else: - controller_id = data.get('Id', '1') + controller_id = member_data.get('Id', '1') controller_name = 'Controller %s' % controller_id volume_results = [] volume_list = []