diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-14 16:55:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-14 16:55:03 +0000 |
| commit | c3811932142f06b7a7c43c28338fa2be3d087732 (patch) | |
| tree | 4207bb90bf5a4947e05ca1373daeb733495dfe4a | |
| parent | bc222e97b155152be3c8cced987ef1d443076d10 (diff) | |
| parent | 5231ade27c8a08e3d7fd5573d4dda6fa47d0ae67 (diff) | |
| download | python-openstackclient-c3811932142f06b7a7c43c28338fa2be3d087732.tar.gz | |
Merge "Do not show "os-volume-type-access:is_public" property of volume type"
| -rw-r--r-- | openstackclient/volume/v1/volume_type.py | 6 | ||||
| -rw-r--r-- | openstackclient/volume/v2/volume_type.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1620922-7f27942dc00f7108.yaml | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/openstackclient/volume/v1/volume_type.py b/openstackclient/volume/v1/volume_type.py index 3fe4fa05..625b34dc 100644 --- a/openstackclient/volume/v1/volume_type.py +++ b/openstackclient/volume/v1/volume_type.py @@ -55,10 +55,9 @@ class CreateVolumeType(command.ShowOne): if parsed_args.property: result = volume_type.set_keys(parsed_args.property) volume_type._info.update({'properties': utils.format_dict(result)}) + volume_type._info.pop("os-volume-type-access:is_public", None) - info = {} - info.update(volume_type._info) - return zip(*sorted(six.iteritems(info))) + return zip(*sorted(six.iteritems(volume_type._info))) class DeleteVolumeType(command.Command): @@ -171,6 +170,7 @@ class ShowVolumeType(command.ShowOne): volume_client.volume_types, parsed_args.volume_type) properties = utils.format_dict(volume_type._info.pop('extra_specs')) volume_type._info.update({'properties': properties}) + volume_type._info.pop("os-volume-type-access:is_public", None) return zip(*sorted(six.iteritems(volume_type._info))) diff --git a/openstackclient/volume/v2/volume_type.py b/openstackclient/volume/v2/volume_type.py index e42fffe0..80a1f21b 100644 --- a/openstackclient/volume/v2/volume_type.py +++ b/openstackclient/volume/v2/volume_type.py @@ -110,6 +110,7 @@ class CreateVolumeType(command.ShowOne): if parsed_args.property: result = volume_type.set_keys(parsed_args.property) volume_type._info.update({'properties': utils.format_dict(result)}) + volume_type._info.pop("os-volume-type-access:is_public", None) return zip(*sorted(six.iteritems(volume_type._info))) @@ -318,6 +319,7 @@ class ShowVolumeType(command.ShowOne): '%(type)s: %(e)s') LOG.error(msg % {'type': volume_type.id, 'e': e}) volume_type._info.update({'access_project_ids': access_project_ids}) + volume_type._info.pop("os-volume-type-access:is_public", None) return zip(*sorted(six.iteritems(volume_type._info))) diff --git a/releasenotes/notes/bug-1620922-7f27942dc00f7108.yaml b/releasenotes/notes/bug-1620922-7f27942dc00f7108.yaml new file mode 100644 index 00000000..35a7f552 --- /dev/null +++ b/releasenotes/notes/bug-1620922-7f27942dc00f7108.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - Do not show ``os-volume-type-access:is_public`` property which is the + same as ``is_public`` property of volume type object. + [Bug `1620922 <https://bugs.launchpad.net/python-openstackclient/+bug/1620922>`_] |