aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-06-22Merge "auto restart influxdb and grafana support"Ross Brattain1-2/+7
2017-06-22improve git code with devstack functionsRoss Brattain1-19/+67
if we aren't re-cloning we still need to make sure we update the branch/tag/commit to the version from the remote so we need to fetch and then checkout again it is more complicated. Dockerfile does a shallow clone, so we don't get all the remote ref information. To clone a random remote commit id we have to unshallow Change-Id: If15f504b6ff2cfdfc8894fd3b37e687a19616714 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-06-22Merge "Acquire NSB specific data from Heat."Ross Brattain11-151/+780
2017-06-22Merge "HA testcase improvement"Kubi11-25/+83
2017-06-22Merge "bugfix: storperf timeout in ci"Kubi2-1/+7
2017-06-22HA testcase improvementJingLu511-25/+83
This patch improve HA test case in the following aspects: 1. the "GeneralHA" type now will check if the target service process in the controller node. 2. support ignore server certificate 3. add debug log for recovering service failed 4. improve method to kill keystone process Change-Id: I9ae7ab54391fe41d5d7f3e4951a7ac2e3ba75968 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-06-22auto restart influxdb and grafana supportrexlee87761-2/+7
JIRA: YARDSTICK-686 Change-Id: If486df4d825f9d0b03eeaa77716cc2855e2f1bd0 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2017-06-22bugfix: storperf timeout in cirexlee87762-1/+7
JIRA: YARDSTICK-680 Change-Id: Ie405187b8ab085a9e4f40a7e7e7e661c94e83630 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2017-06-22Yardstick output format unifiedchenjiankun15-298/+299
JIRA: YARDSTICK-658 Currently the yardstick have three dispatcher: file, influxdb, mongodb. (influxdb using API to get result and mongodb using testAPI to get result) But their output format is different. It is hard to use. In this patch, make all dispatchers using the same data source. And make the output format of file and influxdb unified. As for mongodb, since it is related to testAPI, so I make it push data every test case. The unified output format is: http://paste.openstack.org/show/610125/ Change-Id: I854ac4f03e6f904469b07b0c924c7d850545ae5b Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-06-22Merge "update requirements.txt for OpenStack Ocata"Ross Brattain1-54/+53
2017-06-22Merge "ping: don't split if target_vm is a dict"Ross Brattain1-1/+4
2017-06-22Merge "cleanup: remove fuel plugin since fuel@opnfv uses mcp"Ross Brattain13-556/+0
2017-06-22Merge "temp freeze releng version for stable/danube workaround"Jing Lu1-1/+2
2017-06-21increase line length to 99Ross Brattain1-0/+1
When line length is 79 I have to spend too much time manually wrapping my code into unreadable junk I can't use expressive tuple unpacking and I start shortening variables and other bad tricks to decrease the line length. We have too many levels of indent to manage with 79 class: def: if: for: etc. Change-Id: Ib2ce9cf887f9880c46815822c8d0e1a7806e53ca Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-06-21Merge "heat: use dict literal in init_template"Ross Brattain1-11/+18
2017-06-20temp freeze releng version for stable/danube workaroundRoss Brattain1-1/+2
releng doesn't have a branch, so we need to freeze the releng version. There is an issue with releng fetch_os_creds.sh change /home/opnfv/repos/releng/utils/fetch_os_creds.sh: line 75: BRANCH: unbound variable So we need to revert back to commit before this change Change-Id: Ie8b0f68879a873aab584aa32b576d8b5ba602a13 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-06-20ping: don't split if target_vm is a dictRoss Brattain1-1/+4
If we run sample/ping-hot.yaml, it will encounter an AttributeError, log see below: Traceback (most recent call last): File "/usr/local/lib/python2.7/dist-packages/yardstick/benchmark/runners/duration.py", line 69, in _worker_process method(data) File "/usr/local/lib/python2.7/dist-packages/yardstick/benchmark/scenarios/networking/ping.py", line 94, in run target_vm_name = target_vm.split('.')[0] AttributeError: 'dict' object has no attribute 'split' Because here host and target will be a dict JIRA: YARDSTICK-561 Change-Id: I4b7628bf20050d6d516a80efe3785f750d27c05e Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-06-20Acquire NSB specific data from Heat.Edward MacGillivray11-162/+798
First we add mac_address, subnet_cidr to Heat template outputs Then we convert those into a form for NSB and add vld_id. NSB also requires PCI Bus ID, kernel driver and dpdk_port_num. We get this by ssh-ing into instance and dumping sysfs We also need to fix allow for ssh key auth, and implement relative path file loading so NSB can find all its YAML files JIRA: YARDSTICK-580 Change history: don't hide heat create tracebacks we need tracebacks for debug vnf_generic: add task_path to scenario so we can load relative paths for vnf_generic we want to be able to load yaml relative to the task path For example: traffic_profile: ../../traffic_profiles/fixed.yaml topology: ping_tg_topology.yaml # TODO: look in relative path where the tc.yaml is found These need to be relative to samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml Add a scenario["task_path"] entry heat: log actual exception vnf_generic: replace list with set and iterate over values() some general refactors to remove redundact lookups and type conversions heat: provide mac_address, device_id and network_id from outputs We may need more information to dynamically determine test topology. Towards this end return more info in the heat template. We can return mac_address, device_id and network_id. Once we have this info we can add it to the context_cfg as an interfaces dict. add sample vnf ping multi-network test this test requires 3 network, one for mgmt and the other two for NSB traffic tests We have to make sure we don't use DPDK on mgmt interface because DPDK unbinds the driver heat: convert networks to OrderedDict so we can lookups networks as well as iterate over them in consisitent order heat: and vld_id to networks for vnf_generic vnf_generic uses vld_id Virtual Link Descriptor ID to identify interfaces Add the key to the networks dict and store in Networks object implement relative path file loading in vnf_generic in multiple places we need to load a file relative to the task path, so add open_relative_file_path and modify load_vnf_model to include the scenario_cfg parameter so we have access to task_path DRAFT: heat timeout support Heat stack in CI job failed due to some Nova issue. But then apparently yardstick kept running and took 180mins to timeout https://build.opnfv.org/ci/view/bottlenecks/job/bottlenecks-compass-posca_stress_ping-baremetal-daily-master/16/console We can add a Heat create timeout and fail faster if there is an error. The question is how long should we wait for a Heat stack to deploy. We can set a default and allow override in the heat context config, if users make complicated stacks heat: get netmask and gateway from heat outputs we have do some tricky business with finding the subnet cidr and converting it into netmask vnf_generic: get vpci, driver and dpdk_port_num use a big old find command to dump all the sysfs netdev info nicely. This was re-used from autotest FCoE tests. r"""find /sys/devices/pci* -type d -name net -exec sh -c '{ grep -sH ^ \ +$1/ifindex $1/address $1/operstate $1/device/vendor $1/device/device \ +$1/device/subsystem_vendor $1/device/subsystem_device ; \ +printf "%s/driver:" $1 ; basename $(readlink -s $1/device/driver); } \ +' sh \{\}/* \; This finds all PCI devices that are network devices, then dumps all the relevant info using /bin/sh. Then we parse this into a 'netdevs' dict inside the node_dict and also convert into VNF fields we need. vnf_generic: set node name for kpis node is a dict, so we have to use node_name vnfdgen: we CANNOT use TaskTemplate.render because it does not allow for missing variables, we need to allow password for key_filename to be undefined remove default ssh password hack, once rendering is fixed add new example tc_external_ping_heat_context Change-Id: If1fe0c1a2ab0a5be17e40790a66f28f706fa44d6 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> Signed-off-by: Edward MacGillivray <edward.s.macgillivray@intel.com>
2017-06-20Configure Yardstick flavor to give more RAM to ARM instancesAlexandru Nemes1-1/+1
Yardstick TC005 fails with errors that indicate low memory conditions: "fio: error while loading shared libraries: librbd.so.1: cannot map zero-fill pages" Changing the yardstick flavor to give 1024MB of RAM instead of 512MB made this test case work. JIRA: ARMBAND-275 Change-Id: I2193802082c28edb20004964d2df3780eb5eccb7 Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com>
2017-06-19heat: use dict literal in init_templateRoss Brattain1-11/+18
prefer dict literals when possible over increment assignment. Change-Id: Ia40bbc04eed61feb036a1e9ec3b3110b03c095e1 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-06-15cleanup: remove fuel plugin since fuel@opnfv uses mcpGuo Ruijing13-556/+0
Change-Id: Ic9fb9db5c5af517cec1e60740ce5a8fe0572c5bf Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2017-06-08Merge "Fix configuration error in TC025"Ross Brattain2-1/+58
2017-06-08Merge "Adapt lmbench scripts for aarch64 nodes"Ross Brattain3-4/+21
2017-06-07Bugfix: load_image will move image file if image already exist in ↵chenjiankun1-6/+0
/home/opnfv/images JIRA: YARDSTICK-678 Currently if yardstick-image exist in /home/opnfv/images, load_image.sh script will not build image, but this script will remove it. We should not remove the image file which user offer. Change-Id: I74ff6717606ff1dd9eacde4142e62d3923394baa Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-06-07Fix configuration error in TC025tjuyinkanglin2-1/+58
JIRA: YARDSTICK-647 Change-Id: Idc2a87d20a631c37f151cc945de155ef8855e9c3 Signed-off-by: tjuyinkanglin <14_ykl@tongji.edu.cn>
2017-06-06Adapt lmbench scripts for aarch64 nodesAlexandru Nemes3-4/+21
LMBench shell scripts were invoking x86_64 executables. This made them fail when executed on aarch64 nodes. Added architecture detection and proper command call. JIRA: ARMBAND-268 Change-Id: I8c9e87158631f7f5479adc2fda9558f9f7e54406 Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com>
2017-06-06fix No handler warning by calling _init_loggingRoss Brattain1-0/+4
No handlers could be found for logger It looks like we need to call _init_logging to properly setup the logging during unittests. This should fix the influxdb unittest warning. JIRA: YARDSTICK-506 Change-Id: I57f6e4088005a691d6587fc68b85455ff257a66c Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-06-05update requirements.txt for OpenStack OcataRoss Brattain1-54/+53
add shade for ansible update other versions to make OpenStack Ocata upper-contraints.txt sort file using C.UTF-8 locale as OpenStack does. C.UTF-8 locale sorts Upper-case before lower-case. Change-Id: Ia20eaa2b024be5cc8595873b8cc5dcba5f25d10b Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-06-05Merge "utils: make module import safer"Ross Brattain1-1/+4
2017-06-05Merge "Added arm condition in install.sh to avoid installation error on ubuntu."Rex Lee1-2/+9
2017-06-05Merge "Pass parameters between scenarios"Rex Lee9-12/+121
2017-06-02utils: make module import saferRoss Brattain1-1/+4
If a module fails to import, then ignore it and try the next module. This can help if certain module depenencies aren't installed, e.g. TREX. Change-Id: I2bc4384429fabd61cd430817489cb2f3c86fe9b2 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-06-01Merge "Bugfix: AttributeError when run tc055"Ross Brattain1-3/+7
2017-05-31Add a new runner to do binary search for max PPSJing Zhang1-0/+169
A run consists of multiple (configurable) iterations. The first iteration starts from a configured packet rate. The subsequent iterations start from the observed rate from the previous run. An iteration is a binary search for maximum pps while not exceeding 10-6 packet loss rate. The upper rate is capped to the last pps when packet loss target is missed, the bottom rate is capped to the last pps when packet loss target is met. An iteration stops when the upper rate and the lower rate are close enough (configurable) or the received rate is well below the sending rate. The output observed rate is set to the bottom rate. Update-1: local run of run_tests.sh is good, but two lines are reported by Jekins as too long Update-2: Minor fix to cope with "pps" is not defined in test case yaml file. Update-3: Add pragma to skip unit test for this patch. JIRA: YARDSTICK-613 Change-Id: I2411b173d18d928cc1cf08f883b08bc13a125ea2 Signed-off-by: Jing Zhang <jing.c.zhang@nokia.com>
2017-05-27Imporve monitor_process pass criteriaJingLu513-32/+54
JIRA: YARDSTICK-660 The monitor func()'s criteria in the monitor_process.py now is whether at least one process of the specific controller node service is recovered. But in reality is more resonable to use whether processes have been recoverd to it's original amount. This patch is aiming at improving the isssue Change-Id: I950ce2a89555801b96092735b0d670e892049927 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-05-27Merge "This is the vote for yardstick new PTL"Kubi1-2/+2
2017-05-26Bugfix: AttributeError when run tc055chenjiankun1-3/+7
JIRA: YARDSTICK-662 When I run tc055, I got an error, see log: Traceback (most recent call last): File "/usr/lib/python2.7/multiprocessing/process.py", line 258, in _bootstrap self.run() File "/usr/lib/python2.7/multiprocessing/process.py", line 114, in run self._target(*self._args, **self._kwargs) File "/usr/local/lib/python2.7/dist-packages/yardstick/benchmark/runners/iteration.py", line 46, in _worker_process initial_rate = options_cfg.get("rate", 100) AttributeError: 'NoneType' object has no attribute 'get' This is because in the former patch, we get 'options' by scenario_cfg['options'], it is unsafe since some test case do not have 'options' field. For tc055, 'options' is None. Change-Id: I18a4a7954c18c609f422da403fe65c4739c93648 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-05-26Pass parameters between scenarioschenjiankun9-12/+121
JIRA: YARDSTICK-641 Allowing parameters to pass between scenarios so that the one test case can be combination of several scenarios. Change-Id: I55a00855e77d5b719a27a069a3ea195d6bbd0ef8 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-05-25Added arm condition in install.sh to avoid installation error on ubuntu.Maciej Skrocki1-2/+9
Change-Id: Iaa07a8d68a7dede6f2b42440be44ed07f035b1ca Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-05-25Terminate openstack service process using kill command in HA test casesJingLu51-2/+5
JIRA: YARDSTICK-659 In some openstack environment, the service process cannot be killed by killall command but can be terminate by kill command. This patch is about to switch to use kill command in the fault_process_kill.bash to kill processes. Change-Id: Iec455ee56d3f31fb5c16de5994870d1acd33f41a Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-05-24fix bug: multi monitorHuanLi1-6/+15
JIRA: YARDSTICK-657 Change-Id: I77223cc43d529828cf3f763529019590c35b2fcb Signed-off-by: HuanLi <lihuansse@tongji.edu.cn>
2017-05-22This is the vote for yardstick new PTLkubi1-2/+2
Ross Brattain who is yardstick commtter has been nominated as new PTL candidate before the nomination end date. As we only have one candidate, we will use gerrit to vote instead of civs all yardstick committers, please vote +2 or -2 before this friday the vote will be closed at that time Reference: https://wiki.opnfv.org/display/yardstick/Yardstick+PTL+Election Change-Id: I561f70051ed2593581ab909f08bd8be88c5b0e77 Signed-off-by: kubi <jean.gaoliang@huawei.com>
2017-05-22Merge "Added PyCharms files to gitignore."Rex Lee1-0/+2
2017-05-20Merge "increase monitor number in cases."Rex Lee12-0/+32
2017-05-18increase monitor number in cases.HuanLi12-0/+32
change cases to multi-monitor mode and improve monitor accuracy. JIRA: YARDSTICK-397 Change-Id: I6840423dd83899b769df76fbee808f9bf5dc4cfd Signed-off-by: HuanLi <lihuansse@tongji.edu.cn>
2017-05-16Added PyCharms files to gitignore.Maciej Skrocki1-0/+2
Change-Id: I09e9aedd80262cf75b0c0549552fc90517a24bf0 Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-05-16Bumped ansible version to 2.2.2.Maciej Skrocki1-1/+1
Change-Id: Ibdf633bd475cc295f53e8236b1938a3354cb4f99 Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-05-16fix multi-monitor unitest hangRoss Brattain1-8/+8
need to mock SSH.from_node().execute.return_value because we switch most SSH calls to use from_node() factory function Change-Id: Ibea525c2fcc243d41de8ccbcd40bc98532d69006 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-05-16Bugfix: change monitor command in tc019JingLu52-9/+9
JIRA: YARDSTICK-655 The original openstack command used for monitoring high availability openstack nova-api service in tc019 is "nova image-list", the "openstack image list" command used in tc019 now may not correctly show the nova-api service status. This is patch swtich the monitor command to "openstack server list". Change-Id: I8810f28b4328ceb4d911a3041a24774ae9cae8f0 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-05-16Merge "Add a new monitor type: MultiMonitor that can run any number of other ↵Ross Brattain3-0/+139
monitors at the same time."