diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-11-22 12:43:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-22 12:43:56 +0000 |
| commit | 01a5192428eb99afcb94047e6faa54e1d57114d1 (patch) | |
| tree | d6c0b1aa427a2162edc5ed10cf8d4d9b1b6100ef /functest/opnfv_tests/openstack/vping/vping_userdata.py | |
| parent | 185dbcfb6ed774cc2f0478b05041d9e3a4e2f303 (diff) | |
| parent | c36f96b80c00a23164a194c6c74d7281c9835e12 (diff) | |
Merge "Removal of deprecated SNAPS-OO classes."
Diffstat (limited to 'functest/opnfv_tests/openstack/vping/vping_userdata.py')
| -rw-r--r-- | functest/opnfv_tests/openstack/vping/vping_userdata.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py index deaacfcc..4cc8f42f 100644 --- a/functest/opnfv_tests/openstack/vping/vping_userdata.py +++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py @@ -9,9 +9,9 @@ import time +from snaps.config.network import PortConfig +from snaps.config.vm_inst import VmInstanceConfig from snaps.openstack.utils import deploy_utils -from snaps.openstack.create_instance import VmInstanceSettings -from snaps.openstack.create_network import PortSettings from functest.core.testcase import TestCase from functest.opnfv_tests.openstack.vping import vping_base @@ -37,10 +37,10 @@ class VPingUserdata(vping_base.VPingBase): super(VPingUserdata, self).run() # Creating Instance 1 - port1_settings = PortSettings( + port1_settings = PortConfig( name=self.vm1_name + '-vPingPort', network_name=self.network_creator.network_settings.name) - instance1_settings = VmInstanceSettings( + instance1_settings = VmInstanceConfig( name=self.vm1_name, flavor=self.flavor_name, vm_boot_timeout=self.vm_boot_timeout, @@ -58,10 +58,10 @@ class VPingUserdata(vping_base.VPingBase): self.vm1_creator.get_port_ip(port1_settings.name)) if userdata: # Creating Instance 2 - port2_settings = PortSettings( + port2_settings = PortConfig( name=self.vm2_name + '-vPingPort', network_name=self.network_creator.network_settings.name) - instance2_settings = VmInstanceSettings( + instance2_settings = VmInstanceConfig( name=self.vm2_name, flavor=self.flavor_name, vm_boot_timeout=self.vm_boot_timeout, |