# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+'''This file realize the function of how to setup bottlenecks to your environment
+This use setuptools tool to setup'''
from setuptools import setup, find_packages
setup(
- name="bottlenecks",
- version="master",
- py_modules=['bottlenecks_cli'],
- packages=find_packages(),
- include_package_data=True,
- package_data={
- 'utils': [
- 'utils/infra_setup/heat/*.py'
- ]
- },
- url="https://www.opnfv.org",
- install_requires=["click"],
- entry_points={
- 'console_scripts': [
- 'bottlenecks=cli.bottlenecks_cli:main'
- ],
- },
+ name="bottlenecks",
+ version="master",
+ py_modules=['bottlenecks_cli'],
+ packages=find_packages(),
+ include_package_data=True,
+ package_data={
+ 'utils': [
+ 'utils/infra_setup/heat/*.py',
+ 'utils/infra_setup/runner/*.py'
+ ],
+ 'config': [
+ '*.yaml'
+ ],
+ 'testsuites': [
+ 'posca/testcase_cfg/*',
+ 'posca/testcase_script/*',
+ 'posca/testsuite_story/*',
+ 'posca/testcase_dashboard/*'
+ ],
+ },
+ url="https://www.opnfv.org",
+ install_requires=["click"],
+ entry_points={
+ 'console_scripts': [
+ 'bottlenecks=cli.bottlenecks_cli:main'
+ ],
+ },
)
-#!/usr/bin/env python\r
-##############################################################################\r
-# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.\r
-#\r
-# All rights reserved. This program and the accompanying materials\r
-# are made available under the terms of the Apache License, Version 2.0\r
-# which accompanies this distribution, and is available at\r
-# http://www.apache.org/licenses/LICENSE-2.0\r
-##############################################################################\r
-\r
-import sys\r
-import subprocess\r
-\r
-INTERPRETER = "/usr/bin/python"\r
-# ------------------------------------------------------\r
-# run posca testcase\r
-# ------------------------------------------------------\r
-\r
-\r
-def posca_run(arg):\r
- print("========== run posca ==========")\r
- print(arg)\r
- if(arg == "posca_factor_system_bandwidth"):\r
- print("========== run posca_system_bandwidth ===========")\r
- cmd = '/home/opnfv/bottlenecks/testsuites/posca/testcase_script/\\r
-posca_factor_system_bandwidth.py'\r
- pargs = [INTERPRETER, cmd]\r
- sub_result = subprocess.Popen(pargs)\r
- sub_result.wait()\r
-\r
-\r
-def posca_env_check():\r
- print("========== posca env check ===========")\r
-\r
-\r
-def main():\r
- # para_testname = sys.argv[0]\r
- para_test_arg = sys.argv[2]\r
- posca_env_check()\r
- posca_run(para_test_arg)\r
- sys.exit(0)\r
-\r
-if __name__ == '__main__':\r
- main()\r
+#!/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 utils.parser as conf_parser
+import utils.logger as log
+INTERPRETER = "/usr/bin/python"
+
+LOG = log.Logger(__name__).getLogger()
+# ------------------------------------------------------
+# run posca testcase
+# ------------------------------------------------------
+
+
+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 posca_run(test_level, test_name):
+ 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:
+ print(config[testcase])
+ posca_testcase_run(testcase, config[testcase])
+ if con_dic["dashboard"] == "y":
+ cmd = '/home/opnfv/bottlenecks/testsuites/posca/testcase_dashboard/\
+system_bandwidth.py'
+ pargs = [INTERPRETER, cmd]
+ LOG.info("\nBegin to establish dashboard.")
+ sub_result = subprocess.Popen(pargs)
+ sub_result.wait()
+
+
+def main():
+ test_level = "testcase"
+ test_name = "posca_factor_system_bandwidth"
+ posca_run(test_level, test_name)
+
+
+if __name__ == '__main__':
+ main()
+
-[config]\r
-test_ip:\r
-dashboard: y\r
-ES_ip:\r
-tool: netperf\r
-protocol: tcp\r
-test_time: 60\r
-tx_pkt_sizes: 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072\r
-rx_pkt_sizes: 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072\r
-cpu_load: 0.9\r
-latency: 100000\r
+test_config:
+ tool: netperf
+ protocol: tcp
+ test_time: 60
+ tx_pkt_sizes: 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072
+ rx_pkt_sizes: 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072
+ cpu_load: 0.9
+ latency: 100000
+runner_config:
+ dashboard: y
+ dashboard_ip:
+ stack_create: yardstick
+ yardstick_test_ip:
+ yardstick_test_dir: "samples"
+ yardstick_testcase: "netperf_bottlenecks"
#!/usr/bin/env python
##############################################################################
-# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+# Copyright (c) 2017 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 run systembandwidth script.
+for example this contain two part first run_script,
+second is algorithm, this part is about how to judge the bottlenecks.
+This test is using yardstick as a tool to begin test.'''
import os
-import argparse
import time
-import logging
-import ConfigParser
-import common_script
-import datetime
-import subprocess
-
-# ------------------------------------------------------
-# parser for configuration files in each test case
-# ------------------------------------------------------
-parser = argparse.ArgumentParser()
-parser.add_argument("-c", "--conf",
- help="configuration files for the testcase,\
- in yaml format",
- default="/home/opnfv/bottlenecks/testsuites/posca\
-/testcase_cfg/posca_factor_system_bandwidth.yaml")
-args = parser.parse_args()
-headers = {"Content-Type": "application/json"}
-INTERPRETER = "/usr/bin/python"
-
-
+import utils.logger as log
+import utils.infra_setup.runner.yardstick as Runner
# --------------------------------------------------
# logging configuration
# --------------------------------------------------
-logger = logging.getLogger(__name__)
+LOG = log.Logger(__name__)
+
+test_dict = {
+ "action": "runTestCase",
+ "args": {
+ "opts": {
+ "task-args": {}
+ },
+ "testcase": "netperf_bottlenecks"
+ }
+}
+
+
+def env_pre():
+ Runner.Create_Incluxdb()
-def posca_env_check():
- print("========== posca system bandwidth env check ===========")
- filepath = r"/home/opnfv/bottlenecks/testsuites/posca/test_result/"
- if os.path.exists(filepath):
- return True
- else:
- os.mkdir(r'/home/opnfv/bottlenecks/testsuites/posca/test_result/')
+def do_test(test_config, con_dic):
+ test_dict['args']['opts']['task-args'] = test_config
+ Task_id = Runner.Send_Data(test_dict, con_dic['runner_config'])
+ time.sleep(con_dic['test_config']['test_time'])
+ Data_Reply = Runner.Get_Reply(con_dic['runner_config'], Task_id)
+ test_date = Data_Reply[con_dic['runner_config']['testcase']][0]
+ return test_date
-def system_pkt_bandwidth(test_id, data, file_config, con_dic):
- date_id = test_id
- print("test is is begin from %d" % test_id)
+def run(con_dic):
+ data = {}
+ rx_pkt_a = con_dic['test_config']['rx_pkt_sizes'].split(',')
+ tx_pkt_a = con_dic['test_config']['tx_pkt_sizes'].split(',')
+ data["rx_pkt_sizes"] = rx_pkt_a
+ data["tx_pkt_sizes"] = tx_pkt_a
+ con_dic["result_file"] = os.path.dirname(
+ os.path.abspath(__file__)) + "/test_case/result"
+ date_id = 0
cur_role_result = 1
pre_role_result = 1
pre_reply = {}
test_config = {
"tx_msg_size": float(test_x),
"rx_msg_size": float(test_y),
+ "test_time": con_dic['test_config']['test_time']
}
date_id = date_id + 1
- file_config["test_id"] = date_id
- data_reply = common_script.posca_send_data(
- con_dic, test_config, file_config)
- bandwidth = data_reply["throughput"]
+ data_reply = do_test(test_config, con_dic)
+ bandwidth = float(data_reply["throughput"])
if (data_max["throughput"] < bandwidth):
data_max = data_reply
if (abs(bandwidth_tmp - bandwidth) / bandwidth_tmp < 0.025):
else:
pre_reply = data_reply
bandwidth_tmp = bandwidth
- cur_role_result = pre_reply["throughput"]
+ cur_role_result = float(pre_reply["throughput"])
if (abs(pre_role_result - cur_role_result) / pre_role_result < 0.025):
print("date_id is %d,package return at line 111\n" % date_id)
- # return data_return
if data_return["throughput"] < data_max["throughput"]:
data_return = data_max
pre_role_result = cur_role_result
return data_return
-def posca_run(con_dic):
- print("========== run posca system bandwidth ===========")
- test_con_id = 0
- file_config = {}
- data = {}
- rx_pkt_s_a = con_dic['rx_pkt_sizes'].split(',')
- tx_pkt_s_a = con_dic['tx_pkt_sizes'].split(',')
- time_new = time.strftime('%H_%M', time.localtime(time.time()))
- file_config["file_path"] = "/home/opnfv/bottlenecks/testsuites/posca/\
-test_result/factor_system_system_bandwidth_%s.json" % (time_new)
- file_config["test_type"] = "system_bandwidth_biggest"
- data["rx_pkt_sizes"] = rx_pkt_s_a
- data["tx_pkt_sizes"] = tx_pkt_s_a
- print("######test package begin######")
- pkt_reply = system_pkt_bandwidth(
- test_con_id, data, file_config, con_dic)
-
- print("######find system bandwidth######")
- print("rx_msg_size:%d tx_msg_size:%d\n" %
- (pkt_reply["rx_msg_size"], pkt_reply["tx_msg_size"]))
- common_script.posca_tran_data(
- con_dic['ES_ip'], file_config["file_path"])
- return True
-
-
def main():
- if not (args.conf):
- logger.error("Configuration files do not exist for \
- the specified testcases")
- os.exit(-1)
- else:
- testcase_cfg = args.conf
+ run(con_dic)
- con_str = [
- 'test_ip', 'tool', 'test_time', 'protocol',
- 'tx_pkt_sizes', 'rx_pkt_sizes', 'cpu_load',
- 'latency', 'ES_ip', 'dashboard'
- ]
- posca_env_check()
- starttime = datetime.datetime.now()
- config = ConfigParser.ConfigParser()
- con_dic = common_script.posca_config_read(testcase_cfg, con_str, config)
- common_script.posca_create_incluxdb(con_dic)
- posca_run(con_dic)
- endtime = datetime.datetime.now()
- if con_dic["dashboard"] == "y":
- cmd = '/home/opnfv/bottlenecks/testsuites/posca/testcase_dashboard/\
-system_bandwidth.py'
- pargs = [INTERPRETER, cmd]
- print("\nBegin to establish dashboard.")
- sub_result = subprocess.Popen(pargs)
- sub_result.wait()
- print("System Bandwidth testing time : %s" % (endtime - starttime))
- time.sleep(5)
if __name__ == '__main__':
main()
+
--- /dev/null
+##############################################################################
+# Copyright (c) 2017 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
+##############################################################################
--- /dev/null
+#!/usr/bin/env python
+##############################################################################
+# Copyright (c) 2017 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 use config to be born with a template
+a template is use to create a stack in openstack.
+This file will be amended in the furture.'''
+
+import utils.infra_setup.heat.template as Heat
+
+class stack_api():
+
+ def from_config_template(stack_info):
+ stack_name = stack_info['name']
+ ext_gw_net = os.environ.get("EXTERNAL_NETWORK")
+ heat_parser = HeatTemplate_Parser()
+ heat_parser.add_security_group(stack_name)
+ heat_parser.add_keypair(stack_name)
+ for network in stack_info['networks']:
+ heat_parser.add_network(stack_name)
+ heat_parser.add_subnet(stack_name,
+ stack_info['networks'][network]['cidr'])
+
+ heat_parser.add_router(stack_name, ext_gw_net)
+ heat_parser.add_router_interface(stack_name)
+
+ for server in stack_info['servers']:
+ heat_parser.add_port(server, stack_name)
+ heat_parser.add_floating_ip(server, stack_name, ext_gw_net)
+ heat_parser.add_floating_ip_ass(server)
+ heat_parser.add_server(server,
+ stack_info['servers'][server]['image'],
+ stack_info['servers'][server]['flavor'],
+ stack_info['servers'][server]['user'])
+
+ template = heat_parser.get_template_date()
+ stack = Heat.HeatTemplate(name=stack_name, heat_template=template)
+ try:
+ self.stack = stack.create()
+ except KeyboardInterrupt:
+ sys.exit("\nStack create interrupted")
+ except RuntimeError as err:
+ sys.exit("error: failed to deploy stack: '%s'" % err.args)
+ except Exception as err:
+ sys.exit("error: failed to deploy stack: '%s'" % err)
+
+ for server in stack_info['servers']:
+ if len(server.ports) > 0:
+ # TODO(hafe) can only handle one internal network for now
+ port = list(server.ports.values())[0]
+ server.private_ip = self.stack.outputs[port["stack_name"]]
+
+ if server.floating_ip:
+ server.public_ip = \
+ self.stack.outputs[server.floating_ip["stack_name"]]
+
--- /dev/null
+#!/usr/bin/env python
+##############################################################################
+# Copyright (c) 2017 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 contain all function about yardstick API.
+At present, This file contain the following function:
+1.Ask Yardstick to run testcase and get a task id.
+2.use task id to ask yardstick for data.
+3.Ask yardstick for InfluxDB create
+4.how the process of task.'''
+
+import sys
+import time
+import requests
+import json
+import utils.logger as logger
+
+headers = {"Content-Type": "application/json"}
+LOG = logger.Logger(__name__).getLogger()
+
+
+def Get_Reply(test_config, task_id, time_test=1):
+ reply_url = ("http://%s/yardstick/results?task_id=%s"
+ % (test_config['yardstick_test_ip'], task_id))
+ reply_response = requests.get(reply_url)
+ reply_data = json.loads(reply_response.text)
+ LOG.info("return data is %s" % (reply_data))
+ if reply_data["status"] == 1:
+ return(reply_data["result"])
+ if reply_data["status"] == 0:
+ if time_test == 10:
+ LOG.info("yardstick time out")
+ sys.exit()
+ time.sleep(10)
+ reply_result_data = Get_Reply(
+ test_config, task_id, time_test=time_test + 1)
+ return(reply_result_data)
+ if reply_data["status"] == 2:
+ LOG.error("yardstick error exit")
+ sys.exit()
+
+
+def Send_Data(test_dict, test_config):
+ base_url = ("http://%s/yardstick/testcases/%s/action"
+ % (test_config['yardstick_test_ip'],
+ test_config['yardstick_test_dir']))
+ LOG.info("test ip addr is %s" % (base_url))
+ reponse = requests.post(
+ base_url, data=json.dumps(test_dict), headers=headers)
+ ask_data = json.loads(reponse.text)
+ task_id = ask_data["result"]
+ LOG.info("yardstick task id is: %s" % (task_id))
+ return task_id
+
+
+def Create_Incluxdb(con_dic):
+ base_url = ("http://%s/yardstick/env/action"
+ % (con_dic['yardstick_test_ip']))
+ test_dict = {
+ "action": "createInfluxDBContainer",
+ }
+ requests.post(
+ base_url, data=json.dumps(test_dict), headers=headers)
+ LOG.info("waiting for creating InfluxDB")
+ time.sleep(30)
+ LOG.info("Done, creating InflxDB Container")
+
+
+def find_condition(con_dic):
+ base_url = ("http://%s/yardstick/asynctask?%s"
+ % (con_dic['yardstick_test_ip'].id))
+ requests.post(
+ base_url, headers=headers)
+ LOG.info("check for creating InfluxDB")
+
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+'''This file realize the function of how to parser a config file.
+This contain Two part:
+Frist is Init some variables the will be used.
+Second is reading config file.'''
+
import os
import yaml
class Parser():
bottlenecks_config = {}
+ bottlenecks_test = {}
@classmethod
def config_init(cls):
cls.config_dir_check(cls.bottlenecks_config["log_dir"])
@classmethod
- def config_read(cls, testcase, story_name):
+ def story_read(cls, testcase, story_name):
story_dir = os.path.join(
cls.test_dir,
testcase,
with open(story_dir) as file:
story_parser = yaml.load(file)
for case_name in story_parser['testcase']:
- testcase_dir = os.path.join(
- cls.test_dir,
- testcase,
- 'testcase_cfg',
- case_name)
- with open(testcase_dir) as f:
- cls.bottlenecks_config[case_name] = yaml.load(f)
+ Parser.testcase_read(cls, testcase, case_name)
+
+ return cls.bottlenecks_test
+
+ @classmethod
+ def testcase_read(cls, testcase, testcase_name):
- return cls.bottlenecks_config
+ testcase_dir = os.path.join(
+ cls.test_dir,
+ testcase,
+ 'testcase_cfg',
+ testcase_name)
+ testcase_local = testcase_dir + ".yaml"
+ with open(testcase_local) as f:
+ cls.bottlenecks_test[testcase_name] = yaml.load(f)
+
+ return cls.bottlenecks_test
@classmethod
def config_dir_check(cls, dirname):
stack_cfg = testcase_cfg['stack_config']
# TO-DO add cli parameters to stack_config.
return test_cfg, stack_cfg
+
Code Review / bottlenecks.git / commitdiff