Merge "Follow-up for I6a777b4b7a5729488f939df8c40e49bd40aec3dd"

Author: Zuul

nova/tests/functional/api_sample_tests/test_volumes.py

@@ -258,40 +258,9 @@ def _get_vol_attachment_subs(self, subs):
         return subs
 
     def test_attach_volume_to_server(self):
-        self.stub_out('nova.volume.cinder.API.get', fakes.stub_volume_get)
-        self.stub_out('nova.volume.cinder.API.attachment_create',
-                      lambda *a, **k: {'id': uuids.attachment_id})
-        device_name = '/dev/vdd'
-        bdm = objects.BlockDeviceMapping()
-        bdm['device_name'] = device_name
-        self.stub_out(
-            'nova.compute.manager.ComputeManager.reserve_block_device_name',
-            lambda *a, **k: bdm)
-        self.stub_out(
-            'nova.compute.manager.ComputeManager.attach_volume',
-            lambda *a, **k: None)
-
-        volume = fakes.stub_volume_get(None, context.get_admin_context(),
-                                       self.OLD_VOLUME_ID)
-        subs = {
-            'volume_id': volume['id'],
-            'device': device_name
-        }
-        server_id = self._post_server()
-        subs = self._get_vol_attachment_subs(subs)
-        response = self._do_post('servers/%s/os-volume_attachments'
-                                 % server_id,
-                                 'attach-volume-to-server-req', subs)
-
-        self._verify_response('attach-volume-to-server-resp', subs,
-                              response, 200)
-
-    def test_attach_volume_to_server_new_flow(self):
         self.stub_out('nova.volume.cinder.API.get', fakes.stub_volume_get)
         self.stub_out('nova.volume.cinder.API.attachment_create',
                       lambda *a, **k: {'id': uuids.volume})
-        self.stub_out('nova.objects.BlockDeviceMapping.save',
-                      lambda *a, **k: None)
         device_name = '/dev/vdd'
         bdm = objects.BlockDeviceMapping()
         bdm['device_name'] = device_name

nova/tests/unit/compute/test_compute_api.py

@@ -4132,42 +4132,6 @@ def test_get_bdm_image_metadata_with_cinder_down(self, mock_get):
                           self.context,
                           bdms, legacy_bdm=True)
 
-    @mock.patch.object(cinder.API, 'get')
-    @mock.patch.object(cinder.API, 'attachment_create',
-                       side_effect=exception.InvalidInput(reason='error'))
-    def test_validate_bdm_with_error_volume(self, mock_attach_create,
-                                            mock_get):
-        # Tests that an InvalidInput exception raised from
-        # volume_api.reserve_volume due to the volume status not being
-        # 'available' results in _validate_bdm re-raising InvalidVolume.
-        instance = self._create_instance_obj()
-        del instance.id
-        instance_type = self._create_flavor()
-        volume_id = 'e856840e-9f5b-4894-8bde-58c6e29ac1e8'
-        volume_info = {'status': 'error',
-                       'attach_status': 'detached',
-                       'id': volume_id,
-                       'multiattach': False}
-        mock_get.return_value = volume_info
-        bdms = [objects.BlockDeviceMapping(
-                **fake_block_device.FakeDbBlockDeviceDict(
-                {
-                 'boot_index': 0,
-                 'volume_id': volume_id,
-                 'source_type': 'volume',
-                 'destination_type': 'volume',
-                 'device_name': 'vda',
-                }))]
-
-        self.assertRaises(exception.InvalidVolume,
-                          self.compute_api._validate_bdm,
-                          self.context,
-                          instance, instance_type, bdms)
-
-        mock_get.assert_called_once_with(self.context, volume_id)
-        mock_attach_create.assert_called_once_with(
-            self.context, volume_id, instance.uuid)
-
     @mock.patch.object(cinder.API, 'get_snapshot',
              side_effect=exception.CinderConnectionFailed(reason='error'))
     @mock.patch.object(cinder.API, 'get',
@@ -4444,25 +4408,12 @@ def test_provision_instances_with_cinder_down(self, mock_get):
         self._test_provision_instances_with_cinder_error(
             expected_exception=exception.CinderConnectionFailed)
 
-    @mock.patch.object(cinder.API, 'get',
-                       return_value={'id': '1', 'multiattach': False})
-    @mock.patch.object(cinder.API, 'check_availability_zone')
-    @mock.patch.object(cinder.API, 'attachment_create',
-                       side_effect=exception.InvalidInput(reason='error'))
-    def test_provision_instances_with_error_volume(self,
-                                                   mock_cinder_check_av_zone,
-                                                   mock_reserve_volume,
-                                                   mock_get):
-        self._test_provision_instances_with_cinder_error(
-            expected_exception=exception.InvalidVolume)
-
-    @mock.patch.object(cinder.API, 'get',
-                       return_value={'id': '1', 'multiattach': False})
-    @mock.patch.object(cinder.API, 'check_availability_zone')
-    @mock.patch.object(cinder.API, 'attachment_create',
-                       side_effect=exception.InvalidInput(reason='error'))
-    def test_provision_instances_with_error_volume_new_flow(self,
-        mock_cinder_check_av_zone, mock_attach_create, mock_get):
+    @mock.patch.object(cinder.API, 'get', new=mock.Mock(
+        return_value={'id': '1', 'multiattach': False}))
+    @mock.patch.object(cinder.API, 'check_availability_zone', new=mock.Mock())
+    @mock.patch.object(cinder.API, 'attachment_create', new=mock.Mock(
+        side_effect=exception.InvalidInput(reason='error')))
+    def test_provision_instances_with_error_volume(self):
         self._test_provision_instances_with_cinder_error(
             expected_exception=exception.InvalidVolume)