summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-02-16Merge "NSBPerf: fix indent"Rex Lee1-1/+1
2017-02-16Merge "load_images: update flavor for _ovs_ scenarios"Kubi1-1/+1
2017-02-16Merge "pylint fixes: remove redundant parens, fix comparison order"Rex Lee7-9/+9
2017-02-16Merge "Update Openstack CLI Command in yardstick ha test framework ↵Rex Lee3-3/+3
configuration files and TC052"
2017-02-16Merge "set log file to store debug info"Rex Lee1-0/+2
2017-02-14NSBPerf: fix indentRoss Brattain1-1/+1
Change-Id: Ic51168aa786a5ac5ed589c2c4d23882d76253343 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-14load_images: update flavor for _ovs_ scenariosMaryam Tahhan1-1/+1
Update the nova flavor used for the following scenarios: * os-nosdn-kvm_ovs_dpdk_bar-ha * os-nosdn-kvm_ovs_dpdk-ha without interfering with older scenario os-nosdn-ovs-noha. Change-Id: Id641e57a5f41413a891d4335ce2d119a5e8088e9 Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2017-02-14Update Openstack CLI Command in yardstick ha test framework configuration ↵tjuyinkanglin3-3/+3
files and TC052 JIRA: YARDSTICK-547 Change-Id: Idde2dc56436c9cf4b8696bfd0056ab4e47c97c9a Signed-off-by: tjuyinkanglin <14_ykl@tongji.edu.cn>
2017-02-14Merge "Update Openstack CLI Command for Scenario-based HA Testcases which ↵Kubi5-15/+15
have multiple commands: yardstick tc025, tc050 ,tc051, tc053, tc054"
2017-02-14Merge "Update CLI Command in yardstick TC019, TC045~TC048"Kubi5-6/+6
2017-02-14Merge "heat: minor fixes, don't use len > 0 and use next instead of [0]"Kubi1-2/+2
2017-02-14Merge "Bux: task_id parameter from API can not pass to yardstick core"Rex Lee1-1/+1
2017-02-14Update Openstack CLI Command for Scenario-based HA Testcases which have ↵tjuyinkanglin5-15/+15
multiple commands: yardstick tc025, tc050 ,tc051, tc053, tc054 JIRA: YARDSTICK-546 Change-Id: Id94b32f5e053f3f6a7c78980dce22b3aab7bbd13 Signed-off-by: tjuyinkanglin <14_ykl@tongji.edu.cn>
2017-02-14Merge "fix super() calls, must use explicit class name"Rex Lee5-7/+7
2017-02-14Merge "more logging fixes"Rex Lee5-25/+23
2017-02-14Merge "remove trex install from run_tests.sh."Rex Lee1-23/+0
2017-02-14Merge "heat: convert open to context manager"Rex Lee1-3/+4
2017-02-14Merge "heat: close file before parsing template"Rex Lee1-1/+1
2017-02-14Merge "vnf_generic: replace list comprehension with generator expression"Jing Lu1-3/+3
2017-02-14Merge "Bugfix: write_json_to_file: use json.dump with files"Jing Lu1-1/+2
2017-02-14Merge "nsb: move NSB root to constant, add unittest"Jing Lu2-7/+16
2017-02-14Merge "vnf_generic: convert sshmanager to class"Jing Lu2-29/+29
2017-02-14Merge "test_tg_text: fix indentation"Jing Lu1-1/+1
2017-02-14Merge "vnfdgen: replace six.iteritems() with .items()"Jing Lu1-3/+3
2017-02-14Merge "test_vnf_generic: fix unitests when files are present"Jing Lu1-74/+92
2017-02-14Merge "Bugfix: apex_lake: sort json keys for git"Jing Lu3-6/+9
2017-02-14Merge "test_env_action: use dict literal"Jing Lu1-1/+1
2017-02-14set log file to store debug inforexlee87761-0/+2
so the debug info can be pushed into artifacts JIRA: YARDSTICK-507 Change-Id: I35f50e69adc0125f6136aab3ca0e35e2d9500112 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2017-02-13Update CLI Command in yardstick TC019, TC045~TC048tjuyinkanglin5-6/+6
JIRA: YARDSTICK-545 Change-Id: Ifd3348e029f0ddbfa0117b4eef4493d443a4de4d Signed-off-by: tjuyinkanglin <14_ykl@tongji.edu.cn>
2017-02-13Merge "Push yardstick debug log into the artifacts"Kubi2-1/+6
2017-02-10Bux: task_id parameter from API can not pass to yardstick corechenjiankun1-1/+1
JIRA: JIRA: YARDSTICK-531 Now in API entry the task_id parameter will not pass to yardstick core. I fix it by pass task_id to yardstick.benchmark.core.task.start() method. Change-Id: Icf58f2f68549ca3314d6ec0f118b360537126d41 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-02-10Merge "KVMFORNFV: Implementing test suites for kvmfornfv ovs+dpdk+barometer ↵Jing Lu2-0/+100
scenarios."
2017-02-10KVMFORNFV: Implementing test suites for kvmfornfv ovs+dpdk+barometer scenarios.Navya2-0/+100
This patch implements test suites for kvmfornfv os-nosdn-kvm_ovs_dpdk_bar-ha and os-nosdn-kvm_ovs_dpdk_bar-noha scenarios. Change-Id: Idb7d360aa5b91a15d1c69566418a9da4b68db7ab Signed-off-by: Navya Bathula <navyax.bathula@intel.com>
2017-02-10Merge "uwsgi: move init_db to uwsgi entry point"Jing Lu2-4/+9
2017-02-09fix super() calls, must use explicit class nameRoss Brattain5-7/+7
self.__class__ is not correct. For Python 2 we have to explicitly use the class name see http://stackoverflow.com/questions/4235078/how-to-avoid-infinite-recursion-with-super Change-Id: I584ca565707b7331c1742fb33c8b524f7b7c9bf9 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-09Fix: yardstick-docker-build-push-master failureJingLu51-0/+1
JIRA: YARDSTICK-552 Change-Id: I5c006b2fcbffb6a3904c378ab0557b5ce437d9ed Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-02-08remove trex install from run_tests.sh.Ross Brattain1-23/+0
We have mocked out all the Trex imports, so we don't need to download the Trex library It doesn't really make sense to down external libraries each time we run unittests. Trex is a large stand-alone package and shouldn't really be used during unittests Importing Trex caused some odd pyzmq import errors on Python 3 File "/home/jenkins/opnfv/slave_root/workspace/yardstick-verify-master /trex/scripts/external_libs/pyzmq-14.5.0/python3/fedora18 /64bit/zmq/backend/cython/__init__.py", line 6, in <module> from . import (constants, error, message, context, ImportError: cannot import name 'constants' Change-Id: I2ed06c0f88061baeff9ec96534cc59cca81924cc Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-08uwsgi: move init_db to uwsgi entry pointRoss Brattain2-4/+9
uwsgi will call the 'callable' function which should normally be Flask.__call__(). But we need to init the db first, so make a wrapper function that inits the db and then calls app() Also refactor add_resource into for loop instead of reduce. reduce is not really approriate here since we aren't consuming the return value JIRA: YARDSTICK-543 Change-Id: I692d6d42de09f7d6ecf1a67a22e3019d97a4f3ca Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-07more logging fixesRoss Brattain5-25/+23
don't use .format() with logging, use regular %s logginer formatter Change-Id: I1ce0d81cc3f81c35003ef453e82c57faeb46c49f Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-08test_env_action: use dict literalRoss Brattain1-1/+1
use literal forms when possible Change-Id: I2d815f40007aa2259f3f3bcb2b9cd84a11027422 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-08Bugfix: apex_lake: sort json keys for gitRoss Brattain3-6/+9
experiment_1.yaml.json are in git and everytime the unnitests are run the json file is re-generated with a slightly different key order so it make the git directory dirty. use sort_keys=True to try to maintain a consistent json file so git doesn't detect a difference Change-Id: I7859664e00561e8db032849a6664fb933a36702b Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-08pylint fixes: remove redundant parens, fix comparison orderRoss Brattain7-9/+9
removed redundant parens in if and while clauses use var != constant, not constant != var. Python doesn't allow for assignment in if statements, so we don't have to use the old C workarounds remove unwanted commas use raw strings for regexps with backslashes, e.g. r'\s' instead of '\s' Change-Id: I7aad645dd3d7f4b4b62f4e4510a425611c9d28f2 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-08nsb: move NSB root to constant, add unittestRoss Brattain2-7/+16
add unittest for non-None default fixup get_nsb_option to return default correctly. use NSB_ROOT for all paths Change-Id: Idd1951a8d436bc49c30d59d84ca12a5f26e9148f Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-08test_vnf_generic: fix unitests when files are presentRoss Brattain1-74/+92
replace paths with empty strings so unittests see the Exception they expect when the files are not present Otherwise unitests are dependent on local filesystem state fix pylint issues, adjust formatting removed duplicate key Change-Id: I7857988c6e6bf586b0eb403fb1d3a3da7f170cbf Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-08vnfdgen: replace six.iteritems() with .items()Ross Brattain1-3/+3
Openstack python3 style guide prefers to not use six.iteritems() but instead use data.items() for all cases. We should follow the Openstack guides since OPNFV is aligned with Openstack https://wiki.openstack.org/wiki/Python3#Port_Python_2_code_to_Python_3 Common patterns: * Replace "for key in dict.iterkeys()" with "for key in dict" * Replace dict.iteritems() with dict.items() * Replace dict.itervalues() with dict.values() Change-Id: I99b0505199a568771341658caf8b71c1896db9cd Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-08vnf_generic: replace list comprehension with generator expressionRoss Brattain1-3/+3
no need to build a list, just use next Change-Id: I8a899ac538849b765f12bebda4fb8c89c84f333e Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-08vnf_generic: convert sshmanager to classRoss Brattain2-29/+29
@contextmanager have an issue with respect to exceptions that makes them not suitable for real usage. @contextmanager uses yield to create a generator and then uses generator.throw() to raise any exceptions. Exceptions thrown from generators loose their call stack due to the way generators work, so any exception inside a context manager is harder to debug. For this reason we don't use @contextmanager and instead always define a new class with __enter__ and __exit__. There is sample code that demonstrates the issue with @contextmanager and generator.throw() here https://gist.github.com/rbbratta/e28b6e64a4551522c3ac9815ca7f25f0 Change-Id: I5383c01f40a63e33680112f39b5bd9c858e328f1 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-08Bugfix: write_json_to_file: use json.dump with filesRoss Brattain1-1/+2
In python3 file objects automatically handle encoding to utf-8 and expect string, not bytes, so use regular json.dump() with the file object We should only use dump_as_bytes to replace json.dumps(), not to replace json.dump() This fixes Python3 issue: Traceback (most recent call last): File "yardstick/main.py", line 52, in <module> main() File "yardstick/main.py", line 49, in main YardstickCLI().main(sys.argv[1:]) File "yardstick/yardstick/cmd/cli.py", line 167, in main self._dispath_func_notask() File "yardstick/yardstick/cmd/cli.py", line 145, in _dispath_func_notask func(CONF.category) File "yardstick/yardstick/cmd/commands/task.py", line 48, in do_start self._init_result_file() File "yardstick/yardstick/cmd/commands/task.py", line 57, in _init_result_file write_json_to_file(consts.DEFAULT_OUTPUT_FILE, data) File "yardstick/yardstick/common/utils.py", line 152, in write_json_to_file write_file(path, jsonutils.dump_as_bytes(data), mode) File "yardstick/yardstick/common/utils.py", line 157, in write_file f.write(data) TypeError: write() argument must be str, not bytes Change-Id: I573419be25d8fa1f015e1507730ba66c05f86686 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-08test_tg_text: fix indentationRoss Brattain1-1/+1
flake8 error Change-Id: Ia4c90c2703335123ea48c8421a84d7288126dcf6 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-02-08Proposing Trevor Cooper as a commiter in yardstickkubi1-0/+1
Trevor Cooper has contributed greatly to yardstick D release. Achievement/Contributions include: Vsperf integration with yardstick. NSB integration coordination. Host US slot yardstick weekly meeting. Draft Stress Test proposal in testperf. Draft new Testing Projects Ecosystem graph. Change-Id: I783335a77cfe3926c0c8ff76174ef3cc4f203fd6 Signed-off-by: kubi <jean.gaoliang@huawei.com>