X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=testcases%2FVIM%2FOpenStack%2FCI%2Flibraries%2Fclean_openstack.py;h=4f950b228e4cc7b50e2f871d3e8e058d481c4d1e;hb=c516da5ea4640116d40631924f5e2ec6cbc05863;hp=dca188f5bd6db6cd7a6f4eca1738cd315aba11ab;hpb=4f7e44541bd8c1d20d547891170e48e521f5db3c;p=functest.git

diff --git a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
index dca188f5b..4f950b228 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(REPO_PATH+"testcases/VIM/OpenStack/CI/libraries/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("-------------------------------------------")