Update FIO version

Updates FIO to 2.99, and changes metric from 'lat' to
'lat_ns'.

Change-Id: Ib46cc2fe10c7b7577ee0eaa9cb4805e0dda4bde2
JIRA: STORPERF-197
Signed-off-by: mbeierl <mark.beierl@dell.com>

5 files changed, 27 insertions, 36 deletions

diff --git a/docker/storperf-master/Dockerfile b/docker/storperf-master/Dockerfile
index a70e21e..b19c12d 100644
--- a/docker/storperf-master/Dockerfile
+++ b/docker/storperf-master/Dockerfile
@@ -15,7 +15,7 @@
 #    $ docker build -t opnfv/storperf-master:tag .
 #
 
-FROM alpine:3.5 as fio-builder
+FROM alpine:3.5 as storperf-builder
 
 LABEL version="5.0" description="OPNFV Storperf Docker container"
 
@@ -24,7 +24,6 @@ ARG BRANCH=master
 ENV repos_dir /home/opnfv/repos
 
 RUN apk --no-cache add --update \
-    python-dev \
     git \
     alpine-sdk \
     linux-headers \
@@ -33,15 +32,12 @@ RUN apk --no-cache add --update \
     zlib-dev
 
 # Third party git fetches
-
 RUN git config --global http.sslVerify false
 RUN git clone http://git.kernel.dk/fio.git ${repos_dir}/fio
-RUN cd ${repos_dir}/fio && git checkout tags/fio-2.2.10
+RUN cd ${repos_dir}/fio && git checkout tags/fio-2.99
 RUN cd ${repos_dir}/fio && EXTFLAGS="-static" make install
 
-# StorPerf Master Builder
-
-FROM alpine:3.5 as storperf-builder
+# Build StorPerf
 
 RUN apk --no-cache add --update \
     libffi-dev \
@@ -68,7 +64,7 @@ RUN apk --no-cache add --update \
     bash
 
 COPY --from=storperf-builder /usr/lib/python2.7/site-packages /usr/lib/python2.7/site-packages
-COPY --from=fio-builder /usr/local/bin/fio /usr/local/bin/fio
+COPY --from=storperf-builder /usr/local/bin/fio /usr/local/bin/fio
 COPY . /storperf
 
 WORKDIR /storperf
diff --git a/docker/storperf-master/storperf/utilities/data_handler.py b/docker/storperf-master/storperf/utilities/data_handler.py
index 1da869c..9d20383 100644
--- a/docker/storperf-master/storperf/utilities/data_handler.py
+++ b/docker/storperf-master/storperf/utilities/data_handler.py
@@ -41,7 +41,7 @@ class DataHandler(object):
 
             steady_state = True
             metrics = {}
-            for metric in ('lat.mean', 'iops', 'bw'):
+            for metric in ('lat_ns.mean', 'iops', 'bw'):
                 metrics[metric] = {}
                 for io_type in ('read', 'write'):
                     metrics[metric][io_type] = {}
diff --git a/docker/storperf-master/tests/utilities_tests/data_handler_test.py b/docker/storperf-master/tests/utilities_tests/data_handler_test.py
index 6d57b0d..f514ae7 100644
--- a/docker/storperf-master/tests/utilities_tests/data_handler_test.py
+++ b/docker/storperf-master/tests/utilities_tests/data_handler_test.py
@@ -183,17 +183,17 @@ class DataHandlerTest(unittest.TestCase):
 
         self.assertEqual(expected_slope, self.metadata['report_data']
                          ['rw.queue-depth.8.block-size.8192']
-                         ['lat.mean']
+                         ['lat_ns.mean']
                          ['read']
                          ['slope'])
         self.assertEqual(expected_range, self.metadata['report_data']
                          ['rw.queue-depth.8.block-size.8192']
-                         ['lat.mean']
+                         ['lat_ns.mean']
                          ['read']
                          ['range'])
         self.assertEqual(expected_average, self.metadata['report_data']
                          ['rw.queue-depth.8.block-size.8192']
-                         ['lat.mean']
+                         ['lat_ns.mean']
                          ['read']
                          ['average'])
 
@@ -248,22 +248,22 @@ class DataHandlerTest(unittest.TestCase):
 
         self.assertEqual(expected_slope, self.metadata['report_data']
                          ['rw.queue-depth.8.block-size.8192']
-                         ['lat.mean']
+                         ['lat_ns.mean']
                          ['read']
                          ['slope'])
         self.assertEqual(expected_range, self.metadata['report_data']
                          ['rw.queue-depth.8.block-size.8192']
-                         ['lat.mean']
+                         ['lat_ns.mean']
                          ['read']
                          ['range'])
         self.assertEqual(expected_average, self.metadata['report_data']
                          ['rw.queue-depth.8.block-size.8192']
-                         ['lat.mean']
+                         ['lat_ns.mean']
                          ['read']
                          ['average'])
         self.assertEqual(report_data, self.metadata['report_data']
                          ['rw.queue-depth.8.block-size.8192']
-                         ['lat.mean']
+                         ['lat_ns.mean']
                          ['read']
                          ['series'])
         self.assertEqual(True, self._terminated)
diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index 7d66fc9..1aea8de 100644
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -12,17 +12,12 @@ This document provides the release notes for Danube 3.0 of StorPerf.
 Version history
 ---------------
 
+
 +--------------------+--------------------+--------------------+--------------------+
 | **Date**           | **Ver.**           | **Author**         | **Comment**        |
 |                    |                    |                    |                    |
 +--------------------+--------------------+--------------------+--------------------+
-| 2017-07-14         | Danube 3.0         | Mark Beierl        |                    |
-|                    |                    |                    |                    |
-+--------------------+--------------------+--------------------+--------------------+
-| 2017-05-04         | Danube 2.0         | Mark Beierl        |                    |
-|                    |                    |                    |                    |
-+--------------------+--------------------+--------------------+--------------------+
-| 2017-03-30         | Danube 1.0         | Mark Beierl        |                    |
+| 2017-10-06         | Euphrates 1.0      | Mark Beierl        |                    |
 |                    |                    |                    |                    |
 +--------------------+--------------------+--------------------+--------------------+
 
@@ -39,7 +34,10 @@ 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.
 
-This release supports Keystone v3 authentication
+This release changes to docker-compose framework and adds the StorPerf
+reporting module.  It also marks a change from microsecond (us) to nano-second
+precision for all reported latencies.  This is denoted by a change from
+lat.mean to lat_ns.mean for read and write metrics.
 
 Release Data
 ============
@@ -48,16 +46,16 @@ Release Data
 | **Project**                          | StorPerf                             |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Repo/commit-ID**                   | storperf/danube.3.0                  |
+| **Repo/commit-ID**                   | storperf/euphrates.1.0               |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 | **Release designation**              | Danube base release                  |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | 2017-07-14                           |
+| **Release date**                     | 2017-10-06                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | OPNFV Danube release 3.0             |
+| **Purpose of the delivery**          | OPNFV Euphrates release 1.0          |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
@@ -75,17 +73,14 @@ Reason for version
 Features additions
 ^^^^^^^^^^^^^^^^^^
 
-* STORPERF-139 - Expose maximum number of steady state samples as a parameter
+* STORPERF-125 - StorPerf container decomposition
+* STORPERF-141 - Create a series of graphs to support SNIA targers
 
 Bug Fixes
 ^^^^^^^^^
 
 The following minor bugs have been fixed
 
-* STORPERF-127 - Unable to communicate using v3 authentication due to missing domain.
-* STORPERF-128 - Daily Danube job uses latest tag from docker
-* STORPERF-153 - Profiling a file does not work
-* STORPERF-154 - PROJECT_DOMAIN_ID not recognized
 
 See JIRA for full `change log <https://jira.opnfv.org/jira/secure/ReleaseNote.jspa?projectId=11002&version=10714>`_
 
@@ -100,7 +95,7 @@ Software
 Documentation
 ^^^^^^^^^^^^^
 
-- `User Guide <http://docs.opnfv.org/en/stable-danube/submodules/storperf/docs/testing/user/index.html>`_
+- `User Guide <http://docs.opnfv.org/en/latest/submodules/storperf/docs/testing/user/index.html>`_
 
 Known Limitations, Issues and Workarounds
 =========================================
@@ -108,11 +103,11 @@ Known Limitations, Issues and Workarounds
 Limitations
 -----------
 
+* Does not work with a target OS that requires authentication instead of using init-cloud for generating the ssh key.
 
 Known issues
 ------------
 * STORPERF-56 - Cannot delete stack if create failed
-* STORPERF-180 - No details if stack create failed
 
 Test Result
 ===========
diff --git a/docs/testing/user/test-usage.rst b/docs/testing/user/test-usage.rst
index b13d815..3854e0a 100644
--- a/docs/testing/user/test-usage.rst
+++ b/docs/testing/user/test-usage.rst
@@ -218,10 +218,10 @@ This is a sample of a type=metrics call.
    {
      "rw.queue-depth.1.block-size.512.read.bw": 52.8,
      "rw.queue-depth.1.block-size.512.read.iops": 106.76199999999999,
-     "rw.queue-depth.1.block-size.512.read.lat.mean": 93.176,
+     "rw.queue-depth.1.block-size.512.read.lat_ns.mean": 93.176,
      "rw.queue-depth.1.block-size.512.write.bw": 22.5,
      "rw.queue-depth.1.block-size.512.write.iops": 45.760000000000005,
-     "rw.queue-depth.1.block-size.512.write.lat.mean": 21764.184999999998
+     "rw.queue-depth.1.block-size.512.write.lat_ns.mean": 21764.184999999998
    }
 
 Abort a Job