yardstick.git
6 years agoBug fix for Ansible destroy VM script 89/52089/1
John O Loughlin [Mon, 12 Feb 2018 17:31:59 +0000 (17:31 +0000)]
Bug fix for Ansible destroy VM script

Modified the destroy script to ignore errors as 2 possible
problems can cause a play to fail.
1. A VM can be running but undefined.
2. A VM can be destroyed but still running.

JIRA: YARDSTICK-1006

Change-Id: Ib66f48401bfefb598f553cfef31bfa2682f5a584
Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
6 years agoMerge "Create host VMs configuration"
Emma Foley [Mon, 12 Feb 2018 16:57:15 +0000 (16:57 +0000)]
Merge "Create host VMs configuration"

6 years agoMerge "Heatstack create: fix str/bytes error in NamedTemporaryFile.write()"
Emma Foley [Mon, 12 Feb 2018 14:06:58 +0000 (14:06 +0000)]
Merge "Heatstack create: fix str/bytes error in NamedTemporaryFile.write()"

6 years agoMerge "Replace neutron get network id with shade."
Emma Foley [Mon, 12 Feb 2018 13:51:39 +0000 (13:51 +0000)]
Merge "Replace neutron get network id with shade."

6 years agoHeatstack create: fix str/bytes error in NamedTemporaryFile.write() 19/52019/2
Ross Brattain [Mon, 12 Feb 2018 03:24:16 +0000 (19:24 -0800)]
Heatstack create: fix str/bytes error in NamedTemporaryFile.write()

we need to use jsonutils.dump_as_bytes for NamedTemporaryFile.write()

2018-02-11 19:15:01,366 [INFO] yardstick.orchestrator.heat heat.py:563 Creating stack 'yardstick-4359f33e' START
2018-02-11 19:15:01,935 [ERROR] yardstick.benchmark.contexts.heat heat.py:317 stack failed
Traceback (most recent call last):
  File "/home/rbbratta/yardstick-upstream/yardstick/yardstick/benchmark/contexts/heat.py", line 313, in deploy
    timeout=self.heat_timeout)
  File "/home/rbbratta/yardstick-upstream/yardstick/yardstick/orchestrator/heat.py", line 567, in create
    stack.create(self._template, self.heat_parameters, block, timeout)
  File "/home/rbbratta/yardstick-upstream/yardstick/yardstick/orchestrator/heat.py", line 56, in create
    template_file.write(jsonutils.dumps(template))
  File "/home/rbbratta/yardstick_venv3/lib/python3.5/tempfile.py", line 622, in func_wrapper
    return func(*args, **kwargs)
TypeError: a bytes-like object is required, not 'str'

JIRA: YARDSTICK-1005
Change-Id: I504f23b86119b62f3aea5b83a445b97bf810220c
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
6 years agoCreate host VMs configuration 37/50937/11
John O Loughlin [Mon, 22 Jan 2018 13:57:05 +0000 (13:57 +0000)]
Create host VMs configuration

Using xml files deploy the VM's using the virt plugin.
This code generates the user-data network-config meta-data
and the vm's xml. It also deploys the vm

JIRA: YARDSTICK-963

Change-Id: I97f2d20d0ab75a4444b8b8e6fb65e9e463870af7
Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
6 years agoMerge "Create host networking configuration"
Emma Foley [Mon, 12 Feb 2018 10:12:49 +0000 (10:12 +0000)]
Merge "Create host networking configuration"

6 years agoMerge "vpe: convert DPKD_PORT to LINK ID"
Emma Foley [Mon, 12 Feb 2018 10:06:15 +0000 (10:06 +0000)]
Merge "vpe: convert DPKD_PORT to LINK ID"

6 years agoCreate host networking configuration 27/50927/11
John O Loughlin [Mon, 22 Jan 2018 11:49:43 +0000 (11:49 +0000)]
Create host networking configuration

Create host networking configuration based on the input
configuration file. To define the networks using libvirt,
a temporary XML file is generated for each network.

JIRA: YARDSTICK-962

Change-Id: I24d1c4d2f2e62884675599deb7db255862283ea4
Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
6 years agoMerge "cleanup: rm node_ID from yardstick prepare_env file"
Ross Brattain [Mon, 12 Feb 2018 03:05:09 +0000 (03:05 +0000)]
Merge "cleanup: rm node_ID from yardstick prepare_env file"

6 years agoMerge "Remove references to "dpdk_nic_bind" utility"
Emma Foley [Sun, 11 Feb 2018 22:08:55 +0000 (22:08 +0000)]
Merge "Remove references to "dpdk_nic_bind" utility"

6 years agoMerge "BugFIX: NSB-setup build script fix for BM"
Emma Foley [Sun, 11 Feb 2018 22:02:27 +0000 (22:02 +0000)]
Merge "BugFIX: NSB-setup build script fix for BM"

6 years agoMerge "Replace "python-heatclient" with "shade" client"
Rodolfo Alonso Hernandez [Sun, 11 Feb 2018 20:37:22 +0000 (20:37 +0000)]
Merge "Replace "python-heatclient" with "shade" client"

6 years agoMerge "Prox vnf descriptor cleanup"
Rodolfo Alonso Hernandez [Fri, 9 Feb 2018 18:08:57 +0000 (18:08 +0000)]
Merge "Prox vnf descriptor cleanup"

6 years agoReplace neutron get network id with shade. 65/51765/10
Shobhi Jain [Mon, 29 Jan 2018 11:49:02 +0000 (11:49 +0000)]
Replace neutron get network id with shade.

Function get_network_id now uses shade client instead of shade client.
Removed redundant function: get_port_id.

JIRA: YARDSTICK-890

