diff options
| -rwxr-xr-x | docker/exec_tests.sh | 3 | ||||
| -rw-r--r-- | fuel-plugin/LICENSE | 202 | ||||
| -rw-r--r-- | fuel-plugin/README.md | 36 | ||||
| -rwxr-xr-x | fuel-plugin/deployment_scripts/install.sh | 47 | ||||
| -rw-r--r-- | fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp | 33 | ||||
| -rw-r--r-- | fuel-plugin/deployment_tasks.yaml | 33 | ||||
| -rw-r--r-- | fuel-plugin/environment_config.yaml | 0 | ||||
| -rw-r--r-- | fuel-plugin/fuel_ping.yaml | 56 | ||||
| -rw-r--r-- | fuel-plugin/metadata.yaml | 36 | ||||
| -rw-r--r-- | fuel-plugin/node_roles.yaml | 21 | ||||
| -rwxr-xr-x | fuel-plugin/pre_build_hook | 33 | ||||
| -rw-r--r-- | fuel-plugin/tasks.yaml | 14 | ||||
| -rw-r--r-- | fuel-plugin/vagrant/Vagrantfile | 21 | ||||
| -rwxr-xr-x | fuel-plugin/vagrant/build_fuel_plugin.sh | 24 | ||||
| -rw-r--r-- | requirements.txt | 107 | ||||
| -rwxr-xr-x | tests/ci/load_images.sh | 2 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/networking/ping.py | 5 | ||||
| -rw-r--r-- | yardstick/orchestrator/heat.py | 29 |
18 files changed, 78 insertions, 624 deletions
diff --git a/docker/exec_tests.sh b/docker/exec_tests.sh index db053f7bc..9726e2b4a 100755 --- a/docker/exec_tests.sh +++ b/docker/exec_tests.sh @@ -16,7 +16,8 @@ set -e : ${RELENG_REPO:='https://gerrit.opnfv.org/gerrit/releng'} : ${RELENG_REPO_DIR:='/home/opnfv/repos/releng'} -: ${RELENG_BRANCH:='master'} # branch, tag, sha1 or refspec +# TEMP HACK to freeze releng version to workaround fetch_os_creds.sh problem +: ${RELENG_BRANCH:='abbf19f'} # branch, tag, sha1 or refspec git_checkout() { diff --git a/fuel-plugin/LICENSE b/fuel-plugin/LICENSE deleted file mode 100644 index e06d20818..000000000 --- a/fuel-plugin/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/fuel-plugin/README.md b/fuel-plugin/README.md deleted file mode 100644 index 8c00d4b68..000000000 --- a/fuel-plugin/README.md +++ /dev/null @@ -1,36 +0,0 @@ -plugin-yardstick -================ - -Plugin description -Installs Yardstick on base-os node via a fuel plugin. - -1) install vagrant fuel plugin builder (fpb) - sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev - sudo gem install fpm - sudo pip install fuel-plugin-builder -2) build plugin - fpb --build <plugin-dir> - e.g.: fpb --build yardstick/fuel-plugin - -3) copy plugin rpm to fuel master - e.g. scp plugin-yardstick-0.1-0.1.0-1.noarch.rpm <user>@<server-name>:~/ - -4) install plugin - fuel plugins --install <plugin-name>.rpm - -5) prepare fuel environment - on fuel dashboard, go to settings/other - enable yardstick plugin with checkbox - save settings - -6) add nodes to environment - -7) deploy - -8) run -Once deployed, SSH to deployed node. Find IP of yardstick node. -SSH to yardstick node, Activate yardstick: - source /var/lib/yardstick.openrc - source /var/lib/yardstick/bin/activate - export EXTERNAL_NETWORK="admin_floating_net" - yardstick task start /opt/yardstick/fuel-plugin/fuel_ping.yaml diff --git a/fuel-plugin/deployment_scripts/install.sh b/fuel-plugin/deployment_scripts/install.sh deleted file mode 100755 index 251d044bf..000000000 --- a/fuel-plugin/deployment_scripts/install.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016-2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -set -eux - -HOST=$1 -BIN_HOME=/opt/yardstick -VAR_HOME=/var/lib/yardstick -rm -rf $BIN_HOME; mkdir -p $BIN_HOME -rm -rf $VAR_HOME; mkdir -p $VAR_HOME - -apt-get install -y python-dev python-pip libffi-dev libssl-dev libxml2-dev libxslt1-dev - -#apt-get install python-virtualenv cannot work -#use pip to work around the issue - -pip install virtualenv - -# create python virtual env -virtualenv $VAR_HOME - -export PS1="yardstick" -source $VAR_HOME/bin/activate - -easy_install -U setuptools - -cd $BIN_HOME - -curl http://$HOST:8080/plugins/fuel-plugin-yardstick-1.0/repositories/ubuntu/yardstick.tar.gz | tar xzvf - - -# install dependency -pip install -r requirements.txt - -python setup.py install diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp deleted file mode 100644 index 3741bacf2..000000000 --- a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp +++ /dev/null @@ -1,33 +0,0 @@ -$master_ip = hiera('master_ip') - -$access_hash = hiera_hash('access', {}) -$admin_tenant = $access_hash['tenant'] -$admin_user = $access_hash['user'] -$admin_password = $access_hash['password'] -$region = hiera('region', 'RegionOne') - -$auth_api_version = '' -$service_endpoint = hiera('service_endpoint', $management_vip) -$ssl_hash = hiera_hash('use_ssl', {}) -$internal_auth_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'protocol', 'http') -$internal_auth_address = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'hostname', [$service_endpoint]) -$identity_uri = "${internal_auth_protocol}://${internal_auth_address}:5000" -$auth_url = "${identity_uri}/${auth_api_version}" - -exec { "install yardstick": - command => "curl http://${master_ip}:8080/plugins/fuel-plugin-yardstick-1.0/deployment_scripts/install.sh | bash -s ${master_ip}", - path => "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"; -} - -osnailyfacter::credentials_file { '/var/lib/yardstick.openrc': - admin_user => $admin_user, - admin_password => $admin_password, - admin_tenant => $admin_tenant, - region_name => $region, - auth_url => $auth_url, -} - -exec { "run yardstick": - command => "echo hello", - path => "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"; -} diff --git a/fuel-plugin/deployment_tasks.yaml b/fuel-plugin/deployment_tasks.yaml deleted file mode 100644 index db57765a3..000000000 --- a/fuel-plugin/deployment_tasks.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2016-2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -- id: yardstick - type: group - role: [yardstick] - requires: [deploy_start] - required_for: [deploy_end] - tasks: [hiera, setup_repositories, fuel_pkgs, globals, tools, logging, netconfig] - parameters: - strategy: - type: parallel - -- id: yardstick-install - type: puppet - version: 2.0.0 - groups: [yardstick] - required_for: [post_deployment_end] - requires: [post_deployment_start] - parameters: - puppet_manifest: puppet/manifests/yardstick-install.pp - puppet_modules: puppet/modules:/etc/puppet/modules - timeout: 720 diff --git a/fuel-plugin/environment_config.yaml b/fuel-plugin/environment_config.yaml deleted file mode 100644 index e69de29bb..000000000 --- a/fuel-plugin/environment_config.yaml +++ /dev/null diff --git a/fuel-plugin/fuel_ping.yaml b/fuel-plugin/fuel_ping.yaml deleted file mode 100644 index e6c59480b..000000000 --- a/fuel-plugin/fuel_ping.yaml +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (c) 2016-2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -# Sample file copied from sampls/ping.yaml -# context part is modified according to fuel default env - -schema: "yardstick:task:0.1" - -scenarios: -- - type: Ping - options: - packetsize: 200 - host: athena.demo - target: ares.demo - - runner: - type: Duration - duration: 60 - interval: 1 - - sla: - max_rtt: 10 - action: monitor - -context: - name: demo - image: TestVM - flavor: m1.micro - user: cirros - - placement_groups: - pgrp1: - policy: "availability" - - servers: - athena: - floating_ip: true - placement: "pgrp1" - ares: - placement: "pgrp1" - - networks: - test: - cidr: '192.168.111.0/24' diff --git a/fuel-plugin/metadata.yaml b/fuel-plugin/metadata.yaml deleted file mode 100644 index e9aebaf2a..000000000 --- a/fuel-plugin/metadata.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Plugin name -name: fuel-plugin-yardstick -# Human-readable name for your plugin -title: Install Yardstick -# Plugin version -version: '1.0.0' -# Description -description: Installs Yardstick -# Required fuel version -fuel_version: ['10.0'] -# Specify license of your plugin -licenses: ['Apache License Version 2.0'] -# Specify author or company name -authors: ['john.hinman@intel.com','david.j.chou@intel.com','ruijing.guo@intel.com'] -# A link to the plugin's page -homepage: 'https://gerrit.opnfv.org/gerrit/yardstick' -# Specify a group which your plugin implements, possible options: -# network, storage, storage::cinder, storage::glance, hypervisor, -# equipment -groups: [] -# Change `false` to `true` if the plugin can be installed in the environment -# after the deployment. -is_hotpluggable: true - -# Version of plugin package -package_version: '4.0.0' -# The plugin is compatible with releases in the list -releases: - - os: ubuntu - version: newton-10.0 - mode: ['ha'] - deployment_scripts_path: deployment_scripts/ - repository_path: repositories/ubuntu - -# Version of plugin package -package_version: '4.0.0' diff --git a/fuel-plugin/node_roles.yaml b/fuel-plugin/node_roles.yaml deleted file mode 100644 index 34ace6208..000000000 --- a/fuel-plugin/node_roles.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2016-2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -yardstick: - name: "Yardstick" - description: "Install Yardstick on nodes with this role" - has_primary: false # whether has primary role or not - public_ip_required: false # whether requires public net or not - weight: 50 # weight that will be used for ordering on fuel ui - limits: - min: 0 diff --git a/fuel-plugin/pre_build_hook b/fuel-plugin/pre_build_hook deleted file mode 100755 index 9c0a40e65..000000000 --- a/fuel-plugin/pre_build_hook +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -set -eux - -BUILD_FOR=${BUILD_FOR:-ubuntu} -DIR="$(dirname `readlink -f $0`)" - -function build_pkg { - case $1 in - ubuntu) - rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu - - # fixme: don't support offline installation now since pip in - # deployment_scripts/install.sh needs to access to internet - # - # cd ${DIR}/repositories/ubuntu - # Use aptititude; apt-get -d will skip download if package is already installed - # sudo apt-get install aptitude -y - # Download python packages into the repository - # aptitude download python-virtualenv python-dev libffi-dev libssl-dev - - cd ${DIR}/.. - tar -czf ${DIR}/repositories/ubuntu/yardstick.tar.gz . --exclude=yardstick.tar.gz - ;; - - *) echo "Not supported system"; exit 1;; - esac -} - -for system in $BUILD_FOR -do - build_pkg $system -done diff --git a/fuel-plugin/tasks.yaml b/fuel-plugin/tasks.yaml deleted file mode 100644 index c3ba08a2e..000000000 --- a/fuel-plugin/tasks.yaml +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2016-2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -[] diff --git a/fuel-plugin/vagrant/Vagrantfile b/fuel-plugin/vagrant/Vagrantfile deleted file mode 100644 index 271ff7937..000000000 --- a/fuel-plugin/vagrant/Vagrantfile +++ /dev/null @@ -1,21 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - - config.vm.box = "trusty-server-cloudimg-amd64" - config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" - - config.vm.define "fuel" do | h | - h.vm.host_name = "fuel" - h.vm.provision :shell, :inline => "/vagrant/build_fuel_plugin.sh", privileged: false - h.vm.synced_folder "../..", "/yardstick" - h.vm.provider :virtualbox do |v| - v.customize ["modifyvm", :id, "--memory", 4096] - v.customize ["modifyvm", :id, "--cpus", 4] - end - end -end diff --git a/fuel-plugin/vagrant/build_fuel_plugin.sh b/fuel-plugin/vagrant/build_fuel_plugin.sh deleted file mode 100755 index 548ea8457..000000000 --- a/fuel-plugin/vagrant/build_fuel_plugin.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016-2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -sudo apt-get update -y -sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev -sudo gem install fpm -sudo pip install fuel-plugin-builder -cp -r /yardstick /home/vagrant -cd /home/vagrant/yardstick/fuel-plugin; -rm -rf vagrant/.vagrant -fpb --debug --build . -cp *.rpm /vagrant diff --git a/requirements.txt b/requirements.txt index 4fb724df5..f283b9921 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,89 +7,88 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -ansible==2.2.2.0 Babel==2.3.4 +Jinja2==2.8.1 +MarkupSafe==0.23 +PyYAML==3.12 +SQLAlchemy==1.1.4 +ansible==2.2.2.0 +appdirs==1.4.3 backport-ipaddress==0.1 chainmap==1.0.2 -cliff==2.3.0 -cmd2==0.6.8 -coverage==4.1b2 -debtcollector==1.3.0 +cliff==2.4.0 +cmd2==0.6.9 +coverage==4.3.4 +debtcollector==1.11.0 django==1.8.17 +docker-py==1.10.6 ecdsa==0.13 -extras==0.0.3 -fixtures==1.4.0 +extras==1.0.0 +fixtures==3.0.0 flake8==2.5.4 -funcsigs==0.4 +flasgger==0.5.13 +flask-restful-swagger==0.19 +flask-restful==0.3.5 +flask==0.11.1 +funcsigs==1.0.2 functools32==3.2.3.post2; python_version <= '2.7' futures==3.0.5 +influxdb==4.0.0 iso8601==0.1.11 -Jinja2==2.8 -jsonpatch==1.13 +jsonpatch==1.15 jsonpointer==1.10 jsonschema==2.5.1 keystoneauth1==2.18.0 linecache2==1.0.0 -lxml==3.5.0 -MarkupSafe==0.23 +lxml==3.7.2 mccabe==0.4.0 -# upgrade to version 2.0.0 to match python3 unittest.mock features -mock==2.0.0 -monotonic==1.0 -msgpack-python==0.4.7 -netaddr==0.7.18 -netifaces==0.10.4 +mock==2.0.0 # upgrade to version 2.0.0 to match python3 unittest.mock features +monotonic==1.2 +msgpack-python==0.4.8 +netaddr==0.7.19 +netifaces==0.10.5 nose==1.3.7 openstacksdk==0.9.13 -os-client-config==1.22.0 -oslo.config==3.14.0 -oslo.i18n==3.4.0 -oslo.serialization==2.4.0 -oslo.utils==3.18.0 -paramiko==1.18.0 -pbr==1.8.1 +os-client-config==1.26.0 +osc-lib==1.3.0 +oslo.config==3.22.0 +oslo.i18n==3.12.0 +oslo.serialization==2.16.0 +oslo.utils==3.22.0 +paramiko==2.1.1 +pbr==1.10.0 pep8==1.7.0 +pika==0.10.0 positional==1.1.1 prettytable==0.7.2 pycrypto==2.6.1 pyflakes==1.0.0 -pyparsing==2.1.0 +pyparsing==2.1.10 +pyroute2==0.4.12 pyrsistent==0.11.12 -osc-lib==1.2.0 -python-cinderclient==1.9.0 -python-glanceclient==2.5.0 -python-heatclient==1.5.0 -python-keystoneclient==3.8.0 -python-mimeparse==1.5.1 -python-neutronclient==6.0.0 -python-novaclient==6.0.0 -python-openstackclient==3.8.0 +python-cinderclient==1.11.0 +python-glanceclient==2.6.0 +python-heatclient==1.8.1 +python-keystoneclient==3.10.0 +python-mimeparse==1.6.0 +python-neutronclient==6.1.0 +python-novaclient==7.1.1 +python-openstackclient==3.8.1 python-subunit==1.2.0 -python-swiftclient==3.0.0 -pytz==2015.7 -PyYAML==3.11 -requests==2.10.0 +python-swiftclient==3.3.0 +pytz==2016.10 +pyzmq==14.5.0 # version 14.5.0 for compatibility with trex traffic generator +requests==2.13.0 requestsexceptions==1.1.3 scp==0.10.2 shade==1.17.0 -simplejson==3.8.2 +simplejson==3.10.0 six==1.10.0 -stevedore==1.17.1 +stevedore==1.20.0 testrepository==0.0.20 -testtools==2.0.0 +testtools==2.2.0 traceback2==1.4.0 unicodecsv==0.14.1 unittest2==1.1.0 warlock==1.2.0 -wrapt==1.10.6 -flask==0.11.1 -flask-restful==0.3.5 -influxdb==3.0.0 -pyroute2==0.4.10 -docker-py==1.10.6 -flasgger==0.5.13 -flask-restful-swagger==0.19 -SQLAlchemy==1.1.4 -# version 14.5.0 for compatibility with trex traffic generator -pyzmq==14.5.0 -pika==0.10.0 +wrapt==1.10.8 diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index b1f925ed8..487f33e33 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -219,7 +219,7 @@ create_nova_flavor() echo echo "========== Creating yardstick-flavor ==========" # Create the nova flavor used by some sample test cases - openstack flavor create --id 100 --ram 512 --disk 3 --vcpus 1 yardstick-flavor + openstack flavor create --id 100 --ram 1024 --disk 3 --vcpus 1 yardstick-flavor # DPDK-enabled OVS requires guest memory to be backed by large pages if [[ $DEPLOY_SCENARIO == *[_-]ovs[_-]* ]]; then openstack flavor set --property hw:mem_page_size=large yardstick-flavor diff --git a/yardstick/benchmark/scenarios/networking/ping.py b/yardstick/benchmark/scenarios/networking/ping.py index 95367b3bb..a929e5337 100644 --- a/yardstick/benchmark/scenarios/networking/ping.py +++ b/yardstick/benchmark/scenarios/networking/ping.py @@ -76,7 +76,10 @@ class Ping(base.Scenario): raise RuntimeError(stderr) if stdout: - target_vm_name = target_vm.split('.')[0] + if isinstance(target_vm, dict): + target_vm_name = target_vm.get("name") + else: + target_vm_name = target_vm.split('.')[0] rtt_result[target_vm_name] = float(stdout) if "sla" in self.scenario_cfg: sla_max_rtt = int(self.scenario_cfg["sla"]["max_rtt"]) diff --git a/yardstick/orchestrator/heat.py b/yardstick/orchestrator/heat.py index ea9bd1b08..864f1f9ec 100644 --- a/yardstick/orchestrator/heat.py +++ b/yardstick/orchestrator/heat.py @@ -149,21 +149,28 @@ class HeatStack(HeatObject): class HeatTemplate(HeatObject): """Describes a Heat template and a method to deploy template to a stack""" - def _init_template(self): - self._template = {} - self._template['heat_template_version'] = '2013-05-23' + DESCRIPTION_TEMPLATE = """\ +Stack built by the yardstick framework for %s on host %s %s. +All referred generated resources are prefixed with the template +name (i.e. %s).\ +""" + def _init_template(self): timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") - self._template['description'] = \ - """Stack built by the yardstick framework for %s on host %s %s. - All referred generated resources are prefixed with the template - name (i.e. %s).""" % (getpass.getuser(), socket.gethostname(), - timestamp, self.name) + self._template = { + 'heat_template_version': '2013-05-23', + 'description': self.DESCRIPTION_TEMPLATE % ( + getpass.getuser(), + socket.gethostname(), + timestamp, + self.name + ), + 'resources': {}, + 'outputs': {} + } # short hand for resources part of template - self.resources = self._template['resources'] = {} - - self._template['outputs'] = {} + self.resources = self._template['resources'] def __init__(self, name, template_file=None, heat_parameters=None): super(HeatTemplate, self).__init__() |