diff options
author | Zuul <zuul@review.opendev.org> | 2021-11-25 18:59:00 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2021-11-25 18:59:00 +0000 |
commit | 9c6b77066b7bc74f37d5a78e3c06d972a43de069 (patch) | |
tree | b48ce17e365a3ec1016b51f2b5f7dfc3f045e7a1 | |
parent | 0b7a77e8a1484fb2e1aa105f7f617655c1dd4ee6 (diff) | |
parent | 432f77f887ca15ba8a37fa8a45e9987f4766a6b5 (diff) | |
download | horizon-9c6b77066b7bc74f37d5a78e3c06d972a43de069.tar.gz |
Merge "Handle an attached volume without volume_image_metadata" into stable/ussuri
-rw-r--r-- | openstack_dashboard/dashboards/project/instances/tabs.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/openstack_dashboard/dashboards/project/instances/tabs.py b/openstack_dashboard/dashboards/project/instances/tabs.py index 686d03798..89d20b6fe 100644 --- a/openstack_dashboard/dashboards/project/instances/tabs.py +++ b/openstack_dashboard/dashboards/project/instances/tabs.py @@ -40,12 +40,19 @@ class OverviewTab(tabs.Tab): try: volume = api.cinder.volume_get( self.request, volume_id=instance.volumes[0].volumeId) - instance.image = { - 'id': volume.volume_image_metadata['image_id'], - 'name': volume.volume_image_metadata['image_name']} except Exception: exceptions.handle(self.request, _('Failed to get attached volume.')) + try: + instance.image = { + 'id': volume.volume_image_metadata['image_id'], + 'name': volume.volume_image_metadata['image_name'], + } + except (AttributeError, KeyError): + # AttributeError is raised when volume_image_metadata does not + # exist. KeyError is raised when volume_image_metadata exists + # but image_id or image_name is not included. + instance.image = None return {"instance": instance} |