Change-Id: I6081477fee39fa78131187e65daf3d7d3a9e439f
Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
6 years agoMerge "Make 'Scenario' classes plugable"
Emma Foley [Fri, 9 Feb 2018 16:35:38 +0000 (16:35 +0000)]
Merge "Make 'Scenario' classes plugable"

6 years agoMerge "Change nsb_setup.sh to use NSB image instead of raw"
Emma Foley [Fri, 9 Feb 2018 16:18:34 +0000 (16:18 +0000)]
Merge "Change nsb_setup.sh to use NSB image instead of raw"

6 years agoMerge "Delete any previous configuration"
Emma Foley [Fri, 9 Feb 2018 15:49:01 +0000 (15:49 +0000)]
Merge "Delete any previous configuration"

6 years agoReplace "python-heatclient" with "shade" client 01/48401/11
Rodolfo Alonso Hernandez [Mon, 4 Dec 2017 16:24:13 +0000 (16:24 +0000)]
Replace "python-heatclient" with "shade" client

Replaced "python-heatclient" with "shade" client. The "python-heatclient"
library is removed from requirements file. "shade" client version 1.22.2
is the required one for OpenStack Pike release.

shade is the recommended client to interact with OpenStack clouds [1]

[1] https://github.com/openstack-infra/shade

JIRA: YARDSTICK-880

Change-Id: Ibbdfc42a543d2d9ed4cf70d78de3de8cbecd0076
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
6 years agoDelete any previous configuration 19/50919/8
John O Loughlin [Mon, 22 Jan 2018 09:34:45 +0000 (09:34 +0000)]
Delete any previous configuration

Delete any previous configuration using the virsh module in ansible:
Networks, VMs and local IPs.

JIRA: YARDSTICK-950

Change-Id: Ie4963ab8210ce50ba2e9fa22642ec27a3b2031e1
Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
6 years agoProx vnf descriptor cleanup 01/51901/1
Abhijit Sinha [Thu, 8 Feb 2018 16:05:54 +0000 (16:05 +0000)]
Prox vnf descriptor cleanup

JIRA: YARDSTICK-1003

- There are redundant files for Prox vnf descriptors
tg and vnf for 1, 2 and 4 port set-up.
- We can use one vnf descriptor file per prox tg and prox vnf,
reducing the number of redundant files.
- Tested on Prox BM L2fwd 2 and 4 port test case.

Change-Id: I4c61fd11725121f19392443460ac2ad39c934e2d
Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com>
6 years agoChange nsb_setup.sh to use NSB image instead of raw 95/51895/1
Mytnyk, Volodymyr [Thu, 8 Feb 2018 13:22:46 +0000 (13:22 +0000)]
Change nsb_setup.sh to use NSB image instead of raw

The `ansible/roles/create_samplevnfs_image/tasks/main.yml` ansible role
uses raw NSB image (yardstick-xenial-server.raw) to upload it to
OpenStack instead QCOW2 NSB converted image (yardstick-nsb-image.img
which is converted from the raw). Changed the create_samplevnfs_image
role to to use NSB image.

JIRA: YARDSTICK-1000

Change-Id: Ieda9f14e6882ca854331b4eccc9a4cb390b6a475
Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
6 years agoMerge "Improve ovs_deploy.bash script"
Ross Brattain [Wed, 7 Feb 2018 19:04:23 +0000 (19:04 +0000)]
Merge "Improve ovs_deploy.bash script"

6 years agoMerge "Auto Generated INFO.yaml file"
Ross Brattain [Wed, 7 Feb 2018 19:04:03 +0000 (19:04 +0000)]
Merge "Auto Generated INFO.yaml file"

6 years agoAdd a missing colon in the sample config 57/51857/1
Rodolfo Alonso Hernandez [Wed, 7 Feb 2018 17:27:03 +0000 (17:27 +0000)]
Add a missing colon in the sample config

Just in case anyone uses this file for testing.

Change-Id: Iff0489f839f3985e43ac31d2a89147e5f16c59e9
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
6 years agovpe: convert DPKD_PORT to LINK ID 29/43229/8
Ross Brattain [Tue, 26 Sep 2017 23:43:12 +0000 (16:43 -0700)]
vpe: convert DPKD_PORT to LINK ID

http://dpdk.org/doc/guides/sample_app_ug/ip_pipeline.html#application-resources-present-in-the-configuration-file

LINK instances are created implicitly based on the PORT_MASK application startup
argument. LINK0 is the first port enabled in the PORT_MASK, port 1 is the next one,
etc. The LINK ID is different than the DPDK PMD-level NIC port ID, which is the actual
 position in the bitmask mentioned above. For example, if bit 5 is the first bit set
in the bitmask, then LINK0 is having the PMD ID of 5. This mechanism creates a
contiguous LINK ID space and isolates the configuration file against changes in the
board PCIe slots where NICs are plugged in.

Change-Id: I6e449272cfcfb2b2a75c246f7f569e3f923da245
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
6 years agoMerge "Adding three missing test case descriptions"
Rodolfo Alonso Hernandez [Tue, 6 Feb 2018 15:11:36 +0000 (15:11 +0000)]
Merge "Adding three missing test case descriptions"

6 years agoAuto Generated INFO.yaml file 17/51717/4
agardner [Mon, 5 Feb 2018 19:39:20 +0000 (14:39 -0500)]
Auto Generated INFO.yaml file

INFO.yaml meant to be machine readable.
This file was auto generated from an ldap lookup
and your projects INFO file.

Meeting times are not currently filled out.
please ammend this patchset to complete

Going forward comitter promotions should be done
against this file.

PTLs:
Must be merged for you to gain delete access on
testresults.opnfv.org

If project_lead: is missing (my script could not parse)
please amend with same from commiters section eg:

