openstack
/
nova
Code Issues Proposed changes

Merge "Updated code to update attach_time of a volume while detaching" into stable/folsom

This commit is contained in:
Jenkins 2012-11-27 13:32:32 +00:00 committed by Gerrit Code Review
parent a0e18d637f 97649b88e9
commit 74d16ec70d
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/ec2/cloud.py
View File

@ -987,7 +987,7 @@ class CloudController(object):
# TODO(yamahata): volume attach time
ebs = {'volumeId': volume_id,
'deleteOnTermination': bdm['delete_on_termination'],
'attachTime': vol['attach_time'] or '-',
'attachTime': vol['attach_time'] or '',
'status': vol['status'], }
res = {'deviceName': bdm['device_name'],
'ebs': ebs, }

1
nova/db/sqlalchemy/api.py
View File

@ -2981,6 +2981,7 @@ def volume_detached(context, volume_id):
volume_ref['mountpoint'] = None
volume_ref['attach_status'] = 'detached'
volume_ref['instance_uuid'] = None
volume_ref['attach_time'] = None
volume_ref.save(session=session)

2
nova/tests/api/ec2/test_cloud.py
View File

@ -2065,12 +2065,14 @@ class CloudTestCase(test.TestCase):
self.assertEqual(vol['mountpoint'], mountpoint)
self.assertEqual(vol['status'], "in-use")
self.assertEqual(vol['attach_status'], "attached")
self.assertNotEqual(vol['attach_time'], None)
def _assert_volume_detached(self, vol):
self.assertEqual(vol['instance_uuid'], None)
self.assertEqual(vol['mountpoint'], None)
self.assertEqual(vol['status'], "available")
self.assertEqual(vol['attach_status'], "detached")
self.assertEqual(vol['attach_time'], None)
def test_stop_start_with_volume(self):
"""Make sure run instance with block device mapping works"""

2
nova/tests/test_volume.py
View File

@ -273,6 +273,7 @@ class VolumeTestCase(test.TestCase):
self.assertEqual(vol['attach_status'], "attached")
self.assertEqual(vol['mountpoint'], mountpoint)
self.assertEqual(vol['instance_uuid'], instance_uuid)
self.assertNotEqual(vol['attach_time'], None)
self.assertRaises(exception.VolumeAttached,
self.volume.delete_volume,
@ -286,6 +287,7 @@ class VolumeTestCase(test.TestCase):
volume_id)
vol = db.volume_get(self.context, volume_id)
self.assertEqual(vol['status'], "available")
self.assertEqual(vol['attach_time'], None)
self.volume.delete_volume(self.context, volume_id)
self.assertRaises(exception.VolumeNotFound,