openstack
/
horizon
Code Issues Proposed changes

Merge "Fix Instance Details error when using Cinder V2"

This commit is contained in:
Jenkins 2014-11-18 19:28:32 +00:00 committed by Gerrit Code Review
parent e7832b613b 9e5a4babf8
commit 1e53670bd0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_dashboard/api/nova.py
View File

@ -717,13 +717,13 @@ def instance_volume_detach(request, instance_id, att_id):
def instance_volumes_list(request, instance_id):
from openstack_dashboard.api.cinder import cinderclient # noqa
from openstack_dashboard.api import cinder
volumes = novaclient(request).volumes.get_server_volumes(instance_id)
for volume in volumes:
volume_data = cinderclient(request).volumes.get(volume.id)
volume.name = volume_data.display_name
volume_data = cinder.cinderclient(request).volumes.get(volume.id)
volume.name = cinder.Volume(volume_data).name
return volumes