project_lead: &opnfv_$project_ptl
    name: 'Lead Name'
    email: 'lead email'
    id: 'lead lfid'
    company: 'lead company'

Change-Id: I241279fba0d9acf69d38242a30541ddb90d22d67
Signed-off-by: agardner <agardner@linuxfoundation.org>
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
6 years agocleanup: rm node_ID from yardstick prepare_env file 81/51681/1
ting wu [Mon, 5 Feb 2018 15:17:52 +0000 (16:17 +0100)]
cleanup: rm node_ID from yardstick prepare_env file

There is some redundant code in prepare_env.sh script
for the fuel installer, the changes are to:

1. Remove variabls 'node_ID' and 'node_line_num';
2. Rewrite section that replace ip address of controller/compute;
3  Add $YARDSTICK_REPO_DIR in front of variable 'pod_yaml';

JIRA: YARDSTICK-991

Change-Id: I4fbd2c2ba2e6109cc04dc452202fbed701d79b2b
Signed-off-by: ting wu <ting.wu@enea.com>
6 years agoRemove references to "dpdk_nic_bind" utility 61/51661/2
Rodolfo Alonso Hernandez [Mon, 5 Feb 2018 11:08:28 +0000 (11:08 +0000)]
Remove references to "dpdk_nic_bind" utility

In DPDK 16.07 [1], "dpdk_nic_bind" utility was renamed to "dpdk-devbind".
This patch removes all references to this previous naming to avoid
confusions.

[1] https://dpdk-guide.gitlab.io/dpdk-guide/setup/binding.html

JIRA: YARDSTICK-995

Change-Id: I827c4c11c9e9e519f33f21b80459e7d65e51545e
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
6 years agoBugFIX: NSB-setup build script fix for BM 57/51657/1
Abhijit Sinha [Mon, 5 Feb 2018 09:45:03 +0000 (09:45 +0000)]
BugFIX: NSB-setup build script fix for BM

JIRA: YARDSTICK-994

The NSB set-up script for baremetal is broken.
In nsb_setp.yml file, "Prepare baremetal machine"
is commented due to which the ubuntu_server_baremetal_deploy_samplevnfs.yml
file is never called.

Change-Id: Icc95018ba746d6efa5baf09322b3255806da8952
Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com>
6 years agoMerge "Fix i40vf driver download URL"
Emma Foley [Sat, 3 Feb 2018 16:15:17 +0000 (16:15 +0000)]
Merge "Fix i40vf driver download URL"

6 years agoFix i40vf driver download URL 03/51503/1
Rodolfo Alonso Hernandez [Fri, 2 Feb 2018 17:21:46 +0000 (17:21 +0000)]
Fix i40vf driver download URL

Fix the download URL of i40vf driver introduced in
15e122a770d6349c84801dd05891e21661cbad2c.

In order to avoid the redirection, the URL should be:
  https://netix.dl.sourceforge.net/project/e1000/
  i40evf%20stable/{{ i40evf_version }}/{{ i40evf_gzfile }}

JIRA: YARDSTICK-993

Change-Id: Ie19d11d36417914e823b81867046123204111d76
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
6 years agoRemoved zero from tc number 93/51493/1
Mika Rautakumpu [Fri, 2 Feb 2018 08:00:15 +0000 (10:00 +0200)]
Removed zero from tc number

Originally tc number was TC0042, after fix TC042.

Change-Id: I3c36e39a141ec8eb74f9f00d7218bd511a56fbc9
Signed-off-by: Mika Rautakumpu <mika.rautakumpu@nokia.com>
6 years agoMerge "Adding new vFirewall Test cases based on Concurrency, Connections per second...
Ross Brattain [Thu, 1 Feb 2018 19:25:11 +0000 (19:25 +0000)]
Merge "Adding new vFirewall Test cases based on Concurrency, Connections per second, Throughput and Transactions per second for various http locator image sizes including 1b, 4k, 64k, 256k, 1024k"

6 years agoMerge "Add "img_property" when building Yardstick image"
Ross Brattain [Thu, 1 Feb 2018 19:24:34 +0000 (19:24 +0000)]
Merge "Add "img_property" when building Yardstick image"

6 years agoAdding three missing test case descriptions 51/51451/4
Mika Rautakumpu [Thu, 1 Feb 2018 12:08:17 +0000 (14:08 +0200)]
Adding three missing test case descriptions

HA tests TC056, TC057 and TC058 are missing from Yardstick
test case list. Missing white space added to tc056.rst.

Change-Id: Id56a22ad96af8c3d05d95fb58259e9683ce9fab0
Signed-off-by: Mika Rautakumpu <mika.rautakumpu@nokia.com>
6 years agoMerge "Modify fuel_baremetal pod config file"
Ross Brattain [Wed, 31 Jan 2018 22:00:40 +0000 (22:00 +0000)]
Merge "Modify fuel_baremetal pod config file"

6 years agoAdd sample OpenStack/SRIOV RFC2544 based TC 13/51113/5
Mytnyk, Volodymyr [Thu, 25 Jan 2018 09:41:11 +0000 (09:41 +0000)]
Add sample OpenStack/SRIOV RFC2544 based TC

Add sample OpenStack/SRIOV RFC2544 based test case which can be
run using external Trex.

Console log: http://paste.openstack.org/show/658002/
Result output: http://paste.openstack.org/show/658004/

JIRA: YARDSTICK-967

Change-Id: Id0e2d6d47f459c7e6a3370735bab74f7ce502b24
Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
6 years agoMake 'Scenario' classes plugable 05/51005/4
Rodolfo Alonso Hernandez [Tue, 23 Jan 2018 16:23:57 +0000 (16:23 +0000)]
Make 'Scenario' classes plugable

