X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Fenv_prepare%2Fstack_prepare.py;h=9830884952323890167a67e97ca42c15fc7f5ed6;hb=adf6a02bae295455f584ebab762592dd57e2422c;hp=ce8da619ab8db440d611e6d23b0abc849b84c17d;hpb=b26f701ab2327497b0e44f548ea18e24b1e6b0d9;p=bottlenecks.git

diff --git a/utils/env_prepare/stack_prepare.py b/utils/env_prepare/stack_prepare.py
index ce8da619..98308849 100644
--- a/utils/env_prepare/stack_prepare.py
+++ b/utils/env_prepare/stack_prepare.py
@@ -14,6 +14,7 @@ from utils.logger import Logger
 from utils.parser import Parser as config
 import utils.infra_setup.heat.manager as utils
 import utils.infra_setup.runner.docker_env as docker_env
+import utils.infra_setup.heat.manager as client_manager
 
 LOG = Logger(__name__).getLogger()
 
@@ -32,9 +33,9 @@ def _prepare_env_daemon(test_yardstick):
     if not os.environ.get("EXTERNAL_NETWORK"):
         _append_external_network(rc_file)
     if test_yardstick:
+        yardstick_contain = docker_env.yardstick_info["container"]
         cmd = "cp %s %s" % (rc_file,
                             config.bottlenecks_config["yardstick_rc_dir"])
-        yardstick_contain = docker_env.yardstick_info["container"]
         docker_env.docker_exec_cmd(yardstick_contain,
                                    cmd)
 
@@ -73,7 +74,9 @@ def _source_file(rc_file):
     p = subprocess.Popen(". %s; env" % rc_file, stdout=subprocess.PIPE,
                          shell=True)
     output = p.communicate()[0]
-    env = dict((line.split('=', 1) for line in output.splitlines()))
+    output_lines = output.splitlines()
+    del output_lines[5]
+    env = dict((line.split('=', 1) for line in output_lines))
     os.environ.update(env)
     return env
 
@@ -93,3 +96,30 @@ def _append_external_network(rc_file):
         except OSError as e:
             if e.errno != errno.EEXIST:
                 raise
+
+
+def prepare_image(image_name, image_dir):
+    glance_client = client_manager._get_glance_client()
+    if not os.path.isfile(image_dir):
+        LOG.error("Error: file %s does not exist.", image_dir)
+        return None
+    try:
+        images = glance_client.images.list()
+        image_id = next((i.id for i in images if i.name == image_name), None)
+        if image_id is not None:
+            LOG.info("Image %s already exists.", image_name)
+        else:
+            LOG.info("Creating image '%s' from '%s'...", image_name, image_dir)
+
+            image = glance_client.images.create(
+                name=image_name, visibility="public", disk_format="qcow2",
+                container_format="bare")
+            image_id = image.id
+            with open(image_dir) as image_data:
+                glance_client.images.upload(image_id, image_data)
+        return image_id
+    except Exception:  # pylint: disable=broad-except
+        LOG.error(
+            "Error [create_glance_image(glance_client, '%s', '%s')]",
+            image_name, image_dir)
+        return None