x/fuel-ccp-tests
Code Issues Proposed changes

Merge "Use environment name in snapshot config names"

Browse Source
This commit is contained in:
Jenkins
2016-09-15 16:13:04 +00:00
committed by Gerrit Code Review
parent 029eb85a23 fa2d7fc54b
commit b144fcc289
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fuel_ccp_tests/managers/envmanager_devops.py
View File

@@ -142,7 +142,7 @@ class EnvironmentManager(object):
self._env.resume()
else:
raise exceptions.EnvironmentIsNotSet()
settings_oslo.save_config(self.__config, name)
settings_oslo.save_config(self.__config, name, self._env.name)
def revert_snapshot(self, name):
"""Revert snapshot by name
@@ -163,7 +163,8 @@ class EnvironmentManager(object):
raise exceptions.EnvironmentIsNotSet()
try:
settings_oslo.reload_snapshot_config(self.__config, name)
settings_oslo.reload_snapshot_config(self.__config, name,
self._env.name)
except cfg.ConfigFilesNotFoundError as conf_err:
LOG.error("Config file(s) {0} not found!".format(
conf_err.config_files))

12
fuel_ccp_tests/settings_oslo.py
View File

@@ -151,10 +151,12 @@ def load_config(config_files):
return config
def reload_snapshot_config(config, snapshot_name):
def reload_snapshot_config(config, snapshot_name, env_name=None):
"""Reset config to the state from test_config file"""
if env_name is None:
env_name = 'config'
test_config_path = os.path.join(
settings.LOGS_DIR, 'config_{0}.ini'.format(snapshot_name))
settings.LOGS_DIR, '{0}_{1}.ini'.format(env_name, snapshot_name))
config(args=[], default_config_files=[test_config_path])
return config
@@ -179,9 +181,11 @@ def list_current_opts(config):
return result_opts
def save_config(config, snapshot_name):
def save_config(config, snapshot_name, env_name=None):
if env_name is None:
env_name = 'config'
test_config_path = os.path.join(
settings.LOGS_DIR, 'config_{0}.ini'.format(snapshot_name))
settings.LOGS_DIR, '{0}_{1}.ini'.format(env_name, snapshot_name))
with open(test_config_path, 'w') as output_file:
formatter = generator._OptFormatter(output_file=output_file)