This patch makes yardstick.benchmark.scenario.base:Scenario classes
plugable.

A new entry point is added to the setup. This entry point could be
extended in other plugin projects to add new Scenario classes.

E.g.: take a look at [1]. This is a Yardstick plugin example project.
Clone the project and execute, from the project directory:

  $ sudo -EH python setup.py install

This will add a new module to python ('yardstick-new-plugin') and a
new Scenario class.

Now list the scenarios in Yardstick:

  $ yardstick scenario list
    ...
    | SpecCPU2006_for_VM    | Spec CPU2006 benchmark for Virtual Machine |
    | SpecCPU2006           | Spec CPU2006 benchmark                     |
    | Dummy2                | Execute Dummy (v2!) echo                   |
    +-----------------------+--------------------------------------------+

[1] https://github.com/ralonsoh/yardstick_new_plugin

JIRA: YARDSTICK-910

Change-Id: Ib70ee9bf4dc7ff91d1dd6377317b313288e36bff
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
6 years agoMerge "Add Intel Fortville 40G VF driver to sample VNF image"
Rodolfo Alonso Hernandez [Mon, 29 Jan 2018 23:26:52 +0000 (23:26 +0000)]
Merge "Add Intel Fortville 40G VF driver to sample VNF image"

6 years agoMerge "Change CivetWeb download URL"
Ross Brattain [Mon, 29 Jan 2018 19:31:39 +0000 (19:31 +0000)]
Merge "Change CivetWeb download URL"

6 years agoMerge "Fix up tests for Parser scenario"
Ross Brattain [Mon, 29 Jan 2018 19:31:22 +0000 (19:31 +0000)]
Merge "Fix up tests for Parser scenario"

6 years agoMerge "Move tests: unit/cmd/"
Ross Brattain [Mon, 29 Jan 2018 19:30:22 +0000 (19:30 +0000)]
Merge "Move tests: unit/cmd/"

6 years agoAdd Intel Fortville 40G VF driver to sample VNF image 11/51111/6
Mytnyk, Volodymyr [Thu, 25 Jan 2018 09:19:18 +0000 (09:19 +0000)]
Add Intel Fortville 40G VF driver to sample VNF image

1) Add common YAML config file to add kernel drivers to sample VNF image.
2) Add Intel Fortville 40G VF driverto sample VNF image using
   common YAML config file for drivers.
3) Configure i40evf driver to load on boot

JIRA: YARDSTICK-968

Change-Id: I223c8a10d77352baf4f41a481f465970655ba251
Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
6 years agoMerge "Adding support to pull docker images behind proxy"
Emma Foley [Mon, 29 Jan 2018 09:48:44 +0000 (09:48 +0000)]
Merge "Adding support to pull docker images behind proxy"

6 years agoImprove ovs_deploy.bash script 77/50377/9
Rodolfo Alonso Hernandez [Wed, 10 Jan 2018 18:59:41 +0000 (18:59 +0000)]
Improve ovs_deploy.bash script

Improved ovs_deploy.bash script [1]:
- Check if there is an error during the execution.
- Removed "prerequisites" function because is not called.
- Modified DPDK package installation: execute "make config" and then "make"
- Added comments.

[1]https://github.com/opnfv/yardstick/blob/master/yardstick/resources/scripts/install/ovs_deploy.bash

JIRA: YARDSTICK-916

Change-Id: I3029f983dde72aa46f6fdd61dd64d086ab3c2af6
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
6 years agoFix up tests for Parser scenario 59/47759/5
Emma Foley [Fri, 24 Nov 2017 09:46:37 +0000 (09:46 +0000)]
Fix up tests for Parser scenario

* Check the results at the test methods
* Remove print statement from Parser scenario
* Replace assertEquals(x, True) with assertTrue(x)

Change-Id: I5c2612692e625fc888c7ce7637b9e1625440724a
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
6 years agoAdding support to pull docker images behind proxy 71/51171/2
Deepak S [Fri, 26 Jan 2018 07:37:44 +0000 (13:07 +0530)]
Adding support to pull docker images behind proxy

This patch creates a http_proxy.conf in docker service,
to enable docker commands behind the proxy

Change-Id: Iac38a086026c11e89e534728467dc7da0e01ba59
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
6 years agoMerge "Add python-openstackclient in docker image"
Ross Brattain [Fri, 26 Jan 2018 21:13:16 +0000 (21:13 +0000)]
Merge "Add python-openstackclient in docker image"

6 years agoMerge "Replace assertEqual(x, True|False) with assert[True|False](x)"
Ross Brattain [Fri, 26 Jan 2018 21:12:53 +0000 (21:12 +0000)]
Merge "Replace assertEqual(x, True|False) with assert[True|False](x)"

6 years agoMerge changes from topic 'bug/yardstick-864'
Ross Brattain [Fri, 26 Jan 2018 21:12:01 +0000 (21:12 +0000)]
Merge changes from topic 'bug/yardstick-864'

* changes:
  Replace assertEquals with assertEqual
  Make files pep8 compliant before using assertTrue|False

6 years agoMerge "Remove generated file in 'test_build_vm_xml'"
Rodolfo Alonso Hernandez [Fri, 26 Jan 2018 10:54:55 +0000 (10:54 +0000)]
Merge "Remove generated file in 'test_build_vm_xml'"

6 years agoModify fuel_baremetal pod config file 99/50699/3
ting wu [Tue, 16 Jan 2018 12:27:28 +0000 (13:27 +0100)]
Modify fuel_baremetal pod config file

The current HA testcases failed on fuel baremetal installer
with reason "SSHTimeout". This is due to incorrect ssh login
info in the pod config file. The change is to by running
'prepare_env.sh' script to

