Jing Lu [Thu, 19 Jan 2017 07:02:38 +0000 (07:02 +0000)]
Merge "Add unittest framework for Yardstick API"
Rex Lee [Wed, 18 Jan 2017 10:14:14 +0000 (10:14 +0000)]
Merge "Use """ to replace ''' in docstring"
chenjiankun [Tue, 17 Jan 2017 15:40:17 +0000 (15:40 +0000)]
Add unittest framework for Yardstick API
JIRA: YARDSTICK-538
Currently it is hard to test API, So I add a base class as flask
document do.
In this framework I will mock a temp sqlite database and a server.
Change-Id: If881233cb22655617c07ad018201b8ee08492d06
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
chenjiankun [Tue, 17 Jan 2017 02:54:08 +0000 (02:54 +0000)]
Bugfix: command "openstack image list" failed
JIRA: YARDSTICK-537
Now the openstackclient version is set to 3.3.0, but it cannot support
osc-lib 1.3.0 whose version is automatic set.
So I set openstackclient version to 3.3.0 and osc-lib version to 1.3.0
Change-Id: Ia480feb3621be97a4a97bb027685cc438e01c53e
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Jing Lu [Tue, 17 Jan 2017 02:48:34 +0000 (02:48 +0000)]
Merge "Adding python package requirement for VNF testing."
chenjiankun [Mon, 16 Jan 2017 09:17:48 +0000 (09:17 +0000)]
Use """ to replace ''' in docstring
JIRA: YARDSTICK-525
For consistency, we always use """triple double quotes""" around
docstrings.
Change-Id: I47a20bbd8b55bc544b4841ea4006929af0a044ac
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Kubi [Mon, 16 Jan 2017 02:38:50 +0000 (02:38 +0000)]
Merge "remove failing influx testcases"
Ross Brattain [Mon, 5 Dec 2016 21:11:54 +0000 (16:11 -0500)]
Add support for Python 3
Porting to Python3 using Openstack guidelines:
https://wiki.openstack.org/wiki/Python3
This passes unittests on Python 3.5 and passes opnfv_smoke suite
Updates:
use six for urlparse and urlopen
fix exception.message attribute removal
run unittests on python3
use unitest.mock on python 3
fix open mock for vsperf
fix float division by using delta/eplison comparison
use unicode in StringIO
use plugin/sample_config.yaml relative path from test case
fixed apexlake unittests
upgraded to mock 2.0.0 to match python3 unittest.mock features
fixed flake8 issues
implement safe JSON decode with oslo_serialization.jsonutils.dump_as_bytes()
implement safe unicode encode/decode with oslo_utils.encodeutils
heat: convert pub key file from bytes to unicode
pkg_resources returns raw bytes, in python3
we have to decode this to utf-8 unicode
so JSON can encode it for heat template
JIRA: YARDSTICK-452
Change-Id: Ib80dd1d0c0eb0592acd832b82f6a7f8f7c20bfda
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Ross Brattain [Thu, 12 Jan 2017 05:59:18 +0000 (21:59 -0800)]
heat: fix key_uuid format
The .format() won't work, since it can't slice the uuid
We have to convert the uuid to string before we slice it.
I thought .format() would implicitly call __str__() before
applying width, but that is not the case.
'files/yardstick_key-{:.{width}}'.format(self.key_uuid, width=8))
We also need to define a constant short uuid lenght, we can't
hardcode the length to 8 everywhere.
Create a helper function to standardize the generation
of the short key uuid and use that helper function everywhere
Change-Id: I59e051bfe697587e967f93f5b8f209e0e7daa5c7
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Ross Brattain [Thu, 12 Jan 2017 06:32:26 +0000 (22:32 -0800)]
remove failing influx testcases
when influx was refactored these test cases must not
have been removed
> influx._write_data(measurement, field, timestamp, tags)
E AttributeError: 'module' object has no attribute '_write_data'
Change-Id: I78814266fae04bd3b0bc06fe1fe41317ba8aced4
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Rex Lee [Wed, 11 Jan 2017 03:03:10 +0000 (03:03 +0000)]
Merge "Create API to run test suite"
Rex Lee [Wed, 11 Jan 2017 03:01:14 +0000 (03:01 +0000)]
Merge "associate an uuid to yardstick_key and yardstick_key.pub"
JingLu5 [Thu, 22 Dec 2016 04:07:55 +0000 (12:07 +0800)]
Create API to run test suite
JIRA: YARDSTICK-475
This API will be used to run test suite files in the test/opnfv/test_suites directory
Change-Id: I208edf9abed62fd6436de988ac85bfe99c4d01bd
Signed-off-by: JingLu5 <lvjing5@huawei.com>
JingLu5 [Mon, 9 Jan 2017 11:35:47 +0000 (11:35 +0000)]
associate an uuid to yardstick_key and yardstick_key.pub
JIRA: YARDSTICK-527
This work is to support yardstick parallel tasks in the future.
Currently, the RSA key we generated and used to access the VM is named
'yardstick_key'.
If more than two tasks are running paralleled, the later 'yardstick_key' will
cover the former.
We want associate an uuid to identify differnets for each tasks. So the key
files won't conflict.
The first 8 digits will be used, as there is no need to used a full-length uuid.
Change-Id: If8eaf47ae527cf9b3bd50f37ab3051fbdccf5f03
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Jing Lu [Tue, 10 Jan 2017 09:13:06 +0000 (09:13 +0000)]
Merge "Yardstick framework concurrent support"
Jing Lu [Tue, 10 Jan 2017 09:11:54 +0000 (09:11 +0000)]
Merge "Add API to get the status of async task"
chenjiankun [Wed, 4 Jan 2017 17:41:18 +0000 (17:41 +0000)]
Add API to get the status of async task
JIRA: YARDSTICK-526
Currently there are many API run a task using sub thread.
But we don't know the status of this task.
So we need to offer a API to query the status of this task.
Change-Id: I8d2cc558750bf9270aed4a7abb8bf35d17894d83
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Rex Lee [Tue, 10 Jan 2017 08:54:16 +0000 (08:54 +0000)]
Merge "Record test case names when run a task using API"
Rex Lee [Tue, 10 Jan 2017 08:48:55 +0000 (08:48 +0000)]
Merge "subprocess.call para stdout=PIPE is risky"
chenjiankun [Fri, 6 Jan 2017 08:01:53 +0000 (08:01 +0000)]
Yardstick framework concurrent support
JIRA: YARDSTICK-528
Currently yardstick framework can not support run the same test case at
the same time.
But actually we need to support it.
The reason why framework can't support it is that openstack do not allow
to create stack with the same name.
So I use the task_id to make the stack different.
Change-Id: I9e853793650066dfc56606464f7826f330a1401c
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Deepak S [Fri, 30 Dec 2016 17:18:43 +0000 (09:18 -0800)]
Adding python package requirement for VNF testing.
List of packages:
zmq - Py lib helps to publish/subscribe for ZeroMQ for data exchange
pika - Py lib helps setup amqp for data exchange with collectd
JIRA: YARDSTICK-453
Change-Id: Ic537d677622167fdb3aef81fb0c313553fcf087a
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
chenjiankun [Thu, 29 Dec 2016 11:45:12 +0000 (11:45 +0000)]
Split Yardstick CLI with Yardstick core logic
JIRA: YARDSTICK-511
We need to unify yardstick entry. Now the solution is using CLI call API
as nova do.
This is the first step: coupling the yardstick core logic from CLI.
Moving the core logic to yardstick/benchmark/core and the CLI using a
object to call yardstick core logic.
Change-Id: I84f10d2134635880c281cc63212a8533f2dd7d4e
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Jing Lu [Fri, 30 Dec 2016 07:02:06 +0000 (07:02 +0000)]
Merge "Yardstick Plugin: add support for ssh login using key"
Jing Lu [Fri, 30 Dec 2016 06:22:18 +0000 (06:22 +0000)]
Merge "BugFix: correct Copyright info in openstack_utils.py"
Rex Lee [Fri, 30 Dec 2016 03:32:00 +0000 (03:32 +0000)]
Merge "Create ping_load sample configuration yaml file"
Jing Lu [Thu, 29 Dec 2016 02:16:41 +0000 (02:16 +0000)]
Merge "Fix installation dependency and authentication issue for fuel plugin"
chenjiankun [Wed, 28 Dec 2016 10:27:14 +0000 (10:27 +0000)]
Record test case names when run a task using API
JIRA: YARDSTICK-509
Currently we use influxdb as database and will not record test case name
when run a test case.
So if we must offer test case name if we want to get result from API.
Regarding future requirement, I create sqlite database and alchemy orm
framework. And record test case name when run a test case. So we needn't
offer test case any more when call for get result API.
Change-Id: I7d7dc24543a33918546267591f7bdcd0742928cb
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
JingLu5 [Wed, 28 Dec 2016 02:07:20 +0000 (10:07 +0800)]
Yardstick Plugin: add support for ssh login using key
JIRA: YARDSTICK-442
Change-Id: I4736e8cb8331d7a74c8c9946e21edd791b0c8ba9
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Jing Lu [Wed, 28 Dec 2016 01:23:09 +0000 (01:23 +0000)]
Merge "enhance test cases description and provide more info(in progress)"
Jing Lu [Wed, 28 Dec 2016 01:07:48 +0000 (01:07 +0000)]
Merge "Use ConfigParser to write yardstick.conf"
Edwin Zhai [Mon, 26 Dec 2016 00:00:06 +0000 (16:00 -0800)]
Fix installation dependency and authentication issue for fuel plugin
JIRA: YARDSTICK-516
Change-Id: I348959c2ea3b6ed586f487cde88a173eb593be4f
Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>
JingLu5 [Tue, 27 Dec 2016 09:11:09 +0000 (17:11 +0800)]
Create ping_load sample configuration yaml file
JIRA: YARDSTICK-514
The ping_load task uses multiple(3 in this case) host VMs to ping one target
VM in parallel. The multiple hosts configuration will be rendered using jinja
syntax. "contexts" is used to specify the target and muiltip host VMs.
Change-Id: I3e36b86d16d0386b4d446a2e252a094926cd97a3
Signed-off-by: JingLu5 <lvjing5@huawei.com>
JingLu5 [Tue, 27 Dec 2016 09:01:06 +0000 (17:01 +0800)]
BugFix: correct Copyright info in openstack_utils.py
JIRA:YARDSTICK-513
the copyright info in openstack_utils.py is not accurate.
(yardstick: this file is copied from rally and slightly modified)
this line should be deleted.
Change-Id: I6cf8205ee6b142ae87b268829e5ac7454239dd0d
Signed-off-by: JingLu5 <lvjing5@huawei.com>
chenjiankun [Thu, 15 Dec 2016 02:31:43 +0000 (02:31 +0000)]
Use ConfigParser to write yardstick.conf
JIRA: YARDSTICK-474
Currently, I use file.write() method to write config in yardstick.conf.
But it is not recommended.
So I change to use ConfigParser to write config in yardstick.conf
Change-Id: Ia789cf09296afd5d1507bcf99f165378bf87c591
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
chenjiankun [Thu, 22 Dec 2016 08:41:08 +0000 (08:41 +0000)]
Add sqlite and SQLAlchemy support for API
JIRA: YARDSTICK-505
Now yardstick API need a database to store API data.
And for future the yardstick GUI also need a self database.
So I choose a light-weight database sqlite.
And use SQLAlchemy to do ORM.
Change-Id: I1edc350ec6f57ad67785de549c2135c86ea60a4a
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Jing Lu [Sat, 24 Dec 2016 01:21:36 +0000 (01:21 +0000)]
Merge "Bugfix: the load_image.sh script will load a image with the same name"
Jing Lu [Sat, 24 Dec 2016 01:12:49 +0000 (01:12 +0000)]
Merge "Move uwsgi.log and yardstick.sock to proper location"
chenjiankun [Thu, 15 Dec 2016 06:02:50 +0000 (06:02 +0000)]
Bugfix: the load_image.sh script will load a image with the same name
JIRA: YARDSTICK-471
Currently, if we execute the load_image.sh and the openstack already
have this image in the cloud,this script will load another image with
the same name.
This will make yardstick run error.
So I clean this related images before loading.
Change-Id: If5b985ef9b2e890aa10453810fac36867d320a06
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
chenjiankun [Wed, 21 Dec 2016 01:07:26 +0000 (01:07 +0000)]
Yardstick API refactor
JIRA: YARDSTICK-503
Now in api/views.py there are many redundant code.
So I do some refactoring and make it to be a lightweight framework.
Change-Id: Id7cecc95e60f5403b2d26239a3ef41d01bbb542a
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Jing Lu [Thu, 22 Dec 2016 04:33:32 +0000 (04:33 +0000)]
Merge "ssh: don't quote ~ in remotepaths"
Rex Lee [Thu, 22 Dec 2016 03:41:47 +0000 (03:41 +0000)]
Merge "Add smoke, components, features and performance test suite for Yatdstick"
Rex Lee [Thu, 22 Dec 2016 02:52:16 +0000 (02:52 +0000)]
Merge "Replace heat, keystone and nova command with openstack command"
Jing Lu [Thu, 22 Dec 2016 02:13:09 +0000 (02:13 +0000)]
Merge "Use openstack command instead keystone command in prepare_storperf_admin-rc.sh"
chenjiankun [Wed, 21 Dec 2016 11:14:02 +0000 (11:14 +0000)]
Move uwsgi.log and yardstick.sock to proper location
JIRA: YARDSTICK-504
Now yardstick.sock and uwsgi.log is in yardstick/api directory.
But it is not standard for they should not be put in the code path.
So I move yardstick.sock to /var/run/yardstick.sock
and move uwsgi.log to /var/log/yardstick/uwsgi.log
Change-Id: I526ab011c0222255dfbae037f494edb5d8a88add
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Ryan.RCS [Wed, 21 Dec 2016 07:44:21 +0000 (07:44 +0000)]
restore the yardstick-img-modify cleanup() func
There is a result failed again after last update.
So i restore the clean() function to its original codes and avoid CI failed.
But i'm not sure something about the clean() function,
and I will check this failed clearly in future.
Change-Id: I8f49533788c7ccb2016e7a484368a72028579fa8
JIRA: YARDSTICK-502
Signed-off-by: Ryan.RCS <lihainong@huawei.com>
Ross Brattain [Wed, 21 Dec 2016 05:40:52 +0000 (21:40 -0800)]
ssh: don't quote ~ in remotepaths
~ is not expanded in double quotes, so we have a dilemma.
We need to quote in order to preserve filenames with spaces,
but we have to make sure we don't quote the ~ so it can be expanded.
To resolve this we use a regex to search for tidle-prefixes
and excluded them from quotes.
Added unittests for the cases:
path with tilde
path with space
path with tilde and space
see bash man page for details of tidle expansion
Tilde Expansion
If a word begins with an unquoted tilde character (`~'), all of the
characters preceding the first unquoted slash (or all characters, if there is
no unquoted slash) are considered a tilde-prefix. If none of the characters in
the tilde-prefix are quoted, the characters in the tilde-prefix following the
tilde are treated as a possible login name. If this login name is the null
string, the tilde is replaced with the value of the shell parameter HOME. If
HOME is unset, the home directory of the user executing the shell is
substituted instead. Otherwise, the tilde-prefix is replaced with the
home directory associated with the specified login name.
JIRA: YARDSTICK-501
Change-Id: I324be20aba0dbd50434fbd8081685c598ebd8a84
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Jing Lu [Wed, 21 Dec 2016 04:28:51 +0000 (04:28 +0000)]
Merge "fixed issue in yardstick-img-modify cleanup() fun"
Ryan.RCS [Wed, 21 Dec 2016 02:29:41 +0000 (02:29 +0000)]
fixed issue in yardstick-img-modify cleanup() fun
1. when run yardstick-img-modify script, sometimes it show below error.
+ '[' -f /tmp/workspace/yardstick/yardstick-xenial-server.raw ']'
+ kpartx -dv /tmp/workspace/yardstick/yardstick-xenial-server.raw
ioctl: LOOP_CLR_FD: No such device or address
del devmap : loop0p1
can't del loop : /dev/loop0
+ test 1 -eq 1 -o 1 -eq 2
2. so i added a expression to check if the .raw file map deleted or not
3. if the devmap not deleted, then we delete it, otherwise, we do nothing
JIRA: YARDSTICK-502
Change-Id: Ia050121ed6bf837bab05e38f2e9e9628ca31627a
Signed-off-by: Ryan.RCS <lihainong@huawei.com>
Ryan.RCS [Tue, 20 Dec 2016 08:36:24 +0000 (08:36 +0000)]
subprocess.call para stdout=PIPE is risky
1.In 'def run' function of parser.py file,
subprocess.call parameter stdout=
subprocess.PIPE is risky, so I changed
the function from 'call' to 'popen'
2.updated sample/tosca.ymal because the version of
that file is old.
JIRA: YARDSTICK-473
Change-Id: Ie242e77eed6fdc2849394a3f170e40a0dd2be632
Signed-off-by: Ryan.RCS <lihainong@huawei.com>
JingLu5 [Tue, 20 Dec 2016 03:17:45 +0000 (11:17 +0800)]
Replace heat, keystone and nova command with openstack command
JIRA: YARDSTICK-486
In future Openstack release, 'heat', 'keystone', 'nova' command will be
deprecated. So we need to use 'openstack' command instead.
Change-Id: I7070f8aaf0d235705b65e0760c845f843ad79719
Signed-off-by: JingLu5 <lvjing5@huawei.com>
JingLu5 [Tue, 20 Dec 2016 02:46:26 +0000 (10:46 +0800)]
BugFix: remotepath cannot be found
JIRA: YARDSTICK-501
An redundant pair of quotation in ssh.py causes remotepath cannot be found.
Change-Id: I2df8ab59830fd28d8ad8882a93a8efbd4d1f7cb7
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Rex Lee [Tue, 20 Dec 2016 01:28:57 +0000 (01:28 +0000)]
Merge "change m1.* flavor to "yardstick-flavor""
Rex Lee [Mon, 19 Dec 2016 06:16:14 +0000 (06:16 +0000)]
Merge "Update Yardstick README file"
JingLu5 [Mon, 19 Dec 2016 00:59:34 +0000 (08:59 +0800)]
change m1.* flavor to "yardstick-flavor"
JIRA: YARDSTICK-485
In OpenStack Newton, the 'm1.tiny', 'm1.small', 'm1.medium' and 'm1.large' will
not be automatic created. This may cause errors as some Yardstick testcases are
using one of these flavor. Therefore, it's better change all the flavor option
in task configuration file to 'yardstick-flavor'.
Change-Id: Ibb29a77ef331bbf728dec9894a2e9f17c19d5ebd
Signed-off-by: JingLu5 <lvjing5@huawei.com>
JingLu5 [Fri, 16 Dec 2016 06:38:16 +0000 (14:38 +0800)]
Use openstack command instead keystone command in prepare_storperf_admin-rc.sh
JIRA: YARDSTICK-476
In Openstack Newton, the ”tenant“ is deprecated and "project" is used.
The prepare_storperf_admin-rc.sh uses keystone command to get "tenant id".
So for newton, we need to use openstack command to get "project id".
This patch also add a copy right header in tests/ci/scp_storperf_admin-rc.sh.
Change-Id: Ic69cb07f684ccb557866a4141e9d2724fc054f29
Signed-off-by: JingLu5 <lvjing5@huawei.com>
JingLu5 [Mon, 28 Nov 2016 03:03:08 +0000 (11:03 +0800)]
Add smoke, components, features and performance test suite for Yatdstick
JIRA: YARDSTICK-417
This patch adds a smoke test suite for Yardstick. The smoke test suite consists
of 3 test cases: TC002 Ping, TC005 Fio, TC012 LMbench.
3 test suites for components, features and performance tiers are also provided.
Change-Id: Ic5223c1401270d126aabb4bf062e40da9464e18f
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Rex Lee [Thu, 15 Dec 2016 09:01:21 +0000 (09:01 +0000)]
Merge "Add support for OpenSrack Newton"
Rex Lee [Thu, 15 Dec 2016 09:00:33 +0000 (09:00 +0000)]
Merge "Bugfixed:run command: "yardstick-img-modify" fail!"
JingLu5 [Fri, 2 Dec 2016 02:00:35 +0000 (10:00 +0800)]
Update Yardstick README file
JIRA: YARDSTICK-443
Change-Id: Iecd56e257513ca2d1217fd44aaaf377a3c04104d
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Ryan.RCS [Fri, 9 Dec 2016 03:06:41 +0000 (03:06 +0000)]
Bugfixed:run command: "yardstick-img-modify" fail!
Avoid incorrect deletion of $raw_imgfile when the command:
"kpartx -dv $raw_imgfile" execute failed.
JIRA: YARDSTICK-424
Change-Id: I34dac60bda6c028c4b0f0bfd9ad077e2d5dbb0ff
Signed-off-by: Ryan.RCS <lihainong@huawei.com>
Rex Lee [Wed, 14 Dec 2016 01:13:48 +0000 (01:13 +0000)]
Merge "BugFix: Upgrade python-novaclient and other dependencies"
JingLu5 [Tue, 13 Dec 2016 05:42:41 +0000 (05:42 +0000)]
Add support for OpenSrack Newton
JIRA: YARDSTICK-410
This patch uses keystoneauth1.session to initialize the client for Heat
The keystoneauth1.session.Session class was introduced into keystoneauth1
as an attempt to bring a unified interface to the various OpenStack clients
that share common authentication and request parameters between a variety of
services.
Change-Id: Ie6287b50a36cf03950fa1174791df826e9bdafd3
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Rex Lee [Tue, 13 Dec 2016 07:38:03 +0000 (07:38 +0000)]
Merge "ssh.py: add flag to request for a pseudo terminal (pty) for ssh connection"
Jing Lu [Tue, 13 Dec 2016 06:27:55 +0000 (06:27 +0000)]
Merge "env: convert file open to context manager"
Rex Lee [Mon, 12 Dec 2016 07:43:15 +0000 (07:43 +0000)]
Merge "Increase Ping scenario ssh timeout limit to 600 seconds"
Rex Lee [Mon, 12 Dec 2016 07:42:37 +0000 (07:42 +0000)]
Merge "Bugfix: update Yardstick custom VM image name in user guide"
Rex Lee [Mon, 12 Dec 2016 07:13:30 +0000 (07:13 +0000)]
Merge "use context manager for stdin files and use _put_file_shell"
Rex Lee [Mon, 12 Dec 2016 07:06:59 +0000 (07:06 +0000)]
Merge "Add support for Storperf job status"
Deepak S [Thu, 8 Dec 2016 08:27:13 +0000 (13:57 +0530)]
ssh.py: add flag to request for a pseudo terminal (pty) for ssh connection
For some VNFs we may want to send periodic commands, for example to
print statistics etc.
When you open a SSH connection, request a pseudo terminal (pty) which
allows passing of control characters to the connection.
JIRA: YARDSTICK-453
Change-Id: Ibfd4164e745f005d0e29f6efdc63076e1e220b60
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
JingLu5 [Thu, 8 Dec 2016 11:49:46 +0000 (19:49 +0800)]
BugFix: Upgrade python-novaclient and other dependencies
JIRA: YARDSTICK-454
The python-novalient need to upgraded to fix the error in jenkin CI joid environment.
Related dependencies also need to be updated.
Change-Id: I63ce57aadbd46f159df2b5371caf3725e311ab34
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Ross Brattain [Wed, 7 Dec 2016 05:26:16 +0000 (00:26 -0500)]
env: convert file open to context manager
always use context managers to open file
Change-Id: I2c894ea87a94789edbed4a4da1fa906b28556664
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
JingLu5 [Wed, 7 Dec 2016 03:26:07 +0000 (11:26 +0800)]
Bugfix: update Yardstick custom VM image name in user guide
JIRA: YARDSTICK-451
Change-Id: Ie6e4a0b924f4ee047756b954e88c50621e0b596f
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Rex Lee [Tue, 6 Dec 2016 10:36:30 +0000 (10:36 +0000)]
Merge "update grafana dashboard opnfv_yardstick_tc002"
rexlee8776 [Tue, 6 Dec 2016 09:30:57 +0000 (17:30 +0800)]
update grafana dashboard opnfv_yardstick_tc002
JIRA: YARDSTICK-447
Change-Id: Iba97948eb9db2d8f22b31fdfc6e09570ed6b11b9
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
chenjiankun [Tue, 6 Dec 2016 09:15:33 +0000 (09:15 +0000)]
Bugfix: create stack failed due to not export EXTERNAL_NETWORK environment viarable
JIRA: YARDSTICK-449
Now if we run prepare env, we will not source the EXTERNAL_NETWORK.
I will source the EXTERNAL_NETWORK after I get it.
Change-Id: I917fcecae2cac13b7511667c0687d10eccfac751
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
chenjiankun [Mon, 5 Dec 2016 14:31:46 +0000 (14:31 +0000)]
Change grafana default dashboard from ping to opnfv_yardstick_tc002
JIRA: YARDSTICK-447
Now the grafana default dashboard use the sample/ping.yaml test case.
I will change it to opnfv_yardstick_tc002 because it is the release test
case.
Change-Id: If20ca123d0407ad92b49f7d2dac98faa2a01e195
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Ross Brattain [Thu, 1 Dec 2016 03:56:38 +0000 (19:56 -0800)]
use context manager for stdin files and use _put_file_shell
requires https://gerrit.opnfv.org/gerrit/#/c/25183/
use new ssh method _put_file_shell to upload files.
We have to use _put_file_shell because we rely on ~/ path
expansions. Eventually we should move to remote absolute
paths so we can use sftp upload.
For ssh.execute() replace open() with context manager
context managers were invented partly to control
freeing resources. Opening files without closing
them will leak file descriptors.
The old standard method for closing files:
f = open('data.txt')
try:
data = f.read()
finally:
f.close()
was replaced with a context manager
with open('data.txt') as f:
data = f.read()
Reference: Raymond Hettinger's Pycon 2013 presentation:
https://speakerdeck.com/pyconslides/transforming-code-into-beautiful-idiomatic-python-by-raymond-hettinger-1
Video: https://youtu.be/OSGv2VnC0go?t=2522
Always use context managers for files
Update:
rebased now that _put_file_shell was merged
Change-Id: Iabfc0e43aa3b7766d7c658115e13d21c31efb2a9
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
chenjiankun [Mon, 5 Dec 2016 10:48:35 +0000 (10:48 +0000)]
Bugfix: create yardstick.conf file failed due to wrong config file path
JIRA: YARDSTICK-446
now the yardstick dispatcher config path is set to
/etc/yardstick/config.yaml which is wrong.
I will change it to /etc/yardstick/yardstick.conf
Change-Id: I4cd5436bf64f3b764f6bb102eff3443e765fffe9
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
chenjiankun [Mon, 5 Dec 2016 08:53:25 +0000 (08:53 +0000)]
Bugfix: easy_install -U setuptools go wrong due to the setuptools version
JIRA: YARDSTICK-445
Currently we do not set the setuptools version.
Now the setuptools version update to the 30.2.0, but when run
easy_install -U setuptools, it goes wrong.
So I set the setuptools version to 30.0.0
Change-Id: Id7ae232cce6d088355f71a7124688cb625d18457
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Rex Lee [Mon, 5 Dec 2016 06:40:58 +0000 (06:40 +0000)]
Merge "argsAlreadyParsedError: arguments already parsed: cannot register CLI option"
Rex Lee [Mon, 5 Dec 2016 06:38:48 +0000 (06:38 +0000)]
Merge "fix SSH object examples to use correct context manager form"
Rex Lee [Mon, 5 Dec 2016 06:37:08 +0000 (06:37 +0000)]
Merge "import new _put_file_shell method from upstream rally"
Rex Lee [Mon, 5 Dec 2016 06:33:43 +0000 (06:33 +0000)]
Merge "Making nginx and uwsgi service start when run docker by using supervisor"
Jing Lu [Mon, 5 Dec 2016 06:29:44 +0000 (06:29 +0000)]
Merge "Bugfix: debug should be default off"
JingLu5 [Tue, 15 Nov 2016 03:42:10 +0000 (11:42 +0800)]
enhance test cases description and provide more info(in progress)
JIRA: YARDSTICK-389
This work is about to improve test case.rst to provide more info
Change-Id: If27fe462a43f6344a06e61944b72e912d2a516b7
Signed-off-by: JingLu5 <lvjing5@huawei.com>
chenjiankun [Thu, 1 Dec 2016 07:34:23 +0000 (07:34 +0000)]
Add API and command support for yardstick env prepare
JIRA: YARDSTICK-406
Change-Id: Icf837a6f34a22158203566a43a6446fc269c096f
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
chenjiankun [Sat, 3 Dec 2016 15:04:36 +0000 (15:04 +0000)]
Making nginx and uwsgi service start when run docker by using supervisor
JIRA: YARDSTICK-444
We need web service start when docker run.
But now we add command in bashrc, so the web service start only if we
login in docker container.
So I use supervisor to make the web service start when docker run.
Change-Id: Ic77eb0e130ae7dbd82039c312649fed76b128513
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
chenjiankun [Fri, 2 Dec 2016 00:30:58 +0000 (00:30 +0000)]
Add API to create Grafana container
JIRA: YARDSTICK-441
Change-Id: Ia848c4af072915ef252e8e03100dd7a4e4a6c3c2
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
chenjiankun [Fri, 2 Dec 2016 12:36:56 +0000 (12:36 +0000)]
argsAlreadyParsedError: arguments already parsed: cannot register CLI option
JIRA: YARDSTICK-216
Change-Id: I0368a3d1c1f5eaf9f4ef2dcb519815241f377d24
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
chenjiankun [Fri, 2 Dec 2016 01:39:32 +0000 (01:39 +0000)]
Add support for sample testcase to get test result
JIRA: YARDSTICK-440
Change-Id: I15234e833353a33b063993b96f1f787ddf649720
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Rex Lee [Thu, 1 Dec 2016 09:34:27 +0000 (09:34 +0000)]
Merge "vsperf: Enhanced vswitchperf configuration"
chenjiankun [Thu, 1 Dec 2016 01:51:16 +0000 (01:51 +0000)]
Add swagger support for Rest API
JIRA: YARDSTICK-439
Change-Id: I36ad0663455c51d635c4329f5cbb9da25d8042e1
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
chenjiankun [Tue, 29 Nov 2016 17:53:25 +0000 (17:53 +0000)]
Add API to run test case under samples directory
JIRA: YARDSTICK-432
Change-Id: I8ca6409449e2b960ac9f48c8eb8a6ae9959a4fc8
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Jing Lu [Thu, 1 Dec 2016 01:11:09 +0000 (01:11 +0000)]
Merge "Clone the corresponding branch of the repo according to the job branch"
Rex Lee [Thu, 1 Dec 2016 01:05:28 +0000 (01:05 +0000)]
Merge "ssh.py: add flag to keep stdin open"
Rex Lee [Thu, 1 Dec 2016 00:56:37 +0000 (00:56 +0000)]
Merge "switch logging to proper usage"
Jing Lu [Thu, 1 Dec 2016 00:53:04 +0000 (00:53 +0000)]
Merge "Modify url mapping to make API more Restful"
Jing Lu [Thu, 1 Dec 2016 00:52:54 +0000 (00:52 +0000)]
Merge "Use flask jsonify method to return json result"
Ross Brattain [Fri, 25 Nov 2016 22:21:37 +0000 (14:21 -0800)]
switch logging to proper usage
The logging methods do string interpolation themselves
From the reference:
https://docs.python.org/2/library/logging.html#logging.Logger.debug
Logger.debug(msg, *args, **kwargs)
Logs a message with level DEBUG on this logger. The msg is the message format string, and the args are the arguments which are merged into msg using the string formatting operator. (Note that this means that you can use keywords in the format string, together with a single dictionary argument.)
There are two keyword arguments in kwargs which are inspected: exc_info which, if it does not evaluate as false, causes exception information to be added to the logging message. If an exception tuple (in the format returned by sys.exc_info()) is provided, it is used; otherwise, sys.exc_info() is called to get the exception informatio
The reason logging does string interpolation itselfs is to implement deferred interpolation.
String interpolation involves evaluating arguments, so it can introduce significant computation. The logging module tries to be smart about deferring interpolation until the last possible moment.
The logging methods check isEnabledFor for the log level and won't interpolate if the level is not enabled.
https://github.com/python/cpython/blob/2.7/Lib/logging/__init__.py#L1178
def warning(self, msg, *args, **kwargs):
if self.isEnabledFor(WARNING):
self._log(WARNING, msg, args, **kwargs)
logging actually waits to interpolate the string in LogRecord.getMessage()
https://github.com/python/cpython/blob/2.7/Lib/logging/__init__.py#L328
if self.args:
msg = msg % self.args
Change-Id: Ie09efe0a66881e19bd8119caa376075e605627a2
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Ross Brattain [Tue, 29 Nov 2016 21:25:18 +0000 (13:25 -0800)]
import new _put_file_shell method from upstream rally
upstream openstack rally added new _put_file_* methods
we should use these
https://github.com/openstack/rally/blob/0.7.0/rally/common/sshutils.py#L270
Updates:
imported rally test__put_file_shell unittests
quote to prevent word split
use -- guard
only chmod on cat success
Change-Id: I357d1a66b5beddad8042958f4e55d67fc68929f6
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>