Merge "Bottlenecks POSCA testing code reconstruction"

3 files changed, 120 insertions, 146 deletions

diff --git a/testsuites/posca/run_posca.py b/testsuites/posca/run_posca.py
index e5e11e9f..fcf35d5b 100755
--- a/testsuites/posca/run_posca.py
+++ b/testsuites/posca/run_posca.py
@@ -1,44 +1,61 @@
-#!/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

-##############################################################################

-

-import sys

-import subprocess

-

-INTERPRETER = "/usr/bin/python"

-# ------------------------------------------------------

-# run posca testcase

-# ------------------------------------------------------

-

-

-def posca_run(arg):

-    print("========== run posca ==========")

-    print(arg)

-    if(arg == "posca_factor_system_bandwidth"):

-        print("========== run posca_system_bandwidth ===========")

-        cmd = '/home/opnfv/bottlenecks/testsuites/posca/testcase_script/\

-posca_factor_system_bandwidth.py'

-        pargs = [INTERPRETER, cmd]

-        sub_result = subprocess.Popen(pargs)

-        sub_result.wait()

-

-

-def posca_env_check():

-    print("========== posca env check ===========")

-

-

-def main():

-    # para_testname = sys.argv[0]

-    para_test_arg = sys.argv[2]

-    posca_env_check()

-    posca_run(para_test_arg)

-    sys.exit(0)

-

-if __name__ == '__main__':

-    main()

+#!/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()
+
diff --git a/testsuites/posca/testcase_cfg/posca_factor_system_bandwidth.yaml b/testsuites/posca/testcase_cfg/posca_factor_system_bandwidth.yaml
index 8235d5b4..217bff3e 100755
--- a/testsuites/posca/testcase_cfg/posca_factor_system_bandwidth.yaml
+++ b/testsuites/posca/testcase_cfg/posca_factor_system_bandwidth.yaml
@@ -1,11 +1,15 @@
-[config]

-test_ip:

-dashboard: y

-ES_ip:

-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

+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"
diff --git a/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py b/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py
index 7a0fd27b..ed4de180 100644
--- a/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py
+++ b/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py
@@ -1,54 +1,59 @@
 #!/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 = {}
@@ -62,12 +67,11 @@ def system_pkt_bandwidth(test_id, data, file_config, con_dic):
             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):
@@ -76,10 +80,9 @@ def system_pkt_bandwidth(test_id, data, file_config, con_dic):
             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
@@ -87,60 +90,10 @@ def system_pkt_bandwidth(test_id, data, file_config, con_dic):
     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()
+