bottlenecks offiline support

JIRA: BOTTLENECK-224

This patch for bottlenecks support offiline.
By use some offiline image rather than yardstick env prepare.
This will solve some problem happened in yardstick image builder.

Change-Id: I62b6606570c2ea6ce365212c79777af01c47c9a6
Signed-off-by: liyin <liyin11@huawei.com>

5 files changed, 50 insertions, 12 deletions

diff --git a/utils/env_prepare/stack_prepare.py b/utils/env_prepare/stack_prepare.py
index 640afa13..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()
 
@@ -37,16 +38,6 @@ def _prepare_env_daemon(test_yardstick):
                             config.bottlenecks_config["yardstick_rc_dir"])
         docker_env.docker_exec_cmd(yardstick_contain,
                                    cmd)
-        file_orig = ("/home/opnfv/repos/yardstick/etc"
-                     "/yardstick/yardstick.conf.sample")
-        file_after = "/etc/yardstick/yardstick.conf"
-        cmd = "cp %s %s" % (file_orig,
-                            file_after)
-        docker_env.docker_exec_cmd(yardstick_contain,
-                                   cmd)
-        cmd = "sed -i '12s/http/file/g' /etc/yardstick/yardstick.conf"
-        docker_env.docker_exec_cmd(yardstick_contain,
-                                   cmd)
 
     # update the external_network
     _source_file(rc_file)
@@ -105,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
diff --git a/utils/infra_setup/heat/manager.py b/utils/infra_setup/heat/manager.py
index 5c181ae6..1a360b78 100644
--- a/utils/infra_setup/heat/manager.py
+++ b/utils/infra_setup/heat/manager.py
@@ -35,7 +35,7 @@ def _get_neutron_client():
     return neutron_client
 
 
-def stack_create_images(
+def create_images(
         imagefile=None,
         image_name="bottlenecks_image"):
     print "========== Create image in OS =========="
diff --git a/utils/infra_setup/runner/docker_env.py b/utils/infra_setup/runner/docker_env.py
index 54478ffc..438d3d19 100644
--- a/utils/infra_setup/runner/docker_env.py
+++ b/utils/infra_setup/runner/docker_env.py
@@ -45,7 +45,7 @@ def env_yardstick(docker_name):
     volume = get_self_volume()
     yardstick_tag = os.getenv("Yardstick_TAG")
     if yardstick_tag is None:
-        yardstick_tag = "danube.3.1"
+        yardstick_tag = "latest"
     env_docker = client.containers.run(image="opnfv/yardstick:%s"
                                              % yardstick_tag,
                                        privileged=True,
diff --git a/utils/infra_setup/runner/yardstick.py b/utils/infra_setup/runner/yardstick.py
index 559b9c10..616bcc52 100644
--- a/utils/infra_setup/runner/yardstick.py
+++ b/utils/infra_setup/runner/yardstick.py
@@ -15,15 +15,27 @@ At present, This file contain the following function:
 4.how the process of task.'''
 
 import sys
+import os
 import time
 import requests
 import json
+import urllib
 import utils.logger as logger
+from utils.parser import Parser as config
+import utils.env_prepare.stack_prepare as env
 
 headers = {"Content-Type": "application/json"}
 LOG = logger.Logger(__name__).getLogger()
 
 
+def yardstick_image_prepare():
+    if not os.path.exists(config.bottlenecks_config["yardstick_image_dir"]):
+        urllib.urlretrieve(config.bottlenecks_config["image_url"],
+                           config.bottlenecks_config["yardstick_image_dir"])
+    env.prepare_image(config.bottlenecks_config["yardstick_image_name"],
+                      config.bottlenecks_config["yardstick_image_dir"])
+
+
 def yardstick_command_parser(debug, cidr, outfile, parameter):
     cmd = "yardstick"
     if debug:
@@ -31,6 +43,9 @@ def yardstick_command_parser(debug, cidr, outfile, parameter):
     cmd += " task start "
     cmd += str(cidr)
     cmd += " --output-file " + outfile
+    image_name = config.bottlenecks_config["yardstick_image_name"]
+    parameter["image_name"] = image_name
+    print parameter
     if parameter is not None:
         cmd += " --task-args " + '"' + str(parameter) + '"'
     return cmd
diff --git a/utils/parser.py b/utils/parser.py
index b46a3b91..c0c10721 100644
--- a/utils/parser.py
+++ b/utils/parser.py
@@ -45,6 +45,11 @@ class Parser():
             cls.bottlenecks_config["pod_info"] = common_config['pod_info']
             cls.bottlenecks_config["yardstick_rc_dir"] = \
                 common_config['yardstick_rc_dir']
+            cls.bottlenecks_config["yardstick_image_dir"] = \
+                common_config['yardstick_image_dir']
+            cls.bottlenecks_config["image_url"] = common_config['image_url']
+            cls.bottlenecks_config["yardstick_image_name"] = \
+                common_config['yardstick_image_name']
             cls.config_dir_check(cls.bottlenecks_config["log_dir"])
 
     @classmethod