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/tests/create_instance_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/tests/create_instance_tests.py')
| -rw-r--r-- | snaps/openstack/tests/create_instance_tests.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py index bc664fe..c7a6c83 100644 --- a/snaps/openstack/tests/create_instance_tests.py +++ b/snaps/openstack/tests/create_instance_tests.py @@ -24,6 +24,7 @@ from neutronclient.common.exceptions import InvalidIpForSubnetClient from novaclient.exceptions import BadRequest from snaps import file_utils +from snaps.config.volume import VolumeConfig from snaps.config.router import RouterConfig from snaps.config.keypair import KeypairConfig from snaps.openstack import create_network, create_router @@ -41,7 +42,7 @@ from snaps.openstack.create_router import OpenStackRouter from snaps.openstack.create_security_group import ( SecurityGroupSettings, OpenStackSecurityGroup, SecurityGroupRuleSettings, Direction, Protocol) -from snaps.openstack.create_volume import OpenStackVolume, VolumeSettings +from snaps.openstack.create_volume import OpenStackVolume from snaps.openstack.tests import openstack_tests, validation_utils from snaps.openstack.tests.os_source_file_test import ( OSIntegrationTestCase, OSComponentTestCase) @@ -2886,9 +2887,9 @@ class CreateInstanceVolumeTests(OSIntegrationTestCase): net_name=guid + '-pub-net', subnet_name=guid + '-pub-subnet', router_name=guid + '-pub-router', external_net=self.ext_net_name) - self.volume_settings1 = VolumeSettings( + self.volume_settings1 = VolumeConfig( name=self.__class__.__name__ + '-' + str(guid) + '-1') - self.volume_settings2 = VolumeSettings( + self.volume_settings2 = VolumeConfig( name=self.__class__.__name__ + '-' + str(guid) + '-2') # Initialize for tearDown() |