From 024bd3bd660490e458456c28674dcd0ad4ee13c8 Mon Sep 17 00:00:00 2001 From: Reedip Date: Wed, 11 Jan 2017 12:34:48 -0500 Subject: [PATCH] Fix quota show output Currently Quota Show expects dictionary to be returned for Network client, similar to Volume and Compute clients, but Network Object is being returned, causing the "openstack quota show" to fail. This patch takes care of this issue. Depends-On: Ie0e045ff4888615d68804fd739d5b995ca11e9a1 Change-Id: Ic507997cba09fcfa84dd1151d6922f56a7c5187b Closes-Bug:#1655537 --- openstackclient/common/quota.py | 4 ++++ releasenotes/notes/bug-1655537-20b0eb676afa278f.yaml | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 releasenotes/notes/bug-1655537-20b0eb676afa278f.yaml diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py index 58368c5620..afc6195f93 100644 --- a/openstackclient/common/quota.py +++ b/openstackclient/common/quota.py @@ -273,6 +273,10 @@ class ShowQuota(command.ShowOne): volume_quota_info = self.get_compute_volume_quota(volume_client, parsed_args) network_quota_info = self.get_network_quota(parsed_args) + # NOTE(reedip): Remove the below check once requirement for + # Openstack SDK is fixed to version 0.9.12 and above + if type(network_quota_info) is not dict: + network_quota_info = network_quota_info.to_dict() info = {} info.update(compute_quota_info) diff --git a/releasenotes/notes/bug-1655537-20b0eb676afa278f.yaml b/releasenotes/notes/bug-1655537-20b0eb676afa278f.yaml new file mode 100644 index 0000000000..77cb3df073 --- /dev/null +++ b/releasenotes/notes/bug-1655537-20b0eb676afa278f.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixed a ``'Quota' object is not iterable`` error in the ``quota show`` command + that appeared with the initial release of openstacksdk v0.9.11 and v0.9.12. + [Bug `1655537 `_]