Merge "Remove MIN_COMPUTE_MULTIATTACH conditions in API"

Author: Zuul

nova/api/openstack/compute/servers.py

@@ -750,7 +750,6 @@ def create(self, req, body):
                 exception.InstanceExists,
                 exception.NetworkAmbiguous,
                 exception.NoUniqueMatch,
-                exception.MultiattachSupportNotYetAvailable,
                 exception.VolumeTypeSupportNotYetAvailable,
                 exception.CertificateValidationNotYetAvailable) as error:
             raise exc.HTTPConflict(explanation=error.format_message())

nova/compute/api.py

@@ -105,7 +105,6 @@
 AGGREGATE_ACTION_DELETE = 'Delete'
 AGGREGATE_ACTION_ADD = 'Add'
 CINDER_V3_ATTACH_MIN_COMPUTE_VERSION = 24
-MIN_COMPUTE_MULTIATTACH = 27
 MIN_COMPUTE_TRUSTED_CERTS = 31
 MIN_COMPUTE_ABORT_QUEUED_LIVE_MIGRATION = 34
 MIN_COMPUTE_VOLUME_TYPE = 36
@@ -1596,8 +1595,7 @@ def _validate_bdm(self, context, instance, instance_type,
                         bdm.attachment_id = None
                 except (exception.CinderConnectionFailed,
                         exception.InvalidVolume,
-                        exception.MultiattachNotSupportedOldMicroversion,
-                        exception.MultiattachSupportNotYetAvailable):
+                        exception.MultiattachNotSupportedOldMicroversion):
                     raise
                 except exception.InvalidInput as exc:
                     raise exception.InvalidVolume(reason=exc.format_message())
@@ -4172,11 +4170,6 @@ def _check_attach_and_reserve_volume(self, context, volume, instance,
             min_compute_version = \
                 objects.service.get_minimum_version_all_cells(
                     context, ['nova-compute'])
-            # Check to see if the computes have been upgraded to support
-            # booting from a multiattach volume.
-            if (volume['multiattach'] and
-                    min_compute_version < MIN_COMPUTE_MULTIATTACH):
-                raise exception.MultiattachSupportNotYetAvailable()
 
         if min_compute_version >= CINDER_V3_ATTACH_MIN_COMPUTE_VERSION:
             # Attempt a new style volume attachment, but fallback to old-style

nova/tests/unit/api/openstack/compute/test_serversV21.py

@@ -6418,17 +6418,6 @@ def test_create_server_with_multiattach_fails_old_microversion(self):
         self.assertIn('Multiattach volumes are only supported starting with '
                       'compute API version 2.60', six.text_type(ex))
 
-    @mock.patch('nova.objects.service.get_minimum_version_all_cells',
-                return_value=compute_api.MIN_COMPUTE_MULTIATTACH - 1)
-    def test_create_server_with_multiattach_fails_not_available(
-            self, mock_get_min_version_all_cells):
-        """Tests the case that the user tries to boot from volume with a
-        multiattach volume but before the deployment is fully upgraded.
-        """
-        ex = self.assertRaises(webob.exc.HTTPConflict, self._post_server)
-        self.assertIn('Multiattach volume support is not yet available',
-                      six.text_type(ex))
-
 
 class ServersControllerCreateTestV263(ServersControllerCreateTest):
     def _create_instance_req(self, certs=None):

nova/tests/unit/compute/test_compute_api.py

@@ -6622,26 +6622,8 @@ def test_check_attach_and_reserve_volume_multiattach_old_version(self):
                           self.context, volume, instance, bdm,
                           supports_multiattach=False)
 
-    @mock.patch('nova.objects.service.get_minimum_version_all_cells',
-                return_value=compute_api.MIN_COMPUTE_MULTIATTACH - 1)
-    def test_check_attach_and_reserve_volume_multiattach_new_inst_old_compute(
-            self, get_min_version):
-        """Tests that _check_attach_and_reserve_volume fails if trying
-        to use a multiattach volume to create a new instance but the computes
-        are not all upgraded yet.
-        """
-        instance = self._create_instance_obj()
-        delattr(instance, 'id')
-        volume = {'id': uuids.volumeid, 'multiattach': True}
-        bdm = objects.BlockDeviceMapping(volume_id=uuids.volumeid,
-                                         instance_uuid=instance.uuid)
-        self.assertRaises(exception.MultiattachSupportNotYetAvailable,
-                          self.compute_api._check_attach_and_reserve_volume,
-                          self.context, volume, instance, bdm,
-                          supports_multiattach=True)
-
     @mock.patch('nova.objects.Service.get_minimum_version',
-                return_value=compute_api.MIN_COMPUTE_MULTIATTACH)
+                return_value=compute_api.CINDER_V3_ATTACH_MIN_COMPUTE_VERSION)
     @mock.patch('nova.volume.cinder.API.get',
                 return_value={'id': uuids.volumeid, 'multiattach': True})
     @mock.patch('nova.volume.cinder.is_microversion_supported',