From: Vipin Balachandran <vbala@vmware.com>
Date: Fri, 26 Jun 2015 12:23:26 +0000 (+0530)
Subject: Move volume.api test to correct location
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=833559e956984e465bd9acd0807cf1c8a8bb03af;p=openstack-build%2Fcinder-build.git

Move volume.api test to correct location

Test test_create_volume_with_consistencygroup_invalid_type in
tests.unit.api.v2.test_volumes is verifying consistency group
logic in cinder.volumes.api. This patch moves this test to
tests.unit.test_volume.py.

Change-Id: I0027f03fd084fd490c43e6a957f84a57de7523a6
---

diff --git a/cinder/tests/unit/api/v2/test_volumes.py b/cinder/tests/unit/api/v2/test_volumes.py
index a25032767..94a6b34e4 100644
--- a/cinder/tests/unit/api/v2/test_volumes.py
+++ b/cinder/tests/unit/api/v2/test_volumes.py
@@ -113,36 +113,6 @@ class VolumeApiTest(test.TestCase):
                          'encrypted': False}}
         self.assertEqual(res_dict, ex)
 
-    def test_volume_create_with_consistencygroup_invalid_type(self):
-        ctxt = context.RequestContext('fake', 'fake', auth_token=True)
-        vol_type = db.volume_type_create(
-            context.get_admin_context(),
-            dict(name=CONF.default_volume_type, extra_specs={})
-        )
-        db_vol_type = db.volume_type_get(context.get_admin_context(),
-                                         vol_type.id)
-        cg = {
-            'id': '1',
-            'name': 'cg1',
-            'volume_type_id': db_vol_type['id'],
-        }
-        fake_type = {
-            'id': '9999',
-            'name': 'fake',
-        }
-        vol_api = volume_api.API()
-
-        self.assertRaises(exception.InvalidInput,
-                          vol_api.create,
-                          ctxt, 1, 'vol1', 'volume 1',
-                          consistencygroup=cg)
-
-        self.assertRaises(exception.InvalidInput,
-                          vol_api.create,
-                          ctxt, 1, 'vol1', 'volume 1',
-                          volume_type=fake_type,
-                          consistencygroup=cg)
-
     def test_volume_create_with_type(self):
         vol_type = db.volume_type_create(
             context.get_admin_context(),
diff --git a/cinder/tests/unit/test_volume.py b/cinder/tests/unit/test_volume.py
index 4765edb63..d42bd2040 100644
--- a/cinder/tests/unit/test_volume.py
+++ b/cinder/tests/unit/test_volume.py
@@ -5243,6 +5243,39 @@ class VolumeTestCase(BaseVolumeTestCase):
         volume = db.volume_get(context.get_admin_context(), test_vol_id)
         self.assertEqual('error', volume['status'])
 
+    def test_create_volume_with_consistencygroup_invalid_type(self):
+        """Test volume creation with ConsistencyGroup & invalid volume type."""
+        vol_type = db.volume_type_create(
+            context.get_admin_context(),
+            dict(name=conf_fixture.def_vol_type, extra_specs={})
+        )
+        db_vol_type = db.volume_type_get(context.get_admin_context(),
+                                         vol_type.id)
+        cg = {
+            'id': '1',
+            'name': 'cg1',
+            'volume_type_id': db_vol_type['id'],
+        }
+        fake_type = {
+            'id': '9999',
+            'name': 'fake',
+        }
+        vol_api = cinder.volume.api.API()
+
+        # Volume type must be provided when creating a volume in a
+        # consistency group.
+        self.assertRaises(exception.InvalidInput,
+                          vol_api.create,
+                          self.context, 1, 'vol1', 'volume 1',
+                          consistencygroup=cg)
+
+        # Volume type must be valid.
+        self.assertRaises(exception.InvalidInput,
+                          vol_api.create,
+                          self.context, 1, 'vol1', 'volume 1',
+                          volume_type=fake_type,
+                          consistencygroup=cg)
+
 
 class CopyVolumeToImageTestCase(BaseVolumeTestCase):
     def fake_local_path(self, volume):