From bde702f95563cf953c32f9bfd0587083a3fea26d Mon Sep 17 00:00:00 2001 From: liyin Date: Thu, 13 Jul 2017 11:54:08 +0800 Subject: Add frame support of elk one docker support JIRA: BOTTLENECK-171 Add support of Bottlenecks docker frame refact, After this patch we will provide the ability of several installer. Add Yardstick_TAG to adjust yardstick docker version Change-Id: Ib431f8acf4a76b59f9d5e8783bcc7d2e5be208ae Signed-off-by: liyin --- testsuites/posca/run_posca.py | 109 --------------------- .../posca/testcase_cfg/posca_factor_ping.yaml | 10 +- .../posca/testcase_script/posca_factor_ping.py | 70 +++++++------ 3 files changed, 46 insertions(+), 143 deletions(-) delete mode 100755 testsuites/posca/run_posca.py (limited to 'testsuites/posca') diff --git a/testsuites/posca/run_posca.py b/testsuites/posca/run_posca.py deleted file mode 100755 index b1dba140..00000000 --- a/testsuites/posca/run_posca.py +++ /dev/null @@ -1,109 +0,0 @@ -#!/usr/bin/env python -############################################################################## -# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -'''This file realize the function of how to run posca. -In this file, The first thing is to read testcase config -for example: you could run this by use -posca_run('testcase', "Which testcase you will run") -posca_run('teststory', "Which story you will run") -and if you run "python run_posca", this will run testcase, -posca_factor_system_bandwidth by default.''' - -import importlib -import sys -import os - -from oslo_serialization import jsonutils -import json -import requests -import datetime - -import utils.parser as conf_parser -import utils.logger as log -INTERPRETER = "/usr/bin/python" - -LOG = log.Logger(__name__).getLogger() -# ------------------------------------------------------ -# run testcase in posca -# ------------------------------------------------------ - - -def posca_testcase_run(testcase_script, test_config): - - module_string = "testsuites.posca.testcase_script.%s" % (testcase_script) - module = importlib.import_module(module_string) - module.run(test_config) - - -def report(testcase, start_date, stop_date, criteria, details_doc): - headers = {'Content-type': 'application/json'} - results = { - "project_name": "bottlenecks", - "case_name": testcase, - "description": ("test results for " + testcase), - "pod_name": os.environ.get('NODE_NAME', 'unknown'), - "installer": os.environ.get('INSTALLER_TYPE', 'unknown'), - "version": os.environ.get('BRANCH', 'unknown'), - "build_tag": os.environ.get('BUILD_TAG', 'unknown'), - "stop_date": str(stop_date), - "start_date": str(start_date), - "criteria": criteria, - "scenario": os.environ.get('DEPLOY_SCENARIO', 'unknown') - } - results['details'] = {"test_results": details_doc} - - target = "http://testresults.opnfv.org/test/api/v1/results" - timeout = 5 - - try: - LOG.debug('Test result : %s', jsonutils.dump_as_bytes(results)) - res = requests.post(target, - data=jsonutils.dump_as_bytes(results), - headers=headers, - timeout=timeout) - LOG.debug('Test result posting finished with status code' - ' %d.' % res.status_code) - except Exception as err: - LOG.exception('Failed to record result data: %s', err) - - -def posca_run(test_level, test_name, REPORT="False"): - if test_level == "testcase": - config = conf_parser.Parser.testcase_read("posca", test_name) - elif test_level == "teststory": - config = conf_parser.Parser.story_read("posca", test_name) - for testcase in config: - LOG.info("Begin to run %s testcase in POSCA testsuite", testcase) - config[testcase]['out_file'] =\ - conf_parser.Parser.testcase_out_dir(testcase) - start_date = datetime.datetime.now() - posca_testcase_run(testcase, config[testcase]) - stop_date = datetime.datetime.now() - LOG.info("End of %s testcase in POSCA testsuite", testcase) - - criteria = "FAIL" - if REPORT == "True": - details_doc = [] - if os.path.exists(config[testcase]['out_file']): - with open(config[testcase]['out_file']) as details_result: - details_doc =[json.loads(data) for data in details_result.readlines()] # noqa - if len(details_doc): - criteria = "PASS" - report(testcase, start_date, stop_date, criteria, details_doc) - - -def main(): - test_level = sys.argv[1] - test_name = sys.argv[2] - REPORT = sys.argv[3] - posca_run(test_level, test_name, REPORT) - - -if __name__ == '__main__': - main() diff --git a/testsuites/posca/testcase_cfg/posca_factor_ping.yaml b/testsuites/posca/testcase_cfg/posca_factor_ping.yaml index 7e6bf027..ed1e3475 100644 --- a/testsuites/posca/testcase_cfg/posca_factor_ping.yaml +++ b/testsuites/posca/testcase_cfg/posca_factor_ping.yaml @@ -19,13 +19,13 @@ load_manager: num_stack: 5, 10, 20 package_loss: 10% - contexts: + runners: stack_create: yardstick flavor: - yardstick_test_ip: yardstick_test_dir: "samples" yardstick_testcase: "ping_bottlenecks" -dashboard: - dashboard: "y" - dashboard_ip: +contexts: + dashboard: "Bottlenecks-ELK" + yardstick: "Bottlenecks-Yardstick" + yardstick_envpre: True diff --git a/testsuites/posca/testcase_script/posca_factor_ping.py b/testsuites/posca/testcase_script/posca_factor_ping.py index 732422ea..5f56cdae 100644 --- a/testsuites/posca/testcase_script/posca_factor_ping.py +++ b/testsuites/posca/testcase_script/posca_factor_ping.py @@ -15,13 +15,15 @@ import utils.logger as log import uuid import json import os +import time import multiprocessing -import docker import datetime from utils.parser import Parser as conf_parser import utils.env_prepare.quota_prepare as quota_prepare import utils.env_prepare.stack_prepare as stack_prepare + import testsuites.posca.testcase_dashboard.posca_stress_ping as DashBoard +import utils.infra_setup.runner.docker_env as docker_env # -------------------------------------------------- # logging configuration # -------------------------------------------------- @@ -40,34 +42,44 @@ testfile = os.path.basename(__file__) testcase, file_format = os.path.splitext(testfile) -def env_pre(con_dic): - stack_prepare._prepare_env_daemon() +def env_pre(test_config): + test_yardstick = False + if "yardstick" in test_config["contexts"].keys(): + test_yardstick = True + stack_prepare._prepare_env_daemon(test_yardstick) quota_prepare.quota_env_prepare() - client = docker.from_env() - con = client.containers.get('bottleneckcompose_yardstick_1') cmd = ('yardstick env prepare') LOG.info("yardstick envrionment prepare!") - stdout = con.exec_run(cmd) - LOG.debug(stdout) + if(test_config["contexts"]['yardstick_envpre']): + yardstick_container = docker_env.yardstick_info['container'] + stdout = docker_env.docker_exec_cmd(yardstick_container, cmd) + LOG.debug(stdout) def do_test(test_config, con_dic): out_file = ("/tmp/yardstick_" + str(uuid.uuid4()) + ".out") - client = docker.from_env() - con = client.containers.get('bottleneckcompose_yardstick_1') + yardstick_container = docker_env.yardstick_info['container'] cmd = ('yardstick task start /home/opnfv/repos/yardstick/' 'samples/ping_bottlenecks.yaml --output-file ' + out_file) - stdout = con.exec_run(cmd) - LOG.debug(stdout) - with open(out_file) as f: - data = json.load(f) - if data["status"] == 1: - LOG.info("yardstick run success") - out_value = 1 - else: - LOG.error("yardstick error exit") - out_value = 0 - os.remove(out_file) + stdout = docker_env.docker_exec_cmd(yardstick_container, cmd) + LOG.info(stdout) + out_value = 0 + loop_walue = 0 + while loop_walue < 150: + time.sleep(2) + with open(out_file) as f: + loop_walue = loop_walue + 1 + data = json.load(f) + if data["status"] == 1: + if data["result"]["criteria"] == "PASS": + LOG.info("yardstick run success") + out_value = 1 + else: + LOG.error("task error exit") + out_value = 0 + break + elif data["status"] == 2: + LOG.error("yardstick error exit") return out_value @@ -92,19 +104,19 @@ def func_run(condic): def run(test_config): con_dic = test_config["load_manager"] test_num = con_dic['scenarios']['num_stack'].split(',') - if con_dic["contexts"]["yardstick_test_ip"] is None: - con_dic["contexts"]["yardstick_test_ip"] =\ + if test_config["contexts"]["yardstick_ip"] is None: + con_dic["contexts"]["yardstick_ip"] =\ conf_parser.ip_parser("yardstick_test_ip") - if test_config["dashboard"]["dashboard"] == 'y': - if test_config["dashboard"]["dashboard_ip"] is None: - test_config["dashboard"]["dashboard_ip"] =\ + if "dashboard" in test_config["contexts"].keys(): + if test_config["contexts"]["dashboard_ip"] is None: + test_config["contexts"]["dashboard_ip"] =\ conf_parser.ip_parser("dashboard") LOG.info("Create Dashboard data") - DashBoard.posca_stress_ping(test_config["dashboard"]) + DashBoard.posca_stress_ping(test_config["contexts"]) LOG.info("bottlenecks envrionment prepare!") - env_pre(con_dic) + env_pre(test_config) LOG.info("yardstick envrionment prepare done!") for value in test_num: @@ -127,8 +139,8 @@ def run(test_config): during_date = (endtime - starttime).seconds data_reply = config_to_result(num, out_num, during_date) - if test_config['dashboard']['dashboard'] == 'y': - DashBoard.dashboard_send_data(test_config['dashboard'], data_reply) + if "dashboard" in test_config["contexts"].keys(): + DashBoard.dashboard_send_data(test_config['contexts'], data_reply) conf_parser.result_to_file(data_reply, test_config["out_file"]) if out_num < num: -- cgit 1.2.3-korg