- read env vars 'USER_NAME' and 'SSH_KEY'
- replace the 'node_username' to env var 'USER_NAME'
- replace the "node_keyfile" to env var 'SSH_KEY'

JIRA: ARMBAND-317

Change-Id: I0239892f447ae99ab4025eedcd133e1b6f04e5a5
Signed-off-by: ting wu <ting.wu@enea.com>
6 years agoAdd python-openstackclient in docker image 99/51099/2
Alex Yang [Thu, 25 Jan 2018 06:51:19 +0000 (14:51 +0800)]
Add python-openstackclient in docker image

"openstack: command not found" error occurred in [1].
The version of python-openstackclient is listed in [2].
This program should be installed in the container image
to make CI work for now.

[1]: https://build.opnfv.org/ci/job/yardstick-daisy-baremetal-daily-master/114/
[2]: https://github.com/openstack/requirements/blob/stable/pike/global-requirements.txt

Change-Id: Idb50e26bb2ca36f2dd6b6dddf94680d479cb9c9f
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
6 years agoReplace assertEqual(x, True|False) with assert[True|False](x) 99/49299/6
Emma Foley [Tue, 19 Dec 2017 15:15:37 +0000 (15:15 +0000)]
Replace assertEqual(x, True|False) with assert[True|False](x)

Change-Id: Id19df79b4d27aab1a83d8350ce6395e87c13472b
JIRA: YARDSTICK-903
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
6 years agoReplace assertEquals with assertEqual 89/49289/7
Emma Foley [Tue, 19 Dec 2017 11:45:57 +0000 (11:45 +0000)]
Replace assertEquals with assertEqual

unittest.assertEquals is deprecated[1], and has been replaced with
unittest.assertEqual.

[1] https://docs.python.org/2/library/unittest.html#deprecated-aliases

Change-Id: I9c6320e3a9ec5528036b529a9c32fc48b0bcfd62
JIRA: YARDSTICK-864
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
6 years agoMake files pep8 compliant before using assertTrue|False 73/50373/5
Emma Foley [Wed, 10 Jan 2018 10:48:29 +0000 (10:48 +0000)]
Make files pep8 compliant before using assertTrue|False

JIRA: YARDSTICK-903
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Change-Id: Id7912b5ddee36e7366bcfa824379853efd0a89f1

6 years agoMove tests: unit/cmd/ 51/48251/9
Emma Foley [Wed, 29 Nov 2017 23:33:27 +0000 (23:33 +0000)]
Move tests: unit/cmd/

* Fix pylint errors
* Add TODOs

Some errors are ignored locally, as they were a symptom of other problems.
These issues have been flagged with a TODO, and should be fixed later.

Change-Id: I505d72e1c646fea1976a0bf854369c6b6308bbb1
Jira: YARDSTICK-837
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
6 years agoRemove img_modify_playbook from nsb_setup.sh script 09/51009/2
Mytnyk, Volodymyr [Tue, 23 Jan 2018 17:35:05 +0000 (17:35 +0000)]
Remove img_modify_playbook from nsb_setup.sh script

The `img_modify_playbook` variable is not used anymore by the
build_yardstick_image.yml. The `img_property` variable is used
instead. The `img_modify_playbook` usage has been removed and
the `img_property` has been introduced in
YARDSTICK-879 JIRA story.

JIRA: YARDSTICK-964

Change-Id: I0239544c4f4078de7a4817292ab6bd789c21e944
Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
Signed-off-by: Alonso Hernandez, Rodolfo <rodolfo.alonso.hernandez@intel.com>
6 years agoRemove generated file in 'test_build_vm_xml' 09/50409/2
Rodolfo Alonso Hernandez [Thu, 11 Jan 2018 12:08:30 +0000 (12:08 +0000)]
Remove generated file in 'test_build_vm_xml'

Change I22e95c488e27d6e2a8fdf6c1a07faab275fa6bba introduced a change in
test case 'test_build_vm_xml' [1]. This test case generates a file which
is stored locally but never removed.

[1]https://github.com/opnfv/yardstick/blob/80dc9034edeb05f66bfa6264ae0adf0f6aea60da/tests/unit/benchmark/contexts/standalone/test_model.py

JIRA: YARDSTICK-918

Change-Id: I91d39bb37c3d8a273fe68155bb308c5a3bc1ca9d
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
6 years agoMerge "'libvirt' guest console in Standalone model"
Ross Brattain [Wed, 24 Jan 2018 17:52:24 +0000 (17:52 +0000)]
Merge "'libvirt' guest console in Standalone model"

6 years agoMerge "Check RS for virtualized OpenStack/Yardstick"
Ross Brattain [Wed, 24 Jan 2018 16:12:18 +0000 (16:12 +0000)]
Merge "Check RS for virtualized OpenStack/Yardstick"

6 years agoMerge "Cleanup of redundant files from Prox directory"
Rodolfo Alonso Hernandez [Wed, 24 Jan 2018 15:52:32 +0000 (15:52 +0000)]
Merge "Cleanup of redundant files from Prox directory"

6 years agoCheck RS for virtualized OpenStack/Yardstick 01/50501/8
Stepan Andrushko [Thu, 11 Jan 2018 17:51:45 +0000 (19:51 +0200)]
Check RS for virtualized OpenStack/Yardstick

Draft for env requirements reading and validation
Script can be run from tools/virt_ci_rampup.sh. First requirement file is
parsed/stored. This file must be created in ahead and named as
'infra_deploy.yaml'. Then separate ansible role is used to validate
resources. Ansible-role fails if there is not enough resources on the host
for cpu, ram, disk space.

JIRA: YARDSTICK-945

