diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-29 17:10:40 -0700 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-29 17:10:40 -0700 |
| commit | ded3416d48980c32eb20f95665f281ffc2927517 (patch) | |
| tree | 15b807030f8f1a2ceff0e1c3734743111b6e276f /nova | |
| parent | 11d258e1d8a4a78a699aa564b5f8139bf0b73db2 (diff) | |
Removed commented-out EC2 code from volumes.py
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/incubator/volumes.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/nova/api/openstack/incubator/volumes.py b/nova/api/openstack/incubator/volumes.py index 47b86216e..0e6a1d0e9 100644 --- a/nova/api/openstack/incubator/volumes.py +++ b/nova/api/openstack/incubator/volumes.py @@ -49,24 +49,16 @@ def _translate_volume_summary_view(_context, vol): d = {} instance_id = None - # instance_data = None attached_to = vol.get('instance') if attached_to: instance_id = attached_to['id'] - # instance_data = '%s[%s]' % (instance_ec2_id, - # attached_to['host']) + d['id'] = vol['id'] d['status'] = vol['status'] d['size'] = vol['size'] d['availabilityZone'] = vol['availability_zone'] d['createdAt'] = vol['created_at'] - # if context.is_admin: - # v['status'] = '%s (%s, %s, %s, %s)' % ( - # vol['status'], - # vol['user_id'], - # vol['host'], - # instance_data, - # vol['mountpoint']) + if vol['attach_status'] == 'attached': d['attachments'] = [{'attachTime': vol['attach_time'], 'deleteOnTermination': False, |