diff options
author | xudan <xudan16@huawei.com> | 2018-05-29 02:42:11 -0400 |
---|---|---|
committer | xudan <xudan16@huawei.com> | 2018-06-14 00:00:34 -0400 |
commit | 46754323aeac6193dd9b451a6525a478fdb0887b (patch) | |
tree | 8ddca633d4093347bcf3f6fb64b702262cf6c668 /dovetail/utils/dovetail_config.py | |
parent | 71f945d3e3ca38e4a954a6475234e176e150d2f7 (diff) |
Replace openstack commands with shade
Use openstack shade to get endpoint infomation rather than executing
openstack commands directly.
The next step can replace openstack commands by shade for some test cases that
need to create openstack resources (images, flavors) if we agree to use shade.
JIRA: DOVETAIL-659
Change-Id: I72b302fb2d4a61e9249a7e53f81ea9464944dcd3
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/utils/dovetail_config.py')
-rw-r--r-- | dovetail/utils/dovetail_config.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/dovetail/utils/dovetail_config.py b/dovetail/utils/dovetail_config.py index 394bcf73..67ad9612 100644 --- a/dovetail/utils/dovetail_config.py +++ b/dovetail/utils/dovetail_config.py @@ -21,17 +21,10 @@ class DovetailConfig(object): cls.dovetail_config = yaml.safe_load(f) for extra_config_file in cls.dovetail_config['include_config']: - - # The yardstick and bottlenecks config files are with Jinja2. - # They need to be parsed later. - # All other config files should be transfer to like this gradually. - if extra_config_file.startswith(("yardstick", "bottlenecks")): - continue - else: - file_path = os.path.join(conf_path, extra_config_file) - with open(file_path) as f: - extra_config = yaml.safe_load(f) - cls.dovetail_config.update(extra_config) + file_path = os.path.join(conf_path, extra_config_file) + with open(file_path) as f: + extra_config = yaml.safe_load(f) + cls.dovetail_config.update(extra_config) path = os.path.join(conf_path, cls.dovetail_config['cli_file_name']) with open(path) as f: |