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>

3 files changed, 12 insertions, 16 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)