diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-05-23 20:58:42 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-05-30 09:45:59 +0200 |
commit | 49a7e57f112d855b0609721b6082b15a94417380 (patch) | |
tree | 06ae633c210b9f5857edbdeac94792e7699af720 /functest/utils/openstack_clean.py | |
parent | bec2511a842a37429b8343dc5f83b11d96dd47b8 (diff) |
Define create_snapshot() and clean() in TestCase
They replace the former calls in run_tests which are not suitable for all
test cases. Now any test case can define how to clean its resources.
If the snapshot cannot be created, the test case is considered as
failed. Only a message is printed if any failure during cleaning.
It also defines a new class called OSGCTestCase useful for test cases
which don't clean their OpenStack resources.
All test cases located in opnfv_tests/openstack inherit from it to
keep the global behavior unchanged.
It also deletes exit instructions in openstack_clean and
openstack_snapshot, removes clean flags in testcases.yaml and updates
the related utils.
All Docs are modified as well.
JIRA: FUNCTEST-438
Change-Id: I8938e6255708012380389763a24059ace4ce45d8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/utils/openstack_clean.py')
-rwxr-xr-x | functest/utils/openstack_clean.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/functest/utils/openstack_clean.py b/functest/utils/openstack_clean.py index 29106d9e..cdd91852 100755 --- a/functest/utils/openstack_clean.py +++ b/functest/utils/openstack_clean.py @@ -22,9 +22,9 @@ # http://www.apache.org/licenses/LICENSE-2.0 # -import time - import logging +import sys +import time import yaml import functest.utils.openstack_utils as os_utils @@ -392,7 +392,7 @@ def main(): except Exception: logger.info("The file %s does not exist. The OpenStack snapshot must" " be created first. Aborting cleanup." % OS_SNAPSHOT_FILE) - exit(0) + return 0 default_images = snapshot_yaml.get('images') default_instances = snapshot_yaml.get('instances') @@ -407,7 +407,7 @@ def main(): if not os_utils.check_credentials(): logger.error("Please source the openrc credentials and run " "the script again.") - exit(-1) + return -1 remove_instances(nova_client, default_instances) separator() @@ -429,4 +429,4 @@ def main(): if __name__ == '__main__': logging.basicConfig() - main() + sys.exit(main()) |