Change-Id: I86cd4bdc963de3aa51392fc73a239cbd426bc64a
Signed-off-by: Stepan Andrushko <stepanx.andrushko@intel.com>
6 years agoMerge "Use assertIn(x, y) instead of other variations"
Rodolfo Alonso Hernandez [Tue, 23 Jan 2018 21:16:12 +0000 (21:16 +0000)]
Merge "Use assertIn(x, y) instead of other variations"

6 years agoCleanup of redundant files from Prox directory 99/50999/1
Abhijit Sinha [Tue, 23 Jan 2018 16:09:53 +0000 (16:09 +0000)]
Cleanup of redundant files from Prox directory

JIRA: YARDSTICK-965

Removed the redundant files and directory from
Prox test folder.

Change-Id: I6167f0a4ccdd581153dad3ec9f5eaaf2619aacbd
Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com>
6 years agoMerge "Enable iommu support in grub"
Ross Brattain [Tue, 23 Jan 2018 15:43:03 +0000 (15:43 +0000)]
Merge "Enable iommu support in grub"

6 years agoRename ResourceProfile.check_if_sa_running() 05/47605/8
Emma Foley [Tue, 21 Nov 2017 16:56:42 +0000 (16:56 +0000)]
Rename ResourceProfile.check_if_sa_running()

* Update log message and rename method to make debugging easier
* Fix pep8 violations in touched files

JIRA: YARDSTICK-859

Change-Id: Id138d72cd8557ffacd5dcc81d06feeb484e13625
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
6 years agoEnable iommu support in grub 45/47645/10
Jan Malanik [Tue, 21 Nov 2017 20:05:43 +0000 (12:05 -0800)]
Enable iommu support in grub

JIRA: YARDSTICK-895
It's required for sriov standalone yardstick tests.
This part of commit message will be deleted:
This code will be enabled when https://gerrit.opnfv.org/gerrit/#/c/47957/ will be merged,
because it requires host reboot.

Change-Id: I0ec9cbf90a9d83d54e545fcf421b8baf206601a4
Signed-off-by: Jan Malanik <janx.malanik@intel.com>
Signed-off-by: Malanik Jan <janx.malanik@intel.com>
6 years agoMerge "Clean unit tests in "benchmark.scenarios.lib.test_create_volume.py"
Ross Brattain [Mon, 22 Jan 2018 21:50:37 +0000 (21:50 +0000)]
Merge "Clean unit tests in "benchmark.scenarios.lib.test_create_volume.py"

6 years agoMerge "Move tests: unit/dispatcher"
Ross Brattain [Mon, 22 Jan 2018 21:47:07 +0000 (21:47 +0000)]
Merge "Move tests: unit/dispatcher"

6 years agoMerge "Move tests: unit/orchestrator/"
Ross Brattain [Mon, 22 Jan 2018 21:46:43 +0000 (21:46 +0000)]
Merge "Move tests: unit/orchestrator/"

6 years agoMerge "Replace "oslo_utils.importutils" with standard library "importlib""
Ross Brattain [Mon, 22 Jan 2018 21:44:51 +0000 (21:44 +0000)]
Merge "Replace "oslo_utils.importutils" with standard library "importlib""

6 years agoClean unit tests in "benchmark.scenarios.lib.test_create_volume.py 25/47525/6
Emma Foley [Mon, 20 Nov 2017 15:20:49 +0000 (15:20 +0000)]
Clean unit tests in "benchmark.scenarios.lib.test_create_volume.py

* Use mock_object.assert_called_with instead of
    self.assertTrue(mock_object.called)
* Remove an unneeded if clause in CreateVolume
* Add individual tests for each method in CreateVolume

Change-Id: I54cc56434d316f059b3822879145e6a299866fcb
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
6 years agoMerge "update docs for procedure after host reboot"
Ross Brattain [Sat, 20 Jan 2018 00:06:36 +0000 (00:06 +0000)]
Merge "update docs for procedure after host reboot"

6 years agoMerge "Vincenzo stepping down as Yardstick committer"
Ross Brattain [Fri, 19 Jan 2018 19:06:09 +0000 (19:06 +0000)]
Merge "Vincenzo stepping down as Yardstick committer"

6 years agoChange ansible version to 2.4.2 33/50833/3
John O Loughlin [Fri, 19 Jan 2018 10:49:53 +0000 (10:49 +0000)]
Change ansible version to 2.4.2

Modified requirements.txt to update ansible version to 2.4.2

For the ansible virt module [1] XML templates are required.

To edit, the XML templates the XML module is required.
This is new in ansible 2.4 [2]

There is no max version restriction for ansible in OpenStack [3].

[1] http://docs.ansible.com/ansible/latest/virt_module.html
[2] https://docs.ansible.com/ansible/2.4/xml_module.html
[3] https://github.com/openstack/kolla-ansible/blob/stable/pike/doc/source/user/quickstart.rst

JIRA: YARDSTICK-948

Change-Id: I19b178f695f7381a3ecfbdb74f953a1276250958
Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
6 years agoReplace "oslo_utils.importutils" with standard library "importlib" 35/50835/1
Rodolfo Alonso Hernandez [Fri, 19 Jan 2018 11:36:25 +0000 (11:36 +0000)]
Replace "oslo_utils.importutils" with standard library "importlib"

The current implementation of dynamic library importation is prone
to failure [1]:
- "sys.modules" is modified manually, which is something not
  recommended [2].
- When a module is imported is added to "sys.modules"; that means
  there is no need to manually create an entry in this object.
- "importlib" library is part of the standard library and is now
  available in PY3 and PY2 (backported). This library contains a
  function called "import_module" to import a module in runtime.

[1]https://github.com/opnfv/yardstick/blob/d2c7cc4e9768ed003257a95c92cdb278d516761b/yardstick/common/utils.py#L72-L93
[2]http://justus.science/blog/2015/04/19/sys.modules-is-dangerous.html

