Code Review
/
bottlenecks.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bottlenecks offiline support
[bottlenecks.git]
/
testsuites
/
posca
/
testcase_script
/
posca_factor_ping.py
diff --git
a/testsuites/posca/testcase_script/posca_factor_ping.py
b/testsuites/posca/testcase_script/posca_factor_ping.py
index
2b71965
..
ea79d3a
100644
(file)
--- a/
testsuites/posca/testcase_script/posca_factor_ping.py
+++ b/
testsuites/posca/testcase_script/posca_factor_ping.py
@@
-23,6
+23,7
@@
import Queue
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
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 utils.infra_setup.runner.yardstick as runner_yardstick
import testsuites.posca.testcase_dashboard.posca_stress_ping as DashBoard
import utils.infra_setup.runner.docker_env as docker_env
import testsuites.posca.testcase_dashboard.posca_stress_ping as DashBoard
import utils.infra_setup.runner.docker_env as docker_env
@@
-42,6
+43,8
@@
test_dict = {
}
testfile = os.path.basename(__file__)
testcase, file_format = os.path.splitext(testfile)
}
testfile = os.path.basename(__file__)
testcase, file_format = os.path.splitext(testfile)
+cidr = "/home/opnfv/repos/yardstick/samples/storage_bottlenecks.yaml"
+runner_DEBUG = True
q = Queue.Queue()
q = Queue.Queue()
@@
-52,39
+55,38
@@
def env_pre(test_config):
test_yardstick = True
stack_prepare._prepare_env_daemon(test_yardstick)
quota_prepare.quota_env_prepare()
test_yardstick = True
stack_prepare._prepare_env_daemon(test_yardstick)
quota_prepare.quota_env_prepare()
- cmd = ('yardstick env prepare')
- LOG.info("yardstick envrionment prepare!")
+ LOG.info("yardstick environment prepare!")
if(test_config["contexts"]['yardstick_envpre']):
if(test_config["contexts"]['yardstick_envpre']):
- yardstick_container = docker_env.yardstick_info['container']
- stdout = docker_env.docker_exec_cmd(yardstick_container, cmd)
+ stdout = runner_yardstick.yardstick_image_prepare()
LOG.debug(stdout)
def do_test():
func_name = sys._getframe().f_code.co_name
out_file = ("/tmp/yardstick_" + str(uuid.uuid4()) + ".out")
LOG.debug(stdout)
def do_test():
func_name = sys._getframe().f_code.co_name
out_file = ("/tmp/yardstick_" + str(uuid.uuid4()) + ".out")
+ parameter_info = {}
yardstick_container = docker_env.yardstick_info['container']
yardstick_container = docker_env.yardstick_info['container']
- cmd = ('yardstick task start /home/opnfv/repos/yardstick/'
- 'samples/ping_bottlenecks.yaml --output-file ' + out_file)
+ cmd = runner_yardstick.yardstick_command_parser(debug=runner_DEBUG,
+ cidr=cidr,
+ outfile=out_file,
+ parameter=parameter_info)
stdout = docker_env.docker_exec_cmd(yardstick_container, cmd)
LOG.info(stdout)
out_value = 0
stdout = docker_env.docker_exec_cmd(yardstick_container, cmd)
LOG.info(stdout)
out_value = 0
- loop_
w
alue = 0
- while loop_
walue < 15
0:
+ loop_
v
alue = 0
+ while loop_
value < 6
0:
time.sleep(2)
time.sleep(2)
- loop_
walue = loop_w
alue + 1
+ loop_
value = loop_v
alue + 1
with open(out_file) as f:
data = json.load(f)
with open(out_file) as f:
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
+ if data["result"]["criteria"] == "PASS":
+ LOG.info("yardstick run success")
+ out_value = 1
break
break
- el
if data["status"] == 2
:
+ el
se
:
LOG.error("yardstick error exit")
LOG.error("yardstick error exit")
+ out_value = 0
+ break
q.put((out_value, func_name))
return out_value
q.put((out_value, func_name))
return out_value
@@
-121,9
+123,8
@@
def run(test_config):
LOG.info("Create Dashboard data")
DashBoard.posca_stress_ping(test_config["contexts"])
LOG.info("Create Dashboard data")
DashBoard.posca_stress_ping(test_config["contexts"])
- LOG.info("bottlenecks envrionment prepare!")
env_pre(test_config)
env_pre(test_config)
- LOG.info("yardstick env
ri
onment prepare done!")
+ LOG.info("yardstick env
ir
onment prepare done!")
for value in test_num:
result = []
for value in test_num:
result = []