diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-03 02:26:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-03 02:26:51 +0000 |
| commit | 9210cac86a2d5d3df9989f40b1fcc605e5f78ed8 (patch) | |
| tree | 273398b7228b6e325792da3036f4d86d536ffca7 /openstackclient | |
| parent | be964cf409a9fe21fc3c37392bd644d4a78ba6d5 (diff) | |
| parent | 5171a427ac81605182cee55efdcd48da07cb5633 (diff) | |
| download | python-openstackclient-9210cac86a2d5d3df9989f40b1fcc605e5f78ed8.tar.gz | |
Merge "Ignore flavor and image find errors on server show"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 4efef975..6d837d9c 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -107,14 +107,20 @@ def _prep_server_detail(compute_client, server): image_info = info.get('image', {}) if image_info: image_id = image_info.get('id', '') - image = utils.find_resource(compute_client.images, image_id) - info['image'] = "%s (%s)" % (image.name, image_id) + try: + image = utils.find_resource(compute_client.images, image_id) + info['image'] = "%s (%s)" % (image.name, image_id) + except Exception: + info['image'] = image_id # Convert the flavor blob to a name flavor_info = info.get('flavor', {}) flavor_id = flavor_info.get('id', '') - flavor = utils.find_resource(compute_client.flavors, flavor_id) - info['flavor'] = "%s (%s)" % (flavor.name, flavor_id) + try: + flavor = utils.find_resource(compute_client.flavors, flavor_id) + info['flavor'] = "%s (%s)" % (flavor.name, flavor_id) + except Exception: + info['flavor'] = flavor_id # NOTE(dtroyer): novaclient splits these into separate entries... # Format addresses in a useful way |