aboutsummaryrefslogtreecommitdiffstats
path: root/functest/utils
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-05-30 15:02:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-30 15:02:06 +0000
commita28e2b40877f022f6cc8bbc3ad9b586ef3dd126c (patch)
tree015109b1867976702a2e90b050d00af0174f2b73 /functest/utils
parent8628e8f2bb97f4528767710ec8fdec5ea3643738 (diff)
parent49a7e57f112d855b0609721b6082b15a94417380 (diff)
Merge "Define create_snapshot() and clean() in TestCase"
Diffstat (limited to 'functest/utils')
-rwxr-xr-xfunctest/utils/openstack_clean.py10
-rwxr-xr-xfunctest/utils/openstack_snapshot.py5
2 files changed, 8 insertions, 7 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())
diff --git a/functest/utils/openstack_snapshot.py b/functest/utils/openstack_snapshot.py
index 952fb7bb..8f1d3b9b 100755
--- a/functest/utils/openstack_snapshot.py
+++ b/functest/utils/openstack_snapshot.py
@@ -22,6 +22,7 @@
import logging
import yaml
+import sys
import functest.utils.openstack_utils as os_utils
from functest.utils.constants import CONST
@@ -139,7 +140,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
snapshot = {}
snapshot.update(get_instances(nova_client))
@@ -163,4 +164,4 @@ def main():
if __name__ == '__main__':
logging.basicConfig()
- main()
+ sys.exit(main())