Merge "Do not show "os-volume-type-access:is_public" property of volume type"

Jenkins · openstack-gerrit · commit c3811932142f · 2016-09-14T16:55:03.000Z
diff --git a/openstackclient/volume/v1/volume_type.py b/openstackclient/volume/v1/volume_type.py
@@ -55,10 +55,9 @@ def take_action(self, parsed_args):
         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 @@ def take_action(self, parsed_args):
             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
@@ -110,6 +110,7 @@ def take_action(self, parsed_args):
         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 @@ def take_action(self, parsed_args):
                         '%(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
@@ -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>`_]
