summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-05-04 11:47:40 +0200
committerjose.lausuch <jose.lausuch@ericsson.com>2016-05-04 14:35:07 +0200
commit6790e17eb7c1a3eaaccfe97ac90932e3c15eea6d (patch)
tree06697206e1323dd3acdce742a2e1e5d5bb4b232f /utils
parent7ad2ce42a2bc2c8dc17fbc9423da71a95fed4d87 (diff)
Refactor improvements
JIRA: FUNCTEST-190 - Deleted unnecessary old scripts - Fixed healtcheck logging - Moved config_functest.yaml to /ci/ - Created env var CONFIG_FUNCTEST_YAML pointing to that new location - Modified all scripts which open config_functest.yaml using the new env var Change-Id: Ic4f0e40a70c02ac08287a1d621956f602bdee177 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/clean_openstack0
-rw-r--r--utils/clean_openstack.py7
-rw-r--r--utils/generate_defaults.py4
3 files changed, 6 insertions, 5 deletions
diff --git a/utils/clean_openstack b/utils/clean_openstack
deleted file mode 100644
index e69de29bb..000000000
--- a/utils/clean_openstack
+++ /dev/null
diff --git a/utils/clean_openstack.py b/utils/clean_openstack.py
index 3d7597e07..4ad5d5bb0 100644
--- a/utils/clean_openstack.py
+++ b/utils/clean_openstack.py
@@ -34,7 +34,7 @@ import functest.utils.openstack_utils as os_utils
""" logging configuration """
-logger = ft_logger.Logger("run_rally").getLogger()
+logger = ft_logger.Logger("clean_openstack").getLogger()
REPO_PATH = os.environ['repos_dir'] + '/functest/'
@@ -374,6 +374,9 @@ def remove_tenants(keystone_client):
def main():
+ logger.info("+++++++++++++++++++++++++++++++")
+ logger.info("Cleaning OpenStack resources...")
+ logger.info("+++++++++++++++++++++++++++++++")
creds_nova = os_utils.get_credentials("nova")
nova_client = novaclient.Client('2', **creds_nova)
@@ -413,8 +416,6 @@ def main():
remove_tenants(keystone_client)
separator()
- exit(0)
-
if __name__ == '__main__':
main()
diff --git a/utils/generate_defaults.py b/utils/generate_defaults.py
index 0a1e498f6..35b9ed305 100644
--- a/utils/generate_defaults.py
+++ b/utils/generate_defaults.py
@@ -175,8 +175,8 @@ def main():
with open(DEFAULTS_FILE, 'w+') as yaml_file:
yaml_file.write(yaml.safe_dump(defaults, default_flow_style=False))
yaml_file.seek(0)
- logger.debug("Openstack Defaults found in the deployment:")
- print yaml_file.read()
+ logger.info("Openstack Defaults found in the deployment:\n%s"
+ % yaml_file.read())
logger.debug("NOTE: These objects will NOT be deleted after " +
"running the tests.")