Skip to content

Commit

Permalink
Fixing response in check mode for volume module
Browse files Browse the repository at this point in the history
  • Loading branch information
trisha-dell committed Dec 20, 2024
1 parent c9e2599 commit 6821021
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions plugins/modules/volume.py
Original file line number Diff line number Diff line change
Expand Up @@ -1858,7 +1858,7 @@ def get_powerstore_volume_parameters():


class VolumeExitHandler:
def handle(self, volume_obj, volume_params, volume_id, changed):
def handle(self, volume_obj, volume_params, volume_id, volume_details, changed):
volume_obj.result["changed"] = changed
if volume_params['state'] == 'present':
if volume_id is not None:
Expand All @@ -1871,6 +1871,11 @@ def handle(self, volume_obj, volume_params, volume_id, changed):
volume_obj.result["volume_details"]['id'], all_snapshots=True)[1])
volume_obj.result["volume_details"].update(
appliance_name=volume_obj.update_volume_details(volume_obj.result["volume_details"]))
if volume_params['state'] == 'absent':
if volume_obj.module.check_mode:
volume_obj.result['volume_details'] = volume_details
else:
volume_obj.result['volume_details'] = dict()
volume_obj.module.exit_json(**volume_obj.result)


Expand All @@ -1879,7 +1884,7 @@ def handle(self, volume_obj, volume_params, volume_details, volume_id, changed):
if volume_params['state'] == 'absent' and volume_details:
LOG.info('Deleting volume %s ', volume_details['name'])
changed = volume_obj.delete_volume(volume=volume_details) or changed
VolumeExitHandler().handle(volume_obj, volume_params, volume_id, changed)
VolumeExitHandler().handle(volume_obj, volume_params, volume_id, volume_details, changed)


class VolumeEndMetroHandler:
Expand Down Expand Up @@ -1921,7 +1926,8 @@ def handle(self, volume_obj, volume_params, volume_details, fetched_params, volu
}
volume_obj.result["is_volume_restored"] = False
changed = volume_obj.restore_volume(volume=volume_details, restore_details=restore_details)
volume_obj.result["is_volume_restored"] = changed
if not volume_obj.module.check_mode:
volume_obj.result["is_volume_restored"] = changed
VolumeConfigureMetroHandler().handle(volume_obj, volume_params, volume_details, fetched_params, volume_id,
changed)

Expand All @@ -1936,7 +1942,8 @@ def handle(self, volume_obj, volume_params, volume_details, fetched_params, volu
}
volume_obj.result["is_volume_refreshed"] = False
changed = volume_obj.refresh_volume(volume=volume_details, refresh_details=refresh_details)
volume_obj.result["is_volume_refreshed"] = changed
if not volume_obj.module.check_mode:
volume_obj.result["is_volume_refreshed"] = changed
VolumeRestoreHandler().handle(volume_obj, volume_params, volume_details, fetched_params, volume_id, changed)


Expand All @@ -1945,7 +1952,8 @@ def handle(self, volume_obj, volume_params, volume_details, fetched_params, volu
if volume_params['state'] == 'present' and volume_params['clone_volume'] is not None:
volume_obj.result["is_volume_cloned"] = False
changed = volume_obj.clone_volume(vol_id=volume_id, clone_details=volume_params['clone_volume'])
volume_obj.result["is_volume_cloned"] = changed
if not volume_obj.module.check_mode:
volume_obj.result["is_volume_cloned"] = changed
VolumeRefreshHandler().handle(volume_obj, volume_params, volume_details, fetched_params, volume_id, changed)


Expand Down

0 comments on commit 6821021

Please sign in to comment.