Update host on driver retype

The volume's host was not updated on retype where the driver handled
the retype. Now update in all cases.

Change-Id: I64b72ae5617d1dacad8f37c4246ce0f079e015bb
Closes-Bug: #1268305

diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
index 6eb542d7cb0f8f2555e742995e1f8a2d3bbd0876..3a5af17cd1cfd346b89fcea231dbc910b9d58bfc 100644 (file)
--- a/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@ -2220,10 +2220,12 @@ class VolumeTestCase(BaseVolumeTestCase):
         if not exc:
             self.assertEqual(volume['volume_type_id'], vol_type['id'])
             self.assertEqual(volume['status'], 'available')
+            self.assertEqual(volume['host'], 'newhost')
             self.assertEqual(volumes_in_use, 1)
         else:
             self.assertEqual(volume['volume_type_id'], old_vol_type['id'])
             self.assertEqual(volume['status'], 'available')
+            self.assertEqual(volume['host'], CONF.host)
             self.assertEqual(volumes_in_use, 0)
 
     def test_retype_volume_driver_success(self):

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 1da9d01f0fb2a430b83c30582d76958520c27c9b..7c8ef353b1b53e67ff22a76a78224e85f4bcce6b 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -1215,6 +1215,7 @@ class VolumeManager(manager.SchedulerDependentManager):
 
         self.db.volume_update(context, volume_id,
                               {'volume_type_id': new_type_id,
+                               'host': host['host'],
                                'status': status_update['status']})
 
         if old_reservations: