diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-11-17 14:54:46 -0700 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-11-20 10:36:28 -0700 |
| commit | 1d7f4a18cf4a070570beccbb46303f5822840c41 (patch) | |
| tree | a17c6b16bfc508a34b3c5a6e5bca2843efdb4ac2 /snaps/openstack/utils/tests/cinder_utils_tests.py | |
| parent | 3c387ae1c18c4a80a752c3e5a2409f4a602b9e20 (diff) | |
Refactoring of VolumeSettings to extend VolumeConfig
VolumeSettings and cinder_utils have a runtime cyclical
dependency. This patch reduces this dependency and
deprecates the VolumeSettings class.
JIRA: SNAPS-227
Change-Id: I3f93702ff836af365c811d44bfd0e59b76c3f1f5
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/utils/tests/cinder_utils_tests.py')
| -rw-r--r-- | snaps/openstack/utils/tests/cinder_utils_tests.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/snaps/openstack/utils/tests/cinder_utils_tests.py b/snaps/openstack/utils/tests/cinder_utils_tests.py index e8c31db..b624b09 100644 --- a/snaps/openstack/utils/tests/cinder_utils_tests.py +++ b/snaps/openstack/utils/tests/cinder_utils_tests.py @@ -18,11 +18,12 @@ import uuid import time from cinderclient.exceptions import NotFound, BadRequest +from snaps.config.volume import VolumeConfig from snaps.config.volume_type import ( VolumeTypeConfig, ControlLocation, VolumeTypeEncryptionConfig) from snaps.config.qos import Consumer, QoSConfig from snaps.openstack import create_volume -from snaps.openstack.create_volume import VolumeSettings +from snaps.openstack.create_qos import Consumer from snaps.openstack.tests import validation_utils from snaps.openstack.tests.os_source_file_test import OSComponentTestCase from snaps.openstack.utils import cinder_utils @@ -91,7 +92,7 @@ class CinderUtilsVolumeTests(OSComponentTestCase): """ Tests the cinder_utils.create_volume() """ - volume_settings = VolumeSettings(name=self.volume_name) + volume_settings = VolumeConfig(name=self.volume_name) self.volume = cinder_utils.create_volume( self.cinder, volume_settings) self.assertIsNotNone(self.volume) @@ -108,7 +109,7 @@ class CinderUtilsVolumeTests(OSComponentTestCase): """ Tests the cinder_utils.create_volume() """ - volume_settings = VolumeSettings(name=self.volume_name) + volume_settings = VolumeConfig(name=self.volume_name) self.volume = cinder_utils.create_volume( self.cinder, volume_settings) self.assertIsNotNone(self.volume) |