diff options
| -rwxr-xr-x | ci/generate-admin-rc.sh | 2 | ||||
| -rwxr-xr-x | ci/verify.sh | 1 | ||||
| -rw-r--r-- | docker/Dockerfile | 1 | ||||
| -rw-r--r-- | docs/release/release-notes/index.rst | 15 | ||||
| -rw-r--r-- | docs/release/release-notes/release-notes.rst | 109 | ||||
| -rw-r--r-- | storperf/storperf_master.py | 18 |
6 files changed, 138 insertions, 8 deletions
diff --git a/ci/generate-admin-rc.sh b/ci/generate-admin-rc.sh index 07a0a3e..3c0b33a 100755 --- a/ci/generate-admin-rc.sh +++ b/ci/generate-admin-rc.sh @@ -42,5 +42,5 @@ then echo export OS_PROJECT_NAME=admin >> job/openstack.rc fi -sed "s/export //" job/openstack.rc > job/admin.rc +grep "export" job/openstack.rc | sed "s/export //" > job/admin.rc echo "INSTALLER_TYPE=${INSTALLER}" >> job/admin.rc diff --git a/ci/verify.sh b/ci/verify.sh index 0905ca2..84dc603 100755 --- a/ci/verify.sh +++ b/ci/verify.sh @@ -30,6 +30,7 @@ pip install funcsigs==0.4 pip install flake8==2.5.4 pip install html2text==2016.1.8 pip install keystoneauth1==2.12.1 +pip install numpy==1.6 pip install matplotlib==1.3.1 pip install mock==1.3.0 pip install nose==1.3.7 diff --git a/docker/Dockerfile b/docker/Dockerfile index 69a6e3b..6959095 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -100,6 +100,7 @@ RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/rele # Third party git fetches RUN git clone https://github.com/swagger-api/swagger-ui.git ${repos_dir}/swagger-ui +RUN cd ${repos_dir}/swagger-ui && git checkout tags/v2.2.9 RUN mkdir -p ${repos_dir}/storperf/storperf/resources/html/swagger RUN cp -r ${repos_dir}/swagger-ui/dist/* ${repos_dir}/storperf/storperf/resources/html/swagger RUN sed -i 's|url = "http://petstore.swagger.io/v2/swagger.json";|url = window.location.protocol+"//"+window.location.host+"/api/spec.json";|' ${repos_dir}/storperf/storperf/resources/html/swagger/index.html diff --git a/docs/release/release-notes/index.rst b/docs/release/release-notes/index.rst new file mode 100644 index 0000000..206e941 --- /dev/null +++ b/docs/release/release-notes/index.rst @@ -0,0 +1,15 @@ +.. _storperf-releasenotes: + +.. This work is licensed under a Creative Commons Attribution 4.0 International +.. License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) OPNFV, Ericsson AB and others. + +====================== +StorPerf Release Notes +====================== + +.. toctree:: + :maxdepth: 2 + + release-notes diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst new file mode 100644 index 0000000..0ec3cfb --- /dev/null +++ b/docs/release/release-notes/release-notes.rst @@ -0,0 +1,109 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 + +****** +Danube +****** + +This document provides the release notes for Danube of StorPerf. + +.. contents:: + :depth: 3 + :local: + +Version history +=============== + ++--------------------+--------------------+--------------------+--------------------+ +| **Date** | **Ver.** | **Author** | **Comment** | +| | | | | ++--------------------+--------------------+--------------------+--------------------+ +| 2017-05-04 | Danube 2.0 | Mark Beierl | | +| | | | | ++--------------------+--------------------+--------------------+--------------------+ +| 2017-03-30 | Danube 1.0 | Mark Beierl | | +| | | | | ++--------------------+--------------------+--------------------+--------------------+ + + +Summary +======= + +StorPerf is a standalone framework that uses OpenStack to measure Cinder volume +performance. If desired, it can push results to the OPNFV Test Results DB, or +the embedded Graphite web interface can be used to perform ad hoc queries. + +Release Data +============ + ++--------------------------------------+--------------------------------------+ +| **Project** | StorPerf | +| | | ++--------------------------------------+--------------------------------------+ +| **Repo/commit-ID** | storperf/danube.2.0 | +| | | ++--------------------------------------+--------------------------------------+ +| **Release designation** | Danube base release | +| | | ++--------------------------------------+--------------------------------------+ +| **Release date** | 2017-05-04 | +| | | ++--------------------------------------+--------------------------------------+ +| **Purpose of the delivery** | OPNFV Danube release 2.0 | +| | | ++--------------------------------------+--------------------------------------+ + +Version change +-------------- + +Module version changes +^^^^^^^^^^^^^^^^^^^^^^ + +No changes to any modules. + +Reason for version +------------------ + +Features additions +^^^^^^^^^^^^^^^^^^ + +None + +Bug Fixes +^^^^^^^^^ + +The following minor bugs have been fixed + +* STORPERF-111 +* STORPERF-123 +* STORPERF-124 + +See JIRA for full `change log <https://jira.opnfv.org/jira/secure/ReleaseNote.jspa?projectId=11002&version=10713>`_ + +Deliverables +------------ + +Software +^^^^^^^^ + +- `StorPerf Docker image <https://hub.docker.com/r/opnfv/storperf/tags>`_ (tag: danube.2.0) + +Documentation +^^^^^^^^^^^^^ + +- `User Guide <http://docs.opnfv.org/en/stable-danube/submodules/storperf/docs/testing/user/index.html>`_ + +Known Limitations, Issues and Workarounds +========================================= + +Limitations +----------- + + +Known issues +------------ +* STORPERF-56 Cannot delete stack if create failed + +Test Result +=========== + diff --git a/storperf/storperf_master.py b/storperf/storperf_master.py index 7acc510..440f5b3 100644 --- a/storperf/storperf_master.py +++ b/storperf/storperf_master.py @@ -11,20 +11,19 @@ from datetime import datetime import logging import os import socket +from storperf.db.configuration_db import ConfigurationDB +from storperf.db.job_db import JobDB +from storperf.test_executor import TestExecutor from threading import Thread from time import sleep from cinderclient import client as cinderclient +import heatclient.client as heatclient from keystoneauth1 import loading from keystoneauth1 import session import paramiko from scp import SCPClient -import heatclient.client as heatclient -from storperf.db.configuration_db import ConfigurationDB -from storperf.db.job_db import JobDB -from storperf.test_executor import TestExecutor - class ParameterError(Exception): """ """ @@ -387,13 +386,18 @@ class StorPerfMaster(object): "username": os.environ.get('OS_USERNAME'), "password": os.environ.get('OS_PASSWORD'), "auth_url": os.environ.get('OS_AUTH_URL'), - "project_name": os.environ.get('OS_PROJECT_NAME'), + "project_domain_name": + os.environ.get('OS_PROJECT_DOMAIN_NAME'), "project_id": os.environ.get('OS_PROJECT_ID'), + "project_name": os.environ.get('OS_PROJECT_NAME'), "tenant_name": os.environ.get('OS_TENANT_NAME'), "tenant_id": os.environ.get("OS_TENANT_ID"), - "user_domain_id": os.environ.get('OS_USER_DOMAIN_ID') + "user_domain_id": os.environ.get('OS_USER_DOMAIN_ID'), + "user_domain_name": os.environ.get('OS_USER_DOMAIN_NAME') } + self.logger.debug("Creds: %s" % creds) + loader = loading.get_plugin_loader('password') auth = loader.load_from_options(**creds) sess = session.Session(auth=auth) |