diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-14 17:02:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-14 17:02:04 +0000 |
| commit | 3b0e648041f7392c14a308ae0babc0a2e3eabbaa (patch) | |
| tree | b25cba2d2ea638eca56621c01d7ef6ea3b3cf0c8 /openstackclient/volume | |
| parent | c3811932142f06b7a7c43c28338fa2be3d087732 (diff) | |
| parent | cb6c11b0a87ba99e01eff52204b2406e8517aeaa (diff) | |
| download | python-openstackclient-3b0e648041f7392c14a308ae0babc0a2e3eabbaa.tar.gz | |
Merge "Multi REST API calls error handling of "volume unset" command"
Diffstat (limited to 'openstackclient/volume')
| -rw-r--r-- | openstackclient/volume/v2/volume.py | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/openstackclient/volume/v2/volume.py b/openstackclient/volume/v2/volume.py index 28946a5f..1584c3e7 100644 --- a/openstackclient/volume/v2/volume.py +++ b/openstackclient/volume/v2/volume.py @@ -527,9 +527,23 @@ class UnsetVolume(command.Command): volume = utils.find_resource( volume_client.volumes, parsed_args.volume) + result = 0 if parsed_args.property: - volume_client.volumes.delete_metadata( - volume.id, parsed_args.property) + try: + volume_client.volumes.delete_metadata( + volume.id, parsed_args.property) + except Exception as e: + LOG.error(_("Failed to unset volume property: %s"), e) + result += 1 + if parsed_args.image_property: - volume_client.volumes.delete_image_metadata( - volume.id, parsed_args.image_property) + try: + volume_client.volumes.delete_image_metadata( + volume.id, parsed_args.image_property) + except Exception as e: + LOG.error(_("Failed to unset image property: %s"), e) + result += 1 + + if result > 0: + raise exceptions.CommandError(_("One or more of the " + "unset operations failed")) |