JIRA: YARDSTICK-949

Change-Id: Ide3b74f98858d06fa275fb6c9b78ceeaa64feed5
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
6 years agoVincenzo stepping down as Yardstick committer 89/50789/1
Ross Brattain [Thu, 18 Jan 2018 19:22:50 +0000 (11:22 -0800)]
Vincenzo stepping down as Yardstick committer

From: opnfv-tech-discuss-bounces@lists.opnfv.org [mailto:opnfv-tech-discuss-bounces@lists.opnfv.org] On Behalf Of Riccobene, Vincenzo M
Sent: Thursday, January 18, 2018 2:35 AM
To: opnfv-tech-discuss@lists.opnfv.org
Subject: [opnfv-tech-discuss] Stepping down as Yardstick committer

Hello,
I am currently a committer for the OPNFV Yardstick project, but as I see unfortunately in the last months I have been absent from the project since other commitments took higher priorities and all my time, resulting in no major contributions to Yardstick, and I consequently decided to step down from the positon of committer.

It has been a great pleasure to contribute to the community and I hope I will be able to contribute again in the future.
Thank you very much all!

Best Regards.
Vince

Change-Id: I809021b4081caddb60549204a742b93134190a87
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
6 years agoMerge "Fix Cirros image name in CI script"
Ross Brattain [Wed, 17 Jan 2018 22:17:52 +0000 (22:17 +0000)]
Merge "Fix Cirros image name in CI script"

6 years agoMove tests: unit/orchestrator/ 69/48269/7
Emma Foley [Wed, 17 Jan 2018 11:23:27 +0000 (11:23 +0000)]
Move tests: unit/orchestrator/

* Fix pylint errors
* Add notes where additional action is needed.

Some errors are ignored locally, as they were a symptom of other problems.
These issues have been flagged for follow-up, and should be fixed later.

JIRA: YARDSTICK-837
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Change-Id: Idbf56d0cd3b29b70691acd6af4d5ac3c400d2ccc

6 years agoProposing Emma Foley as a committer in Yardstick 21/50621/2
Ross Brattain [Mon, 15 Jan 2018 08:20:07 +0000 (00:20 -0800)]
Proposing Emma Foley as a committer in Yardstick

Emma has contributed to Yardstick in many ways
Achievement/Contributions include:
- Provided high-quality code review comments.
- Tox improvements
- Refactored unittest to OpenStack conventions
- Improved unittest code coverage
- Improved code quality by fixing warnings and errors
- Documentation review and update
- Split out test-requirements.txt
- Attending OPNFV Euphrates Plugfest Portland
- Starting Traffic-Generator-as-a-service initiative with NFVBench and VSPerf
- Contributions:
  https://gerrit.opnfv.org/gerrit/#/q/owner:emma.l.foley%2540intel.com

Change-Id: I639fa27a7271bf9996b2ee0e19a689644af54afe
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
6 years agoProposing Rodolfo Alonso Hernandez as a committer in Yardstick 87/50487/3
Rodolfo Alonso Hernandez [Fri, 12 Jan 2018 10:22:44 +0000 (10:22 +0000)]
Proposing Rodolfo Alonso Hernandez as a committer in Yardstick

Rodolfo has contributed to Yardstick in many ways
Achievement/Contributions include:
- Userguide review and update
- Provided high-quality code review comments.
- Improved unittest code coverage
- Improved code quality by fixing warnings and errors
- Jenkins gate check improvements
- Pip requirements checking and updating
- Migration to Shade removing OpenStack project clients.
- Regularly attending Yardstick meetings
- JIRA personal dashboard:
  https://jira.opnfv.org/secure/Dashboard.jspa?selectPageId=11400
- Contributions:
  https://gerrit.opnfv.org/gerrit/#/q/owner:rodolfo.alonso.hernandez%2540intel.com

Change-Id: I3e5f14a3f99fffcd4bd4973aedc44ce4beeb22be
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
6 years agoMerge "Proposing Jack Chan as a committer in Yardstick"
Ross Brattain [Wed, 17 Jan 2018 02:33:35 +0000 (02:33 +0000)]
Merge "Proposing Jack Chan as a committer in Yardstick"

6 years agoFix Cirros image name in CI script 87/49487/3
Rodolfo Alonso Hernandez [Thu, 21 Dec 2017 15:59:05 +0000 (15:59 +0000)]
Fix Cirros image name in CI script

Fixed the name of Cirros image used in OpenStack. The image name
is written in lowercase letters.

JIRA: YARDSTICK-842

Change-Id: Iff0b494125be61a055da753eaf57903b64f18509
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
6 years agoMerge "bugfix: Fix duplicate 'address' in standlone SRIOV"
Ross Brattain [Tue, 16 Jan 2018 23:14:09 +0000 (23:14 +0000)]
Merge "bugfix: Fix duplicate 'address' in standlone SRIOV"

6 years agobugfix: Fix duplicate 'address' in standlone SRIOV 11/49711/3
Dino Madarang [Wed, 27 Dec 2017 23:52:12 +0000 (15:52 -0800)]
bugfix: Fix duplicate 'address' in standlone SRIOV

* Add unit test per Rodolfo's comment

Creating a VM using generted xml file /tmp/vm_sriov_0.xml returns
an XML error: missing source address type.

This fix modifies generted xml from:
<source>
<address>
<address bus="0x1a" domain="0x0000" function="0x0" slot="0x10" type="pci" />
</address>
</source>

to:

<source>
<address bus="0x1a" domain="0x0000" function="0x0" slot="0x10" type="pci" />
</source>

