Merge "Remove ImageTooLarge exception"

4 files changed, 11 insertions, 10 deletions

diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
index 0315c8593..6cdad1294 100644
--- a/nova/tests/api/openstack/compute/test_servers.py
+++ b/nova/tests/api/openstack/compute/test_servers.py
@@ -1984,7 +1984,7 @@ class ServersControllerCreateTest(test.TestCase):
         req.headers["content-type"] = "application/json"
         with testtools.ExpectedException(
             webob.exc.HTTPBadRequest,
-            'Image is larger than instance type allows'):
+            "Instance type's disk is too small for requested image."):
                 self.controller.create(req, body)
 
     def test_create_instance_invalid_negative_min(self):
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 285261e18..f5c23ccee 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -4898,7 +4898,7 @@ class ComputeAPITestCase(BaseTestCase):
 
         self.stubs.Set(fake_image._FakeImageService, 'show', self.fake_show)
 
-        self.assertRaises(exception.ImageTooLarge,
+        self.assertRaises(exception.InstanceTypeDiskTooSmall,
             self.compute_api.create, self.context,
             inst_type, self.fake_image['id'])
 
@@ -5675,7 +5675,7 @@ class ComputeAPITestCase(BaseTestCase):
         self.fake_image['size'] = '1073741825'
         self.stubs.Set(fake_image._FakeImageService, 'show', self.fake_show)
 
-        self.assertRaises(exception.ImageTooLarge,
+        self.assertRaises(exception.InstanceTypeDiskTooSmall,
             self.compute_api.rebuild, self.context,
             instance, self.fake_image['id'], 'new_password')
 
@@ -9057,7 +9057,7 @@ class CheckRequestedImageTestCase(test.TestCase):
     def test_image_too_large(self):
         image = dict(id='123', status='active', size='1073741825')
 
-        self.assertRaises(exception.ImageTooLarge,
+        self.assertRaises(exception.InstanceTypeDiskTooSmall,
                 self.compute_api._check_requested_image, self.context,
                 image['id'], image, self.instance_type)
 
diff --git a/nova/tests/virt/libvirt/test_imagebackend.py b/nova/tests/virt/libvirt/test_imagebackend.py
index 6548ab76c..50aacba2f 100644
--- a/nova/tests/virt/libvirt/test_imagebackend.py
+++ b/nova/tests/virt/libvirt/test_imagebackend.py
@@ -284,8 +284,8 @@ class Qcow2TestCase(_ImageTestCase, test.TestCase):
         self.mox.ReplayAll()
 
         image = self.image_class(self.INSTANCE, self.NAME)
-        self.assertRaises(exception.ImageTooLarge, image.create_image, fn,
-                          self.TEMPLATE_PATH, 1)
+        self.assertRaises(exception.InstanceTypeDiskTooSmall,
+                          image.create_image, fn, self.TEMPLATE_PATH, 1)
         self.mox.VerifyAll()
 
 
diff --git a/nova/tests/virt/xenapi/test_vm_utils.py b/nova/tests/virt/xenapi/test_vm_utils.py
index 2180f75f9..57f031a4c 100644
--- a/nova/tests/virt/xenapi/test_vm_utils.py
+++ b/nova/tests/virt/xenapi/test_vm_utils.py
@@ -253,7 +253,7 @@ class FetchVhdImageTestCase(test.TestCase):
 
         self.mox.VerifyAll()
 
-    def test_fetch_vhd_image_cleans_up_vid_on_fail(self):
+    def test_fetch_vhd_image_cleans_up_vdi_on_fail(self):
         self._apply_stubouts()
         self._common_params_setup(True)
         self.mox.StubOutWithMock(self.session, 'call_xenapi')
@@ -267,15 +267,16 @@ class FetchVhdImageTestCase(test.TestCase):
         vm_utils.safe_find_sr(self.session).AndReturn("sr")
         vm_utils._scan_sr(self.session, "sr")
         vm_utils._check_vdi_size(self.context, self.session, self.instance,
-                                 "vdi").AndRaise(exception.ImageTooLarge)
+                "vdi").AndRaise(exception.InstanceTypeDiskTooSmall)
 
         self.session.call_xenapi("VDI.get_by_uuid", "vdi").AndReturn("ref")
         vm_utils.destroy_vdi(self.session, "ref")
 
         self.mox.ReplayAll()
 
-        self.assertRaises(exception.ImageTooLarge, vm_utils._fetch_vhd_image,
-            self.context, self.session, self.instance, self.image_id)
+        self.assertRaises(exception.InstanceTypeDiskTooSmall,
+                vm_utils._fetch_vhd_image, self.context, self.session,
+                self.instance, self.image_id)
 
         self.mox.VerifyAll()