diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-08 16:40:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-08 16:40:34 +0000 |
| commit | 9d19d1ff0bf7a5aada78bfc86cae831bcec86cc9 (patch) | |
| tree | 9f107cc19478ff179ec148e48e58fafde651f53b /testcases/OpenStack/examples/create_instance_and_ip.py | |
| parent | 4bd8e5f735562c38ad90c411f74f642c6e3ec73f (diff) | |
| parent | 55d301a2622ff5b63d431b9272caa68224d53843 (diff) | |
Merge "make use of functest_utils.get_parameter_from_yaml"
Diffstat (limited to 'testcases/OpenStack/examples/create_instance_and_ip.py')
| -rwxr-xr-x | testcases/OpenStack/examples/create_instance_and_ip.py | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/testcases/OpenStack/examples/create_instance_and_ip.py b/testcases/OpenStack/examples/create_instance_and_ip.py index 3d41e5dde..50cdf8a57 100755 --- a/testcases/OpenStack/examples/create_instance_and_ip.py +++ b/testcases/OpenStack/examples/create_instance_and_ip.py @@ -32,33 +32,30 @@ HOME = os.environ['HOME'] + "/" VM_BOOT_TIMEOUT = 180 -INSTANCE_NAME = ft_utils.get_parameter_from_yaml("example.example_vm_name") -FLAVOR = ft_utils.get_parameter_from_yaml("example.example_flavor") -IMAGE_NAME = ft_utils.get_parameter_from_yaml("example.example_image_name") -IMAGE_FILENAME = ft_utils.get_parameter_from_yaml( - "general.openstack.image_file_name") -IMAGE_FORMAT = ft_utils.get_parameter_from_yaml( - "general.openstack.image_disk_format") -IMAGE_PATH = ft_utils.get_parameter_from_yaml( - "general.directories.dir_functest_data") + "/" + IMAGE_FILENAME +INSTANCE_NAME = ft_utils.get_functest_config("example.example_vm_name") +FLAVOR = ft_utils.get_functest_config("example.example_flavor") +IMAGE_NAME = ft_utils.get_functest_config("example.example_image_name") +IMAGE_FILENAME = \ + ft_utils.get_functest_config("general.openstack.image_file_name") +IMAGE_FORMAT = \ + ft_utils.get_functest_config("general.openstack.image_disk_format") +IMAGE_PATH = \ + ft_utils.get_functest_config("general.directories.dir_functest_data") + \ + "/" + IMAGE_FILENAME # NEUTRON Private Network parameters -NET_NAME = ft_utils.get_parameter_from_yaml( - "example.example_private_net_name") -SUBNET_NAME = ft_utils.get_parameter_from_yaml( - "example.example_private_subnet_name") -SUBNET_CIDR = ft_utils.get_parameter_from_yaml( - "example.example_private_subnet_cidr") -ROUTER_NAME = ft_utils.get_parameter_from_yaml( - "example.example_router_name") - -SECGROUP_NAME = ft_utils.get_parameter_from_yaml( - "example.example_sg_name") -SECGROUP_DESCR = ft_utils.get_parameter_from_yaml( - "example.example_sg_descr") - -TEST_DB = ft_utils.get_parameter_from_yaml("results.test_db_url") +NET_NAME = ft_utils.get_functest_config("example.example_private_net_name") +SUBNET_NAME = \ + ft_utils.get_functest_config("example.example_private_subnet_name") +SUBNET_CIDR = \ + ft_utils.get_functest_config("example.example_private_subnet_cidr") +ROUTER_NAME = ft_utils.get_functest_config("example.example_router_name") + +SECGROUP_NAME = ft_utils.get_functest_config("example.example_sg_name") +SECGROUP_DESCR = ft_utils.get_functest_config("example.example_sg_descr") + +TEST_DB = ft_utils.get_functest_config("results.test_db_url") def main(): |