summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang (Gabriel) Yu <Gabriel.yuyang@huawei.com>2018-07-18 11:58:21 +0800
committerYu Yang (Gabriel) <Gabriel.yuyang@huawei.com>2018-07-18 08:27:38 +0000
commit2dd93f5cb51e656fad21f50ccbb437aa3f2d1c92 (patch)
tree52fb34ff4f8f4d3455de1823fb4083df659f15f0
parent8b8a2ca5a993b10f9c5cf3955b705fa2da024fe2 (diff)
Delete unmaintained/useless tests
Change-Id: I0c0606befb4e53fb503d9e5fcbf7d3bdf2237824 Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> (cherry picked from commit 857d64c56d918f7925e65cfc7e49dbe391454864)
-rw-r--r--testsuites/posca/testcase_cfg/posca_factor_cpu_burden.yaml26
-rw-r--r--testsuites/posca/testcase_cfg/posca_factor_rx_cache_size.yaml20
-rw-r--r--testsuites/posca/testcase_cfg/posca_factor_rx_pkt_size.yaml21
-rw-r--r--testsuites/posca/testcase_cfg/posca_factor_tx_cache_size.yaml20
-rw-r--r--testsuites/posca/testcase_cfg/posca_factor_tx_pkt_size.yaml21
-rw-r--r--testsuites/posca/testcase_script/posca_factor_cpu_burden.py125
-rw-r--r--testsuites/posca/testcase_script/posca_factor_rx_cache_size.py137
-rw-r--r--testsuites/posca/testcase_script/posca_factor_rx_pkt_size.py153
-rw-r--r--testsuites/posca/testcase_script/posca_factor_tx_cache_size.py136
-rw-r--r--testsuites/posca/testcase_script/posca_factor_tx_pkt_size.py153
10 files changed, 0 insertions, 812 deletions
diff --git a/testsuites/posca/testcase_cfg/posca_factor_cpu_burden.yaml b/testsuites/posca/testcase_cfg/posca_factor_cpu_burden.yaml
deleted file mode 100644
index 5b97b9e1..00000000
--- a/testsuites/posca/testcase_cfg/posca_factor_cpu_burden.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-##############################################################################
-# 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
-##############################################################################
-
-[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
-default_rx_pkt_sizes: 65536
-default_tx_pkt_sizes: 87380
-cpu_load: 90
-latency: 100000
-
-[flavor_config]
-rx_flavor: bottlenecks_system_bandwidth_rx,512,1,1
-tx_flavor: bottlenecks_system_bandwidth_tx,512,1,1
diff --git a/testsuites/posca/testcase_cfg/posca_factor_rx_cache_size.yaml b/testsuites/posca/testcase_cfg/posca_factor_rx_cache_size.yaml
deleted file mode 100644
index 0cee6859..00000000
--- a/testsuites/posca/testcase_cfg/posca_factor_rx_cache_size.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-##############################################################################
-# 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
-##############################################################################
-
-[config]
-test_ip: 192.168.23.2:8888
-throughput: 1000
-tool: netperf
-protocol: tcp
-test_time: 30
-pkt sizes: 8,16,32,64,128,256,512,1024,2048
-tx cache sizes: 2304,4608,9216,18432,32768,65536
-rx cache sizes: 1152
-cpu load: 0.9
-latency: 100000
diff --git a/testsuites/posca/testcase_cfg/posca_factor_rx_pkt_size.yaml b/testsuites/posca/testcase_cfg/posca_factor_rx_pkt_size.yaml
deleted file mode 100644
index b94aa710..00000000
--- a/testsuites/posca/testcase_cfg/posca_factor_rx_pkt_size.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-##############################################################################
-# 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
-##############################################################################
-
-[config]
-test_ip: 192.168.23.2:8888
-throughput: 1000
-tool: netperf
-protocol: tcp
-test_time: 30
-tx pkt sizes: 8,16,32,64,128,256,512,1024,2048
-rx pkt sizes: 8
-tx cache sizes: 2304,4608,9216,18432,32768,65536
-rx cache sizes: 1152,2304,4608,9216,18432,32768,65536,131072
-cpu load: 0.9
-latency: 100000
diff --git a/testsuites/posca/testcase_cfg/posca_factor_tx_cache_size.yaml b/testsuites/posca/testcase_cfg/posca_factor_tx_cache_size.yaml
deleted file mode 100644
index 9b69c105..00000000
--- a/testsuites/posca/testcase_cfg/posca_factor_tx_cache_size.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-##############################################################################
-# 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
-##############################################################################
-
-[config]
-test_ip: 192.168.23.2:8888
-throughput: 1000
-tool: netperf
-protocol: tcp
-test_time: 30
-pkt sizes: 8,16,32,64,128,256,512,1024,2048
-tx cache sizes: 2304
-rx cache sizes: 1152,2304,4608,9216,18432,32768,65536,87380,131072
-cpu load: 0.9
-latency: 100000
diff --git a/testsuites/posca/testcase_cfg/posca_factor_tx_pkt_size.yaml b/testsuites/posca/testcase_cfg/posca_factor_tx_pkt_size.yaml
deleted file mode 100644
index 06b07796..00000000
--- a/testsuites/posca/testcase_cfg/posca_factor_tx_pkt_size.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-##############################################################################
-# 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
-##############################################################################
-
-[config]
-test_ip: 192.168.23.2:8888
-throughput: 1000
-tool: netperf
-protocol: tcp
-test_time: 30
-tx pkt sizes: 8
-rx pkt sizes: 8,16,32,64,128,256,512,1024,2048
-tx cache sizes: 2304,4608,9216,18432,32768,65536
-rx cache sizes: 1152,2304,4608,9216,18432,32768,65536,131072
-cpu load: 0.9
-latency: 100000
diff --git a/testsuites/posca/testcase_script/posca_factor_cpu_burden.py b/testsuites/posca/testcase_script/posca_factor_cpu_burden.py
deleted file mode 100644
index 58da8ca7..00000000
--- a/testsuites/posca/testcase_script/posca_factor_cpu_burden.py
+++ /dev/null
@@ -1,125 +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
-##############################################################################
-
-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"
-
-
-# --------------------------------------------------
-# logging configuration
-# --------------------------------------------------
-logger = logging.getLogger(__name__)
-
-
-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 system_cpu_burden(test_id, data, file_config, con_dic):
- date_id = test_id
- print("test is is begin from %d" % test_id)
- data_return = {}
- data_max = {}
- data_return["throughput"] = 1
- for test_x in data["tx_pkt_sizes"]:
- data_max["throughput"] = 1
- for test_y in data["rx_pkt_sizes"]:
- test_config = {
- "tx_msg_size": float(test_x),
- "rx_msg_size": float(test_y),
- }
- date_id = date_id + 1
- file_config["test_id"] = date_id
- data_reply = common_script.posca_send_data(
- con_dic, test_config, file_config)
- if (data_max["remote_cpu_util"] > con_dic["cpu_load"]):
- return 1, data_reply
- if (data_max["local_cpu_util"] > con_dic["cpu_load"]):
- return 1, data_reply
- print("cpu_burden don't find\n")
- return 0, 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######")
- date_return, pkt_reply = system_cpu_burden(
- test_con_id, data, file_config, con_dic)
-
- 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
-
- 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()
diff --git a/testsuites/posca/testcase_script/posca_factor_rx_cache_size.py b/testsuites/posca/testcase_script/posca_factor_rx_cache_size.py
deleted file mode 100644
index 97045a1d..00000000
--- a/testsuites/posca/testcase_script/posca_factor_rx_cache_size.py
+++ /dev/null
@@ -1,137 +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
-##############################################################################
-
-import os
-import argparse
-import time
-import logging
-import ConfigParser
-import json
-
-# ------------------------------------------------------
-# 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_tx_pkt_size.yaml")
-args = parser.parse_args()
-
-cmd = "curl -i"
-order_arg = "-H \"Content-Type: application/json\" -X POST -d \'{\"cmd\": \
- \"start\", \"opts\":{\"output-file\": \"/tem/yardstick.out\"}, \
- \"args\": \"../samples/netperf.yaml\"}'"
-
-# --------------------------------------------------
-# logging configuration
-# --------------------------------------------------
-logger = logging.getLogger(__name__)
-
-
-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.mkdirs(r'/home/opnfv/bottlenecks/testsuites/posca/test_result/')
-
-
-def posca_output_result(time_new, input_1, input_2,
- input_3, input_4, input_5):
- save_dic = {}
- save_dic['tx_pkt_size'] = input_1
- save_dic['tx_cache_size'] = input_2
- save_dic['throughput '] = input_3
- save_dic['latency'] = input_4
- save_dic['cpu_load'] = input_5
- with open("/home/opnfv/bottlenecks/testsuites/posca/test_result/\
- factor_tx_cache_size_%s.json" % (time_new), "a") as f:
- f.write(json.dumps(save_dic, f))
- f.write("\n")
-
-
-def posca_config_read(config_str):
- print("========== posca system bandwidth config read ===========")
-
- con_dic = {}
- config = ConfigParser.ConfigParser()
- with open(config_str, "rd") as cfgfile:
- config.readfp(cfgfile)
- con_dic['test_ip'] = config.get("config", "test_ip")
- con_dic['test_throughput'] = config.get("config", "throughput")
- con_dic['test_tool'] = config.get("config", "tool")
- con_dic['test_time'] = config.get("config", "test_time")
- con_dic['test_protocol'] = config.get("config", "protocol")
- con_dic['test_pkt_s'] = config.get("config", "pkt sizes")
- con_dic['test_tx_cache_s'] = config.get("config", "tx cache sizes")
- con_dic['test_rx_cache_s'] = config.get("config", "rx cache sizes")
- con_dic['test_cpu_load'] = config.get("config", "cpu load")
- con_dic['test_latency'] = config.get("config", "latency")
-
- return con_dic
-
-
-def posca_run(con_dic):
- print("========== run posca system bandwidth ===========")
-
- test_pkt_s_a = con_dic['test_pkt_s'].split(',')
- test_tx_cache_s_a = con_dic['test_tx_cache_s'].split(',')
- test_rx_cache_s_a = con_dic['test_rx_cache_s'].split(',')
- time_new = time.strftime('%H_%M', time.localtime(time.time()))
- bandwidth_tmp = 1
-
- for test_pkt_s_e in test_pkt_s_a:
- for test_tx_cache_s_e in test_tx_cache_s_a:
- print("Package size %s") % (test_pkt_s_e)
- order_excute = os.popen("%s %s http://%s/api/v3/yardstick/\
- tasks/task %s %s %s" % (cmd, order_arg, con_dic['test_ip'],
- test_pkt_s_e, test_rx_cache_s_a,
- test_tx_cache_s_e))
- order_result = order_excute.read()
- task_id = order_result.find("task_id")
- time.sleep(con_dic['test_time'])
- cmd_excute = os.popen("%s http://%s/api/v3/yardstick/testre\
- sults?task_id=%s" % (cmd, con_dic['test_ip'], task_id))
- test_result = cmd_excute.read()
- bandwidth = test_result.find("bandwidth")
- cpu_load = test_result.find("cpu_load")
- latency = test_result.find("latency")
- posca_output_result(time_new, test_pkt_s_e, test_rx_cache_s_a,
- bandwidth, latency, cpu_load)
- if (cpu_load < con_dic['test_cpu_load\
- ']) and (latency < con_dic['test_latency']):
- if (abs(bandwidth_tmp - bandwidth) / bandwidth < 0.05):
- return True
- else:
- print("%s,%s") % (bandwidth, test_tx_cache_s_e)
- else:
- print("%s,%s") % (bandwidth, test_tx_cache_s_e)
- return False
-
-
-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
-
- con_dic = posca_config_read(testcase_cfg)
- posca_env_check()
- posca_run(con_dic)
-
- time.sleep(5)
-
-if __name__ == '__main__':
- main()
diff --git a/testsuites/posca/testcase_script/posca_factor_rx_pkt_size.py b/testsuites/posca/testcase_script/posca_factor_rx_pkt_size.py
deleted file mode 100644
index 2a119413..00000000
--- a/testsuites/posca/testcase_script/posca_factor_rx_pkt_size.py
+++ /dev/null
@@ -1,153 +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
-##############################################################################
-
-import os
-import argparse
-import time
-import logging
-import ConfigParser
-import json
-
-# ------------------------------------------------------
-# 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_tx_pkt_size.yaml")
-args = parser.parse_args()
-
-cmd = "curl -i"
-order_arg = "-H \"Content-Type: application/json\" -X POST -d \'{\"cmd\": \
- \"start\", \"opts\":{\"output-file\": \"/tem/yardstick.out\"}, \
- \"args\": \"../samples/netperf.yaml\"}'"
-
-# --------------------------------------------------
-# logging configuration
-# --------------------------------------------------
-logger = logging.getLogger(__name__)
-
-
-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.mkdirs(r'/home/opnfv/bottlenecks/testsuites/posca/test_result/')
-
-
-def posca_output_result(time_new, input_1, input_2, input_3,
- input_4, input_5, input_6):
- save_dic = {}
- save_dic['tx_pkt_size'] = input_1
- save_dic['rx_cache_size'] = input_2
- save_dic['tx_cache_size'] = input_3
- save_dic['throughput'] = input_4
- save_dic['latency'] = input_5
- save_dic['cpu_load'] = input_6
- with open("/home/opnfv/bottlenecks/testsuites/posca/test_result/\
- factor_tx_cache_size_%s.json" % (time_new), "a") as f:
- f.write(json.dumps(save_dic, f))
- f.write("\n")
-
-
-def posca_config_read(config_str):
- print("========== posca system bandwidth config read ===========")
-
- con_dic = {}
- config = ConfigParser.ConfigParser()
- with open(config_str, "rd") as cfgfile:
- config.readfp(cfgfile)
- con_dic['test_ip'] = config.get("config", "test_ip")
- con_dic['test_tool'] = config.get("config", "tool")
- con_dic['test_time'] = config.get("config", "test_time")
- con_dic['test_protocol'] = config.get("config", "protocol")
- con_dic['test_tx_pkt_s'] = config.get("config", "tx pkt sizes")
- con_dic['test_rx_pkt_s'] = config.get("config", "rx pkt sizes")
- con_dic['test_tx_cache_s'] = config.get("config", "tx cache sizes")
- con_dic['test_rx_cache_s'] = config.get("config", "rx cache sizes")
- con_dic['test_cpu_load'] = config.get("config", "cpu load")
- con_dic['test_latency'] = config.get("config", "latency")
-
- return con_dic
-
-
-def posca_run(con_dic):
- print("========== run posca system bandwidth ===========")
-
- test_tx_pkt_s_a = con_dic['test_tx_pkt_s'].split(',')
- test_rx_pkt_s_e = con_dic['test_rx_pkt_s'].split(',')
- test_tx_cache_s_a = con_dic['test_tx_cache_s'].split(',')
- test_rx_cache_s_a = con_dic['test_rx_cache_s'].split(',')
- time_new = time.strftime('%H_%M', time.localtime(time.time()))
- bandwidth_tmp = 1
-
- for test_rx_cache_s_e in test_rx_cache_s_a:
- for test_tx_cache_s_e in test_tx_cache_s_a:
- for test_tx_pkt_s_e in test_tx_pkt_s_a:
- print("%s,%s,%s") % (test_tx_pkt_s_e, test_rx_cache_s_e,
- test_tx_cache_s_e)
- order_excute = os.popen("%s %s http://%s/api/v3/yardstick/\
- tasks/task %s %s %s" % (cmd, order_arg, con_dic['test_ip'],
- test_rx_pkt_s_e, test_rx_cache_s_e,
- test_tx_cache_s_e))
- order_result = order_excute.read()
- task_id = order_result.find("task_id")
- time.sleep(con_dic['test_time'])
- cmd_excute = os.popen("%s http://%s/api/v3/yardstick/testre\
- sults?task_id=%s" % (cmd, con_dic['test_ip'], task_id))
- test_result = cmd_excute.read()
- bandwidth = test_result.find("bandwidth")
- cpu_load = test_result.find("cpu_load")
- latency = test_result.find("latency")
- posca_output_result(time_new, test_rx_pkt_s_e,
- test_rx_cache_s_e,
- bandwidth, latency, cpu_load)
- if (cpu_load < con_dic['test_cpu_load\
- ']) and (latency < con_dic['test_latency']):
- if (abs(bandwidth_tmp - bandwidth) / bandwidth < 0.05):
- print("%s,%s,%s,%s,%s,%s") % (test_rx_pkt_s_e,
- test_rx_cache_s_e,
- test_tx_cache_s_e,
- bandwidth,
- latency,
- cpu_load)
- return True
- else:
- bandwidth_tmp = bandwidth
- else:
- print("%s,%s,%s,%s,%s,%s") % (test_rx_pkt_s_e,
- test_rx_cache_s_e,
- test_tx_cache_s_e,
- bandwidth,
- latency,
- cpu_load)
- return False
-
-
-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
-
- con_dic = posca_config_read(testcase_cfg)
- posca_env_check()
- posca_run(con_dic)
-
- time.sleep(5)
-
-if __name__ == '__main__':
- main()
diff --git a/testsuites/posca/testcase_script/posca_factor_tx_cache_size.py b/testsuites/posca/testcase_script/posca_factor_tx_cache_size.py
deleted file mode 100644
index b7d45065..00000000
--- a/testsuites/posca/testcase_script/posca_factor_tx_cache_size.py
+++ /dev/null
@@ -1,136 +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
-##############################################################################
-
-import os
-import argparse
-import time
-import logging
-import ConfigParser
-import json
-
-# ------------------------------------------------------
-# 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_tx_pkt_size.yaml")
-args = parser.parse_args()
-
-cmd = "curl -i"
-order_arg = "-H \"Content-Type: application/json\" -X POST -d \'{\"cmd\": \
- \"start\", \"opts\":{\"output-file\": \"/tem/yardstick.out\"}, \
- \"args\": \"../samples/netperf.yaml\"}'"
-
-# --------------------------------------------------
-# logging configuration
-# --------------------------------------------------
-logger = logging.getLogger(__name__)
-
-
-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.mkdirs(r'/home/opnfv/bottlenecks/testsuites/posca/test_result/')
-
-
-def posca_output_result(time_new, input_1, input_2, input_3, input_4, input_5):
- save_dic = {}
- save_dic['tx_pkt_size'] = input_1
- save_dic['rx_cache_size'] = input_2
- save_dic['throughput '] = input_3
- save_dic['latency'] = input_4
- save_dic['cpu_load'] = input_5
- with open("/home/opnfv/bottlenecks/testsuites/posca/test_result/\
- factor_tx_cache_size_%s.json" % (time_new), "a") as f:
- f.write(json.dumps(save_dic, f))
- f.write("\n")
-
-
-def posca_config_read(config_str):
- print("========== posca system bandwidth config read ===========")
- con_dic = {}
- config = ConfigParser.ConfigParser()
- with open(config_str, "rd") as cfgfile:
- config.readfp(cfgfile)
- con_dic['test_ip'] = config.get("config", "test_ip")
- con_dic['test_throughput'] = config.get("config", "throughput")
- con_dic['test_tool'] = config.get("config", "tool")
- con_dic['test_time'] = config.get("config", "test_time")
- con_dic['test_protocol'] = config.get("config", "protocol")
- con_dic['test_pkt_s'] = config.get("config", "pkt sizes")
- con_dic['test_tx_cache_s'] = config.get("config", "tx cache sizes")
- con_dic['test_rx_cache_s'] = config.get("config", "rx cache sizes")
- con_dic['test_cpu_load'] = config.get("config", "cpu load")
- con_dic['test_latency'] = config.get("config", "latency")
-
- return con_dic
-
-
-def posca_run(con_dic):
- print("========== run posca system bandwidth ===========")
-
- test_pkt_s_a = con_dic['test_pkt_s'].split(',')
- test_rx_cache_s_a = con_dic['test_rx_cache_s'].split(',')
- test_tx_cache_s_e = con_dic['test_tx_cache_s'].split(',')
- time_new = time.strftime('%H_%M', time.localtime(time.time()))
- bandwidth_tmp = 1
-
- for test_pkt_s_e in test_pkt_s_a:
- for test_rx_cache_s_e in test_rx_cache_s_a:
- print("Package size %s") % (test_pkt_s_e)
- order_excute = os.popen("%s %s http://%s/api/v3/yardstick/\
- tasks/task %s %s %s" % (cmd, order_arg, con_dic['test_ip'],
- test_pkt_s_e, test_rx_cache_s_e,
- test_tx_cache_s_e))
- order_result = order_excute.read()
- task_id = order_result.find("task_id")
- time.sleep(con_dic['test_time'])
- cmd_excute = os.popen("%s http://%s/api/v3/yardstick/testre\
- sults?task_id=%s" % (cmd, con_dic['test_ip'], task_id))
- test_result = cmd_excute.read()
- bandwidth = test_result.find("bandwidth")
- cpu_load = test_result.find("cpu_load")
- latency = test_result.find("latency")
- posca_output_result(time_new, test_pkt_s_e, test_rx_cache_s_e,
- bandwidth, latency, cpu_load)
- if (abs(bandwidth - con_dic['test_throughput']) / con_dic['test_\
- throughput'] > 0.05) and (latency < con_dic['test_\
- latency']) and (cpu_load < con_dic['test_cpu_load']):
- if (abs(bandwidth_tmp - bandwidth) / bandwidth < 0.05):
- return True
- else:
- print("%s,%s") % (bandwidth, test_rx_cache_s_e)
- else:
- print("%s,%s") % (bandwidth, test_rx_cache_s_e)
- return False
-
-
-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
-
- con_dic = posca_config_read(testcase_cfg)
- posca_env_check()
- posca_run(con_dic)
-
- time.sleep(5)
-
-if __name__ == '__main__':
- main()
diff --git a/testsuites/posca/testcase_script/posca_factor_tx_pkt_size.py b/testsuites/posca/testcase_script/posca_factor_tx_pkt_size.py
deleted file mode 100644
index 39dba135..00000000
--- a/testsuites/posca/testcase_script/posca_factor_tx_pkt_size.py
+++ /dev/null
@@ -1,153 +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
-##############################################################################
-
-import os
-import argparse
-import time
-import logging
-import ConfigParser
-import json
-
-# ------------------------------------------------------
-# 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_tx_pkt_size.yaml")
-args = parser.parse_args()
-
-cmd = "curl -i"
-order_arg = "-H \"Content-Type: application/json\" -X POST -d \'{\"cmd\": \
- \"start\", \"opts\":{\"output-file\": \"/tem/yardstick.out\"}, \
- \"args\": \"../samples/netperf.yaml\"}'"
-
-# --------------------------------------------------
-# logging configuration
-# --------------------------------------------------
-logger = logging.getLogger(__name__)
-
-
-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.mkdirs(r'/home/opnfv/bottlenecks/testsuites/posca/test_result/')
-
-
-def posca_output_result(time_new, input_1, input_2, input_3,
- input_4, input_5, input_6):
- save_dic = {}
- save_dic['rx_pkt_size'] = input_1
- save_dic['tx_cache_size'] = input_2
- save_dic['tx_cache_size'] = input_3
- save_dic['throughput'] = input_4
- save_dic['latency'] = input_5
- save_dic['cpu_load'] = input_6
- with open("/home/opnfv/bottlenecks/testsuites/posca/\
- test_result/factor_tx_pkt_size_%s.json" % (time_new), "a") as f:
- f.write(json.dumps(save_dic, f))
- f.write("\n")
-
-
-def posca_config_read(config_str):
- print("========== posca system bandwidth config read ===========")
-
- con_dic = {}
- config = ConfigParser.ConfigParser()
- with open(config_str, "rd") as cfgfile:
- config.readfp(cfgfile)
- con_dic['test_ip'] = config.get("config", "test_ip")
- con_dic['test_tool'] = config.get("config", "tool")
- con_dic['test_time'] = config.get("config", "test_time")
- con_dic['test_protocol'] = config.get("config", "protocol")
- con_dic['test_tx_pkt_s'] = config.get("config", "tx pkt sizes")
- con_dic['test_rx_pkt_s'] = config.get("config", "rx pkt sizes")
- con_dic['test_tx_cache_s'] = config.get("config", "tx cache sizes")
- con_dic['test_rx_cache_s'] = config.get("config", "rx cache sizes")
- con_dic['test_cpu_load'] = config.get("config", "cpu load")
- con_dic['test_latency'] = config.get("config", "latency")
-
- return con_dic
-
-
-def posca_run(con_dic):
- print("========== run posca system bandwidth ===========")
- test_rx_pkt_s_a = con_dic['test_rx_pkt_s'].split(',')
- test_tx_cache_s_a = con_dic['test_tx_cache_s'].split(',')
- test_rx_cache_s_a = con_dic['test_rx_cache_s'].split(',')
- time_new = time.strftime('%H_%M', time.localtime(time.time()))
- bandwidth_tmp = 1
-
- for test_rx_cache_s_e in test_rx_cache_s_a:
- for test_tx_cache_s_e in test_tx_cache_s_a:
- for test_rx_pkt_s_e in test_rx_pkt_s_a:
- print("%s,%s,%s") % (test_rx_pkt_s_e, test_tx_cache_s_e,
- test_rx_cache_s_e)
- order_excute = os.popen("%s %s http://%s/api/v3/yardstick/\
- tasks/task %s %s %s" % (cmd, order_arg, con_dic['test_ip'],
- test_rx_pkt_s_e, test_rx_cache_s_e,
- test_tx_cache_s_e))
- order_result = order_excute.read()
- task_id = order_result.find("task_id")
- time.sleep(con_dic['test_time'])
- cmd_excute = os.popen("%s http://%s/api/v3/yardstick/test\
- results?task_id=%s" % (cmd, con_dic['test_ip'], task_id))
- test_result = cmd_excute.read()
- bandwidth = test_result.find("bandwidth")
- cpu_load = test_result.find("cpu_load")
- latency = test_result.find("latency")
- posca_output_result(time_new, test_rx_pkt_s_e,
- test_rx_cache_s_e, test_tx_cache_s_e,
- bandwidth, latency, cpu_load)
- if (abs(bandwidth - con_dic['test_throughput']) / con_dic['test_\
- throughput'] > 0.05) and (latency < con_dic['test_\
- latency']) and (cpu_load < con_dic['test_cpu_load']):
- if (abs(bandwidth_tmp - bandwidth) / bandwidth < 0.05):
- print("%s,%s,%s,%s,%s,%s") % (test_rx_pkt_s_e,
- test_rx_cache_s_e,
- test_tx_cache_s_e,
- bandwidth,
- latency,
- cpu_load)
- return True
- else:
- bandwidth_tmp = bandwidth
- else:
- print("%s,%s,%s,%s,%s,%s") % (test_rx_pkt_s_e,
- test_rx_cache_s_e,
- test_tx_cache_s_e,
- bandwidth,
- latency,
- cpu_load)
- return False
-
-
-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
-
- con_dic = posca_config_read(testcase_cfg)
- posca_env_check()
- posca_run(con_dic)
-
- time.sleep(5)
-
-if __name__ == '__main__':
- main()