From: vitikkan <viktor.tikkanen@nokia.com>
Date: Tue, 23 Aug 2016 07:32:24 +0000 (+0300)
Subject: Create tempest resources before generating tempest.conf
X-Git-Tag: danube.1.RC1~489
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F19307%2F1;p=functest.git

Create tempest resources before generating tempest.conf

During generating tempest.conf file rally tries to download
cirros image from the internet if no suitable images exist in
the configuration. This change ensures that cirros image is
created before generating tempest.conf file.

JIRA: FUNCTEST-195

Change-Id: I9e2df8af40bd02db9b78b8b6b730b4f4168a8b2d
Signed-off-by: vitikkan <viktor.tikkanen@nokia.com>
---

diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index c143fffae..7d023f5df 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -423,6 +423,7 @@ def main():
         os.makedirs(TEMPEST_RESULTS_DIR)
 
     deployment_dir = ft_utils.get_deployment_dir(logger)
+    create_tempest_resources()
 
     if "" == args.conf:
         MODE = ""
@@ -430,7 +431,6 @@ def main():
     else:
         MODE = " --tempest-config " + args.conf
 
-    create_tempest_resources()
     generate_test_list(deployment_dir, args.mode)
     apply_tempest_blacklist()