diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-11-20 13:51:18 -0700 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-11-20 13:51:18 -0700 |
| commit | 594e4d2b15dcf59fc7dc1b8380b096382a0b1cb1 (patch) | |
| tree | e6fc560f93257f5e2d142a6099993830cd5a479f /snaps/provisioning | |
| parent | 6d6a6d72ca1050525010bbb9c2569b85e050ad62 (diff) | |
Refactoring of VmInstanceSettings to extend VmInstanceConfig
VmInstanceSettings, FloatingIPSettings and nova_utils have a
runtime cyclical dependency. This patch reduces this dependency and
deprecates the VmInstanceSettings and FloatingIPSettings class with
snaps.config.vm_inst VmInstanceConfig and FloatingIpConfg classes
JIRA: SNAPS-218
Change-Id: I95688130256bca1df4a5c347bdb741019ae0937e
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/provisioning')
| -rw-r--r-- | snaps/provisioning/tests/ansible_utils_tests.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py index b78249e..0e55f1f 100644 --- a/snaps/provisioning/tests/ansible_utils_tests.py +++ b/snaps/provisioning/tests/ansible_utils_tests.py @@ -22,6 +22,7 @@ from scp import SCPClient from snaps.config.flavor import FlavorConfig from snaps.config.keypair import KeypairConfig from snaps.config.network import PortConfig +from snaps.config.vm_inst import VmInstanceConfig, FloatingIpConfig from snaps.openstack import create_flavor from snaps.openstack import create_image @@ -141,11 +142,11 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): name=self.port_1_name, network_name=self.pub_net_config.network_settings.name)) - instance_settings = create_instance.VmInstanceSettings( + instance_settings = VmInstanceConfig( name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=ports_settings, - floating_ip_settings=[create_instance.FloatingIpSettings( + floating_ip_settings=[FloatingIpConfig( name=self.floating_ip_name, port_name=self.port_1_name, router_name=self.pub_net_config.router_settings.name)]) |