Merge "nova-manage: Ensure mountpoint is passed when updating attachment"

Author: Zuul

nova/cmd/manage.py

@@ -3009,7 +3009,8 @@ def _refresh(self, instance_uuid, volume_id, connector):
                 # Update the attachment with host connector, this regenerates
                 # the connection_info that we can now stash in the bdm.
                 new_connection_info = volume_api.attachment_update(
-                    cctxt, new_attachment_id, connector)['connection_info']
+                    cctxt, new_attachment_id, connector,
+                    bdm.device_name)['connection_info']
 
                 # Before we save it to the BDM ensure the serial is stashed as
                 # is done in various other codepaths when attaching volumes.

nova/tests/fixtures/cinder.py

@@ -324,7 +324,13 @@ def fake_attachment_update(
                                 volume_id, _attachment['id'],
                                 _attachment['connector'].get('host')))
 
+            # If the mountpoint was provided stash it in the connector as we do
+            # within nova.volume.cinder.API.attachment_update before calling
+            # c-api and then stash the connector in the attachment record.
+            if mountpoint:
+                connector['device'] = mountpoint
             attachment['connector'] = connector
+
             LOG.info('Updating volume attachment: %s', attachment_id)
             attachment_ref = {
                 'id': attachment_id,

nova/tests/functional/test_nova_manage.py

@@ -297,6 +297,7 @@ def test_refresh(self):
 
         bdm = objects.BlockDeviceMapping.get_by_volume_and_instance(
             self.ctxt, volume_id, server['id'])
+        original_device_name = bdm.device_name
         self.assertEqual(original_attachment_id, bdm.attachment_id)
 
         # The CinderFixture also stashes the attachment id in the
@@ -332,6 +333,12 @@ def test_refresh(self):
         self.assertEqual(
             new_attachment_id, connection_info['data']['attachment_id'])
 
+        # Assert that the original device_name is stashed in the connector of
+        # the attachment within the fixture.
+        attachment_ref = attachments[new_attachment_id]
+        connector = attachment_ref.get('connector')
+        self.assertEqual(original_device_name, connector.get('device'))
+
         # Assert that we have actions we expect against the instance
         self._assert_instance_actions(server)
 

nova/tests/unit/cmd/test_manage.py

@@ -3548,14 +3548,16 @@ def test_refresh(
         fake_compute_api = mock_compute_api.return_value
         fake_volume_api = mock_volume_api.return_value
         fake_compute_rpcapi = mock_compute_rpcapi.return_value
+        device_name = '/dev/vda'
 
         mock_get_instance.return_value = objects.Instance(
             uuid=uuidsentinel.instance,
             vm_state=obj_fields.InstanceState.STOPPED,
             host='foo', locked=False)
         mock_get_bdm.return_value = objects.BlockDeviceMapping(
             uuid=uuidsentinel.bdm, volume_id=uuidsentinel.volume,
-            attachment_id=uuidsentinel.instance)
+            attachment_id=uuidsentinel.instance,
+            device_name=device_name)
         mock_action = mock.Mock(spec=objects.InstanceAction)
         mock_action_start.return_value = mock_action
 
@@ -3579,7 +3581,7 @@ def test_refresh(
         fake_volume_api.attachment_delete.assert_called_once_with(
             mock.ANY, uuidsentinel.instance)
         fake_volume_api.attachment_update.assert_called_once_with(
-            mock.ANY, uuidsentinel.new_attachment, mock.ANY)
+            mock.ANY, uuidsentinel.new_attachment, mock.ANY, device_name)
         fake_volume_api.attachment_complete.assert_called_once_with(
             mock.ANY, uuidsentinel.new_attachment)
         fake_compute_api.unlock.assert_called_once_with(