Merge "Change namespace for Cinder resources and tests"

heat/tests/aws/test_volume.py

@@ -27,7 +27,7 @@ from heat.engine.resources.aws.ec2 import instance
 from heat.engine.resources.aws.ec2 import volume as aws_vol
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
-from heat.tests.cinder import test_volume_utils as vt_base
+from heat.tests.openstack.cinder import test_volume_utils as vt_base
 from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 

heat/tests/openstack/cinder/test_volume.py

@@ -28,7 +28,7 @@ from heat.engine.resources import scheduler_hints as sh
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.objects import resource_data as resource_data_object
-from heat.tests.cinder import test_volume_utils as vt_base
+from heat.tests.openstack.cinder import test_volume_utils as vt_base
 from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 

heat/tests/openstack/cinder/test_volume_type.py

@@ -15,7 +15,7 @@ import mock
 import six
 
 from heat.common import exception
-from heat.engine.resources.openstack.cinder import cinder_volume_type
+from heat.engine.resources.openstack.cinder import volume_type
 from heat.engine import stack
 from heat.engine import template
 from heat.tests import common
@@ -56,12 +56,12 @@ class CinderVolumeTypeTest(common.HeatTestCase):
         self.my_volume_type.keystone.return_value = self.keystoneclient
 
     def test_resource_mapping(self):
-        mapping = cinder_volume_type.resource_mapping()
+        mapping = volume_type.resource_mapping()
         self.assertEqual(1, len(mapping))
-        self.assertEqual(cinder_volume_type.CinderVolumeType,
+        self.assertEqual(volume_type.CinderVolumeType,
                          mapping['OS::Cinder::VolumeType'])
         self.assertIsInstance(self.my_volume_type,
-                              cinder_volume_type.CinderVolumeType)
+                              volume_type.CinderVolumeType)
 
     def _test_handle_create(self, is_public=True, projects=None):
         value = mock.MagicMock()

heat/tests/openstack/cinder/test_volume_type_encryption.py

@@ -13,7 +13,7 @@
 
 import mock
 
-from heat.engine.resources.openstack.cinder import cinder_encrypted_vol_type
+from heat.engine.resources.openstack.cinder import encrypted_volume_type
 from heat.engine import stack
 from heat.engine import template
 from heat.tests import common
@@ -56,13 +56,13 @@ class CinderEncryptedVolumeTypeTest(common.HeatTestCase):
             self.cinderclient.volume_encryption_types
 
     def test_resource_mapping(self):
-        mapping = cinder_encrypted_vol_type.resource_mapping()
+        mapping = encrypted_volume_type.resource_mapping()
         self.assertEqual(1, len(mapping))
-        self.assertEqual(cinder_encrypted_vol_type.CinderEncryptedVolumeType,
+        self.assertEqual(encrypted_volume_type.CinderEncryptedVolumeType,
                          mapping['OS::Cinder::EncryptedVolumeType'])
         self.assertIsInstance(
             self.my_encrypted_vol_type,
-            cinder_encrypted_vol_type.CinderEncryptedVolumeType
+            encrypted_volume_type.CinderEncryptedVolumeType
         )
 
     def test_handle_create(self):