Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
|
|
|
|
JIRA: YARDSTICK-587
When run in https environment, there is a bug:
error: failed to deploy stack: '_init_() got an unexpected keyword argument 'ca_cert''
The reason is the key pass to Session() is cacert, but the key should be
verify.
Change-Id: Ia9fc1d7908c2fca9d827a5f64deac7cd333d5c07
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
|
|
|
|
heatclient.common.http.SessionClient
automatically json.dumps the data in kwargs.
If we json dump ourselves we end up double-decoding
which is invalid.
heatclient.common.http.py:
class SessionClient(adapter.LegacyJsonAdapter):
"""HTTP client based on Keystone client session."""
def request(self, url, method, **kwargs):
redirect = kwargs.get('redirect')
kwargs.setdefault('user_agent', USER_AGENT)
if 'data' in kwargs:
kwargs['data'] = jsonutils.dumps(kwargs['data'])
kwargs['data'] includes the template,
so this is double-decoding in JSON
JIRA: YARDSTICK-584
Change-Id: I663af42f7e92e285b540b614ceda87f17da5f22d
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
|
|
|
|
Labels serve as anchors/ refs when referenced from other documents
This patch adds labels to docs/*/*/index.rst
Change-Id: I046277771130cc6298636fb30f9d6dae7de224cf
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
|
|
Change-Id: I73744a9e0f1830688a171f3f28044926b13f8a43
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
|
|
Updating the trex version and downloading the right version for vnf testing :)
Change-Id: Iaca74ce627a05128a60bdc331968d2c56c06522f
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
|
|
fixes for shellcheck warning
ubuntu-server-cloudimg-modify.sh:51:23: warning: Quote this to prevent word splitting. [SC2046]
ubuntu-server-cloudimg-modify.sh:51:30: note: Double quote to prevent globbing and word splitting. [SC2086]
Change-Id: I6cff0713a0471e5ce94211d42a7c8b45e3761c4d
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
|
|
https://build.opnfv.org/ci/view/fuel/job/yardstick-fuel-virtual-daily-master/1233/console
+ '[' grep -q trusty /etc/apt/sources.list ']'
/ubuntu-server-cloudimg-modify.sh: line 27: [: too many arguments
If will check exit status itself, we don't need to use test
Change-Id: I3edcf6ef2cbbf888f1089345764a00f9dbd206bd
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
|
|
https://build.opnfv.org/ci/view/fuel/job/yardstick-fuel-virtual-daily-master/1233/console
saw this in an error log, not sure if it is a real error
+ [[ amd64 = \a\r\m\6\4 ]]
+ git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT
fatal: destination path '/opt/tempT' already exists and is not an empty directory.
+ error_trap
+ local rc=128
+ set +e
+ '[' -z '' ']'
+ exitcode=128
workaround by deletign /opt/tempT always before cloning
also improve ln with relative symlink and forcing filename target
Change-Id: I6715e6dba76b79706d396b616eae980e5ace773b
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
|
|
load_images.sh arm64 change had issue with shell
load_images.sh: line 34: [: amd64=: unary operator expected
https://build.opnfv.org/ci/view/yardstick/job/yardstick-compass-baremetal-daily-master/894/console
Change-Id: I14f0b8628db7ac90a4966f85e9e7e27a0e0fae02
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
|
|
JIRA: YARDSTICK-585
In CI when run tc070, there is a error: Failed executing command: 'free -s 1 -c 10'
Here it is the log:
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/compute/memload.py",
line 126, in run
result.update(self._get_mem_usage())
File
"/usr/local/lib/python2.7/dist-packages/yardstick/benchmark/scenarios/compute/memload.py",
line 116, in _get_mem_usage
result = self._execute_command(cmd)
File
"/usr/local/lib/python2.7/dist-packages/yardstick/benchmark/scenarios/compute/memload.py",
line 70, in _execute_command
cmd, stderr)
RuntimeError: ('Failed executing command: ', 'free -s 1 -c 10',u"free: seconds argument `1' failed\n")
And it is a bug of free. the -c option should in front of -s, so change the position will solve
this problem.
Also it has another bug:
'KeyError', there no 'cached' keyword, so I change it to 'buff/cache'.
Change-Id: I0ca16e8d8cc11c6a3b2f364cadbdb3ea367eee53
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
|
|
We should have run shellcheck on this.
This is why we don't use the shell, too many
obscure gotchas.
shellcheck: load_images.sh:25:75: warning: sudo doesn't affect redirects. Use .. | sudo tee -a file [SC2024]
sudo echo foo >> /etc/foo won't work,
the >> will be run in the current shell,
replace with:
echo foo | sudo tee -a /etc/foo
shellcheck: load_images.sh:47:15: warning: Declare and assign separately to avoid masking return values. [SC2155]
replace local cmd='a' with two line version
shellcheck: load_images.sh:141:32: error: [ .. ] can't match globs. Use [[ .. ]] or grep. [SC2081]
use [[ ]]
Change-Id: I14d9768612ea147eaf139603f7eb8753e979ba2c
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
using API in parallel"
|
|
isinstance allows for matching with list and dict subclasses
as well and list and dict themselves
Use collections.Mapping for dict
We still have to use list, because iterable is too generic,
strings are iterable for example.
use dict literal for point
fix logging to use deferred interpolation
Change-Id: I4c9b27fd07b57139e86315e39f58d54cc18e402d
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
|
|
JIRA: YARDSTICK-574
Since the yardstick framework now has supported an improved node type context,
this patch adds support for VM NUMA pinning ability in the node type context.
It provides several scripts that can be used to configurate the controller and
compute nodes
Change-Id: If5eafdca6df1b1196bc17bfdd12aea9f4016752f
Signed-off-by: JingLu5 <lvjing5@huawei.com>
|
|
in parallel
JIRA: YARDSTICK-575
Currently yardstick will create stacks with the same name when run using
API in parallel.
The reason is there is a global variable in context base and the core
will always deploy the first context in Context.list. When run in
parallel, it will run in the one process. So yardstick will deploy
stacks with the same name.
The solution is do not use Context.list in yardstick core. And using a
local variable instead.
BTW, if we use API to call yardstick core, we can not config the output
way. So I parse yardstick.conf when task start. And I think we can
include scenario_cfg, context_cfg, yardstick_cfg in one config object
later so that we can get all config in one object.
Change-Id: I1ada4ef486bd252e78c3a2e49c6a39b3f8f16a7c
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
|
|
It looks like jsonutils.load uses a codec reader
to read from the file, but we already are using
Python 3.5 open() which should already do the UTF-8
decode itself.
return json.load(codecs.getreader(encoding)(fp), **kwargs)C
When we use jsonutils.load() we get a TypeErorr when concating
str and bytes
2017-02-28 16:42:38,431 yardstick.cmd.commands.task task.py:61 ERROR
Traceback (most recent call last):
File "yardstick/yardstick/cmd/commands/task.py", line 58, in do_start
self._finish()
File "yardstick/yardstick/cmd/commands/task.py", line 69, in _finish
result = read_json_from_file(self.output_file).get('result')
File "yardstick/yardstick/common/utils.py", line 136, in read_json_from_file
return jsonutils.load(f)
File "yardstick_venv3/lib/python3.5/site-packages/oslo_serialization/jsonutils.py", line 241, in load
return json.load(codecs.getreader(encoding)(fp), **kwargs)
File "/usr/lib/python3.5/json/__init__.py", line 265, in load
return loads(fp.read(),
File "yardstick_venv3/lib/python3.5/codecs.py", line 497, in read
data = self.bytebuffer + newdata
TypeError: can't concat bytes to str
So switch back to jsonutils.loads() which does nothing if the
bytes are already decoded.
JIRA: YARDSTICK-584
Change-Id: I36acfda3df2b46d16a87f2741a04fe7ee8e8d89b
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
|
|
|
|
JIRA: YARDSTICK-554
align with opnfvdocs path structure about testing projects
Change-Id: I6c2f2d37e41447dccd76b9f4426d00fd85cb1e3b
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
|
|
Previously before we disabled Trex in the unittests
we were hitting an error when running Python3.5,
see full description in 28209
https://gerrit.opnfv.org/gerrit/#/c/28209/
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'
It looks like this was an actual upstream Trex bug
and it was fixed in
https://github.com/cisco-system-traffic-generator/trex-core/commit/9808fce2b0b3b5b7c9b28303e99486501a1cc10d
zmq: fix wrong constants.so (was used from 3.5 to both versions)
Yaroslav Brustinov <ybrustin@cisco.com>
This Trex fix should be in v2.20.
We don't test Trex in unitests, but people running
Trex on Python3 should hit this issue.
Change-Id: Ic914e48819d7fd3e951628f7c3d3778849da7d94
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
|
|
Add support for downloading and building an uefi single part image.
Keep three part image support if needed.
Keep modifications required for arm64, when using vivid.
Install and use parted required for GPT partitioning.
Change-Id: I1a9a20701e2fe1f6f644f2c687c5da2e09b69d89
Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
|
|
|
|
env prepare should check if openrc is sourced before
using os_fetch_utils to fetch openrc
JIRA: YARDSTICK-577
Change-Id: I0efb0bae3b408156b1133812c29583ab8c58d94b
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
|
|
|
|
|
|
|
|
if there are no external networks defined
then assign the external network to the first
network as determined by standard sorting
Change-Id: I9d32eca258f8e7de3d44cec4124c0e8c020c0b85
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
|
|
JIRA: YARDSTICK-576
Currently the reporting_target reuse the http_target.
But if we want to custom reporting_target, the http_target is also change,
and the yardstick result will store in mongoDB.
So I add reporting_target to split them.
Change-Id: Ib0e4e8ec9a55f49027f9776931fdaa7dc194654b
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
|
|
The DEBUG log can be stored as file and pushed into artifacts.
Default sys.out level should be INFO. Stream level can be
changed to DEBUG if cli "-d" is enabled.
remove "-v" since it's not useful for a test framework
JIRA: YARDSTICK-507
Change-Id: I3caafd31a2caac73b0e3f33c2762c090e76c707e
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
|
|
Change-Id: I46e4e21787a9b0a3104b2a684d62f50681258205
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
|
|
We init all the fields to None, so the default value
is None, which is what .get() returns when the key
is not present it the dictionary.
Replace
if key in dict:
self.val = dict[key]
with
self.val = dict.get(key)
This also has the added beneifit of re-initializing
default values to None.
In idiomatic Python we do not check a dictionary twice
if we can avoid it. Either use dict.get() with a default
value or catch the KeyError and do the correct thing.
Change-Id: If8d1caeb7288f888f02622d62e8db9f59f50717a
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
|
|
experiment_[12].yaml are generated from templates
during the unittest, so they will be overwritten.
yardstick/vTC/apexlake/tests/data/generated_templates/vTC.yaml
was submitted by Vincenzo Riccobene in gerrit
https://gerrit.opnfv.org/gerrit/#/c/11333/
so assign copyright to Intel instead of invalid
user@TRAFCLASS-PACKET1.fuel.local
Change-Id: If516037c4f4c859e417ca12e6d5300e4e0a3817c
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
|
|
|
|
|
|
|
|
JIRA: YARDSTICK-566
Current Heat context support affinity and availability arguments
but not support affinity and anti-affinity.
Enhance Heat context to support affinity and anti-affinity:
1. can create heat server group with affinity/anti-affinity
2. each server could be specified which server group they are in
Change-Id: I46e7376fd116c6e109cb5dcb1c168460918e6d43
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
|
|
JIRA: YARDSTICK-569
We have much redundancy code when using nova/neutron/glance... python client.
So I write this code in openstack_utils for calling.
Change-Id: I322b7577de4933246a15e6742ae5a28bea16eb02
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
|
|
JIRA: YARDSTICK-509
Currently we use influxdb as database and will not record test case name
when run a test suite. So if we must offer test case name if we want to
get result from API.
I will record test case name when run a test suite. So we needn't
offer test case any more when call for get result API.
Change-Id: I87ea4770422cbc46aa6671bfcc53bd4498825eef
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
|
|
|
|
|
|
|