From 27b92e509c71a8b79dc6240aecdf598bf9d608f1 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 29 Mar 2011 17:13:40 -0700
Subject: Change volume so that it returns attachments in the same format as is
 used for the attachment object

---
 nova/api/openstack/incubator/volumes.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/incubator/volumes.py b/nova/api/openstack/incubator/volumes.py
index 0e6a1d0e9..f96e20ed4 100644
--- a/nova/api/openstack/incubator/volumes.py
+++ b/nova/api/openstack/incubator/volumes.py
@@ -44,15 +44,10 @@ def _translate_volume_detail_view(context, vol):
     return d
 
 
-def _translate_volume_summary_view(_context, vol):
+def _translate_volume_summary_view(context, vol):
     """Maps keys for volumes summary view."""
     d = {}
 
-    instance_id = None
-    attached_to = vol.get('instance')
-    if attached_to:
-        instance_id = attached_to['id']
-
     d['id'] = vol['id']
     d['status'] = vol['status']
     d['size'] = vol['size']
@@ -60,12 +55,7 @@ def _translate_volume_summary_view(_context, vol):
     d['createdAt'] = vol['created_at']
 
     if vol['attach_status'] == 'attached':
-        d['attachments'] = [{'attachTime': vol['attach_time'],
-                             'deleteOnTermination': False,
-                             'mountpoint': vol['mountpoint'],
-                             'instanceId': instance_id,
-                             'status': 'attached',
-                             'volumeId': vol['id']}]
+        d['attachments'] = [_translate_attachment_detail_view(context, vol)]
     else:
         d['attachments'] = [{}]
 
-- 
cgit