diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-20 23:22:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-20 23:22:37 +0000 |
| commit | b0e4b924ff796c177210599f7e5fb9d13fa5a486 (patch) | |
| tree | 4974a32d8497dbe2eded5e7919ecaa2ab1c14ecd /troveclient/v1 | |
| parent | e9178c17641dabf78902167aaffa301426cd6ce4 (diff) | |
| parent | b626a084505de9c5af2bfc2d9dfb9cb1c41bb0bb (diff) | |
| download | python-troveclient-b0e4b924ff796c177210599f7e5fb9d13fa5a486.tar.gz | |
Merge "Fix datastore abnormal display with trove list"
Diffstat (limited to 'troveclient/v1')
| -rw-r--r-- | troveclient/v1/shell.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/troveclient/v1/shell.py b/troveclient/v1/shell.py index 21ef93f..e624fe5 100644 --- a/troveclient/v1/shell.py +++ b/troveclient/v1/shell.py @@ -315,13 +315,13 @@ def _print_instances(instances, is_admin=False): setattr(instance, 'size', instance.volume['size']) else: setattr(instance, 'size', '-') + if not hasattr(instance, 'region'): + setattr(instance, 'region', '') if hasattr(instance, 'datastore'): if instance.datastore.get('version'): setattr(instance, 'datastore_version', instance.datastore['version']) setattr(instance, 'datastore', instance.datastore['type']) - if not hasattr(instance, 'region'): - setattr(instance, 'region', '') fields = ['id', 'name', 'datastore', 'datastore_version', 'status', 'flavor_id', 'size', 'region'] |