diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2015-12-24 17:51:58 +0100 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2016-01-11 08:37:18 +0000 |
| commit | 3b77d41aeeb81a645b163d2b23d62a5302e41cfd (patch) | |
| tree | 56f13e12de318d4dedb28936adfff7fb967c7ba5 /testcases/VIM/OpenStack/CI/libraries/clean_openstack.py | |
| parent | 4b3e441feecfaa03c5526b0cc1a2561461de3673 (diff) | |
Move openstack defaults to a yaml file
Change-Id: I52a9304dff987f33265c47ba5510f9f96afe0a5a
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
(cherry picked from commit 367f8f2ab9fccbd9ce0566598ef00cad745a296a)
Diffstat (limited to 'testcases/VIM/OpenStack/CI/libraries/clean_openstack.py')
| -rw-r--r-- | testcases/VIM/OpenStack/CI/libraries/clean_openstack.py | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py index dca188f5b..fe11861fa 100644 --- a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py +++ b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py @@ -20,6 +20,7 @@ import os import re import sys import time +import yaml import novaclient.v2.client as novaclient from neutronclient.v2_0 import client as neutronclient @@ -52,14 +53,20 @@ if not os.path.exists(REPO_PATH): sys.path.append(REPO_PATH + "testcases/") import functest_utils -default_images = ['TestVM'] -default_networks = ['net04', 'net04_ext', 'functest-net', 'ext-net'] -default_routers = ['router04', 'functest-router'] -default_users = ["heat", "heat-cfn", "cinder", "nova", "swift", "glance", - "neutron", "admin", "fuel_stats_user", "quantum", "heat-cfn_heat", - "ceilometer", "cinder_cinderv2", "demo"] -default_tenants = ["admin", "services", "service", "demo"] -default_security_groups = ['default'] +with open("os_defaults.yaml") as f: + defaults_yaml = yaml.safe_load(f) +f.close() + +installer = os.environ["INSTALLER_TYPE"] + +default_images = defaults_yaml.get(installer).get("images") +default_networks = defaults_yaml.get(installer).get("networks") +\ + defaults_yaml.get("common").get("networks") +default_routers = defaults_yaml.get(installer).get("routers") +\ + defaults_yaml.get("common").get("routers") +default_security_groups = defaults_yaml.get(installer).get("security_groups") +default_users = defaults_yaml.get(installer).get("users") +default_tenants = defaults_yaml.get(installer).get("tenants") def separator(): logger.debug("-------------------------------------------") |