diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-13 00:05:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-13 00:05:32 +0000 |
| commit | 1880527e60d6f58e61cb2d7f650642ad3e191586 (patch) | |
| tree | f95260d56d88a1d607b4d14f3e7d85be07fc75a0 /openstackclient/common | |
| parent | ff120c847da10f9d1ed9fc3cf6cdd20c4428635b (diff) | |
| parent | 024bd3bd660490e458456c28674dcd0ad4ee13c8 (diff) | |
| download | python-openstackclient-1880527e60d6f58e61cb2d7f650642ad3e191586.tar.gz | |
Merge "Fix quota show output"
Diffstat (limited to 'openstackclient/common')
| -rw-r--r-- | openstackclient/common/quota.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py index 58368c56..afc6195f 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) |