Change-Id: I694153e7468986bacb19ba3e09e761993aad7184
Signed-off-by: Dino Simeon Madarang <dinox.madarang@intel.com>
Reviewed-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Reviewed-by: Ross Brattain <ross.b.brattain@intel.com>
Reviewed-by: Alain Jebara <alain.jebara@intel.com>
Reviewed-by: Emma Foley <emma.l.foley@intel.com>
6 years agoMerge "bugfix:Incorrect title for testcase 081"
Jing Lu [Tue, 16 Jan 2018 02:28:43 +0000 (02:28 +0000)]
Merge "bugfix:Incorrect title for testcase 081"

6 years agoMerge "Update Dockerfile.aarch64.patch"
Ross Brattain [Tue, 16 Jan 2018 01:11:56 +0000 (01:11 +0000)]
Merge "Update Dockerfile.aarch64.patch"

6 years agoupdate docs for procedure after host reboot 07/50507/2
John O Loughlin [Fri, 12 Jan 2018 17:23:04 +0000 (17:23 +0000)]
update docs for procedure after host reboot

Added instructions to restart nginx and uwsgi after the host is rebooted.
Added instructions to start yardstick container if the host is rebooted.
Removed section on virtual python environment as it is not needed.

JIRA: YARDSTICK-919

Change-Id: I6e8bd1d52954c2aa138ce7879211b91b3644ecb2
Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
6 years agoProposing Jack Chan as a committer in Yardstick 19/50619/1
Ross Brattain [Mon, 15 Jan 2018 07:53:51 +0000 (23:53 -0800)]
Proposing Jack Chan as a committer in Yardstick

Jack Chan has contributed to the Yardstick project in many ways
Achievements/Contributions include:
- Kubernetes context
- GUI
- Yardstick API
- Reporting fixes
- Attending OPNFV Summit Beijing
- Regularly attending Yardstick meetings

Change-Id: Ie46a99619365893f3b877822f82f626cf7a36deb
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
6 years agobugfix:Incorrect title for testcase 081 13/50613/1
JingLu5 [Mon, 15 Jan 2018 06:48:02 +0000 (06:48 +0000)]
bugfix:Incorrect title for testcase 081

JIRA: YARDSTICK-915

fix the wrongly numbered testcase title

Change-Id: I61f94b66e3f9dac655b5c71646524b19bae7307c
Signed-off-by: JingLu5 <lvjing5@huawei.com>
6 years agoMerge "Testcase 084 documentation"
Jing Lu [Mon, 15 Jan 2018 06:31:22 +0000 (06:31 +0000)]
Merge "Testcase 084 documentation"

6 years agoDo not hide unit tests execution fail 49/50549/1
Rodolfo Alonso Hernandez [Sat, 13 Jan 2018 09:00:50 +0000 (09:00 +0000)]
Do not hide unit tests execution fail

While moving tests from ./tests/ to ./yardstick/tests, both unit tests
directories are executed. If the first test run fails, do not hide
the error and exit immediately.

Change-Id: Ib6c64ccf2f4b19722722eb43b3d45d5ad5f0169d
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
6 years agoAdd "img_property" when building Yardstick image 47/50547/1
Rodolfo Alonso Hernandez [Sat, 13 Jan 2018 08:26:03 +0000 (08:26 +0000)]
Add "img_property" when building Yardstick image

Since [1], when "build_yardstick_image.yml" is executed, a variable called
"img_property" must be set. This variable could be "normal" or "nsb",
depending on the type of image to generate.

[1] I9fdf30084511ca9a008df3b53887b06273bbd549

JIRA: YARDSTICK-921

Change-Id: Ie3ca6fcf76b94eb9604847aefa77c6a644dddd14
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
6 years agoChange CivetWeb download URL 11/50511/1
Rodolfo Alonso Hernandez [Fri, 12 Jan 2018 17:48:02 +0000 (17:48 +0000)]
Change CivetWeb download URL

Changed CivetWeb download URL to [1].

[1] https://iweb.dl.sourceforge.net/project/civetweb/1.9.1/CivetWeb_V1.9.1.zip

JIRA: YARDSTICK-920

Change-Id: Ida014a57bd5b87d26c6cb8f5d36d43060f08026d
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
6 years agoUse assertIn(x, y) instead of other variations 15/49315/8
Emma Foley [Tue, 19 Dec 2017 15:44:11 +0000 (15:44 +0000)]
Use assertIn(x, y) instead of other variations

unittest.assertIn(x,y) should be used instead of:
* unittest.assertTrue(x in y)
* unittest.assertEqual(x in y, True)

Also fixes pep8 violations existing in the file.

Change-Id: I705c1bd4af74757b5c928995894aede436d66817
JIRA: YARDSTICK-901
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
6 years agoUpdate Dockerfile.aarch64.patch 39/50439/3
Cristina Pauna [Thu, 11 Jan 2018 17:22:56 +0000 (19:22 +0200)]
Update Dockerfile.aarch64.patch

The docker image was not built for aarch64 due to recent changes in the
Dockerfile. The updates to the Dockerfile.aarch64.patch are:
- update docker version to 16.04
- install dependencies for pyopenssl==17.5.0 (libssl-dev and libffi-dev)

JIRA: ARMBAND-353

Change-Id: I915172d4e7ce21b1f5de044b20301b076cb6fe20
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
6 years agoMove tests: unit/dispatcher 65/48265/5
Emma Foley [Wed, 29 Nov 2017 23:35:05 +0000 (23:35 +0000)]
Move tests: unit/dispatcher

* Fix pylint errors
* Add TODOs

Some errors are ignored locally, as they were a symptom of other problems.
These issues have been flagged with a TODO, and should be fixed later.

JIRA: YARDSTICK-837
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Change-Id: I1f8a6041424c4c69f46ef30bd5c66d2d51d24347