Move tests: unit/benchmark

* 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: I30eb4b0aafe0575d0cddbc946108291f21a98ed8
Jira: YARDSTICK-837
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

8 files changed, 0 insertions, 696 deletions

diff --git a/tests/unit/benchmark/scenarios/storage/__init__.py b/tests/unit/benchmark/scenarios/storage/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/unit/benchmark/scenarios/storage/__init__.py
+++ /dev/null
diff --git a/tests/unit/benchmark/scenarios/storage/fio_read_sample_output.json b/tests/unit/benchmark/scenarios/storage/fio_read_sample_output.json
deleted file mode 100644
index e9f642aba..000000000
--- a/tests/unit/benchmark/scenarios/storage/fio_read_sample_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{"fioversion": "fio-2.1.3","jobs": [{"jobname": "yardstick-fio","groupid": 0,"error": 0,"read": {"io_bytes": 2166860,"bw": 36113,"iops": 9028,"runtime": 60001,"slat": {"min": 7,"max": 1807,"mean": 10.49,"stddev": 3.00},"clat": {"min": 1,"max": 16902,"mean": 97.84,"stddev": 78.16,"percentile": {"1.000000": 84,"5.000000": 86,"10.000000": 87,"20.000000": 88,"30.000000": 89,"40.000000": 90,"50.000000": 91,"60.000000": 93,"70.000000": 98,"80.000000": 103,"90.000000": 111,"95.000000": 127,"99.000000": 161,"99.500000": 177,"99.900000": 215,"99.950000": 266,"99.990000": 4128,"0.00": 0,"0.00": 0,"0.00": 0}},"lat": {"min": 86,"max": 16912,"mean": 108.70,"stddev": 78.29},"bw_min": 0,"bw_max": 38128,"bw_agg": 35816.54,"bw_mean": 35816.54,"bw_dev": 3579.16},"write": {"io_bytes": 0,"bw": 0,"iops": 0,"runtime": 0,"slat": {"min": 0,"max": 0,"mean": 0.00,"stddev": 0.00},"clat": {"min": 0,"max": 0,"mean": 0.00,"stddev": 0.00,"percentile": {"1.000000": 0,"5.000000": 0,"10.000000": 0,"20.000000": 0,"30.000000": 0,"40.000000": 0,"50.000000": 0,"60.000000": 0,"70.000000": 0,"80.000000": 0,"90.000000": 0,"95.000000": 0,"99.000000": 0,"99.500000": 0,"99.900000": 0,"99.950000": 0,"99.990000": 0,"0.00": 0,"0.00": 0,"0.00": 0}},"lat": {"min": 0,"max": 0,"mean": 0.00,"stddev": 0.00},"bw_min": 0,"bw_max": 0,"bw_agg": 0.00,"bw_mean": 0.00,"bw_dev": 0.00},"trim": {"io_bytes": 0,"bw": 0,"iops": 0,"runtime": 0,"slat": {"min": 0,"max": 0,"mean": 0.00,"stddev": 0.00},"clat": {"min": 0,"max": 0,"mean": 0.00,"stddev": 0.00,"percentile": {"1.000000": 0,"5.000000": 0,"10.000000": 0,"20.000000": 0,"30.000000": 0,"40.000000": 0,"50.000000": 0,"60.000000": 0,"70.000000": 0,"80.000000": 0,"90.000000": 0,"95.000000": 0,"99.000000": 0,"99.500000": 0,"99.900000": 0,"99.950000": 0,"99.990000": 0,"0.00": 0,"0.00": 0,"0.00": 0}},"lat": {"min": 0,"max": 0,"mean": 0.00,"stddev": 0.00},"bw_min": 0,"bw_max": 0,"bw_agg": 0.00,"bw_mean": 0.00,"bw_dev": 0.00},"usr_cpu": 4.86,"sys_cpu": 19.38,"ctx": 632024,"majf": 0,"minf": 30,"iodepth_level": {"1": 116.58,"2": 0.00,"4": 0.00,"8": 0.00,"16": 0.00,"32": 0.00,">=64": 0.00},"latency_us": {"2": 0.01,"4": 0.01,"10": 0.00,"20": 0.00,"50": 0.01,"100": 72.60,"250": 27.34,"500": 0.04,"750": 0.01,"1000": 0.01},"latency_ms": {"2": 0.01,"4": 0.01,"10": 0.01,"20": 0.01,"50": 0.00,"100": 0.00,"250": 0.00,"500": 0.00,"750": 0.00,"1000": 0.00,"2000": 0.00,">=2000": 0.00}}],"disk_util": [{"name": "vda","read_ios": 631084,"write_ios": 212,"read_merges": 0,"write_merges": 232,"read_ticks": 57300,"write_ticks": 324,"in_queue": 57400,"util": 81.55}]}
diff --git a/tests/unit/benchmark/scenarios/storage/fio_rw_sample_output.json b/tests/unit/benchmark/scenarios/storage/fio_rw_sample_output.json
deleted file mode 100644
index 4c7501818..000000000
--- a/tests/unit/benchmark/scenarios/storage/fio_rw_sample_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{"jobs": [{"trim": {"io_bytes": 0, "slat": {"max": 0, "mean": 0.0, "stddev": 0.0, "min": 0}, "bw_max": 0, "bw_mean": 0.0, "iops": 0, "bw": 0, "lat": {"max": 0, "mean": 0.0, "stddev": 0.0, "min": 0}, "bw_agg": 0.0, "clat": {"max": 0, "mean": 0.0, "percentile": {"70.000000": 0, "5.000000": 0, "50.000000": 0, "99.990000": 0, "30.000000": 0, "10.000000": 0, "99.000000": 0, "0.00": 0, "90.000000": 0, "95.000000": 0, "60.000000": 0, "40.000000": 0, "20.000000": 0, "99.900000": 0, "99.950000": 0, "1.000000": 0, "99.500000": 0, "80.000000": 0}, "stddev": 0.0, "min": 0}, "runtime": 0, "bw_min": 0, "bw_dev": 0.0}, "latency_us": {"10": 0.01, "750": 0.03, "20": 0.0, "50": 0.02, "2": 0.01, "4": 0.01, "100": 0.75, "250": 88.37, "500": 10.72, "1000": 0.01}, "latency_ms": {"10": 0.01, "750": 0.0, "20": 0.01, ">=2000": 0.0, "50": 0.01, "2000": 0.0, "2": 0.07, "4": 0.01, "100": 0.0, "250": 0.01, "500": 0.0, "1000": 0.01}, "read": {"io_bytes": 839056, "slat": {"max": 1990, "mean": 18.14, "stddev": 15.4, "min": 0}, "bw_max": 10328, "bw_mean": 8721.27, "iops": 20972, "bw": 83888, "lat": {"max": 776676, "mean": 236.8, "stddev": 4668.12, "min": 45}, "bw_agg": 8721.27, "clat": {"max": 776663, "mean": 217.79, "percentile": {"70.000000": 199, "5.000000": 119, "50.000000": 175, "99.990000": 15168, "30.000000": 155, "10.000000": 131, "99.000000": 342, "0.00": 0, "90.000000": 247, "95.000000": 278, "60.000000": 185, "40.000000": 165, "20.000000": 145, "99.900000": 820, "99.950000": 1272, "1.000000": 96, "99.500000": 370, "80.000000": 217}, "stddev": 4667.79, "min": 0}, "runtime": 10002, "bw_min": 4, "bw_dev": 2178.08}, "majf": 0, "ctx": 490590, "minf": 87, "jobname": "yardstick-fio", "write": {"io_bytes": 841992, "slat": {"max": 2594, "mean": 19.78, "stddev": 16.25, "min": 0}, "bw_max": 10472, "bw_mean": 8464.0, "iops": 21045, "bw": 84182, "lat": {"max": 776709, "mean": 233.55, "stddev": 3115.46, "min": 64}, "bw_agg": 8464.0, "clat": {"max": 776685, "mean": 212.87, "percentile": {"70.000000": 211, "5.000000": 135, "50.000000": 187, "99.990000": 3536, "30.000000": 169, "10.000000": 145, "99.000000": 358, "0.00": 0, "90.000000": 258, "95.000000": 290, "60.000000": 197, "40.000000": 177, "20.000000": 159, "99.900000": 756, "99.950000": 1288, "1.000000": 114, "99.500000": 382, "80.000000": 229}, "stddev": 3115.23, "min": 0}, "runtime": 10002, "bw_min": 4, "bw_dev": 2584.23}, "iodepth_level": {"16": 0.0, "32": 0.0, "1": 111.92, "2": 0.0, "4": 0.0, ">=64": 0.0, "8": 0.0}, "usr_cp": 2.87, "error": 0, "sys_cp": 12.37, "groupid": 0}], "fio version": "fio-2.1.3", "disk_util": [{"aggr_write_ticks": 42020, "read_merges": 0, "name": "dm-0", "write_ios": 233547, "aggr_write_ios": 235129, "aggr_read_ticks": 42576, "read_ios": 233492, "util": 97.22, "read_ticks": 42096, "aggr_write_merge": 0, "write_merges": 0, "aggr_in_queue": 84524, "aggr_read_ios": 235224, "aggr_util": 96.96, "aggr_read_merges": 0, "in_queue": 83732, "write_ticks": 41468}, {"read_merges": 0, "name": "vda", "write_ios": 235129, "read_ios": 235224, "util": 96.96, "read_ticks": 42576, "write_merges": 0, "in_queue": 84524, "write_ticks": 42020}]}
diff --git a/tests/unit/benchmark/scenarios/storage/fio_write_sample_output.json b/tests/unit/benchmark/scenarios/storage/fio_write_sample_output.json
deleted file mode 100644
index 7c760e8bc..000000000
--- a/tests/unit/benchmark/scenarios/storage/fio_write_sample_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{"fioversion": "fio-2.1.3","jobs": [{"jobname": "yardstick-fio","groupid": 0,"error": 0,"read": {"io_bytes": 0,"bw": 0,"iops": 0,"runtime": 0,"slat": {"min": 0,"max": 0,"mean": 0.00,"stddev": 0.00},"clat": {"min": 0,"max": 0,"mean": 0.00,"stddev": 0.00,"percentile": {"1.000000": 0,"5.000000": 0,"10.000000": 0,"20.000000": 0,"30.000000": 0,"40.000000": 0,"50.000000": 0,"60.000000": 0,"70.000000": 0,"80.000000": 0,"90.000000": 0,"95.000000": 0,"99.000000": 0,"99.500000": 0,"99.900000": 0,"99.950000": 0,"99.990000": 0,"0.00": 0,"0.00": 0,"0.00": 0}},"lat": {"min": 0,"max": 0,"mean": 0.00,"stddev": 0.00},"bw_min": 0,"bw_max": 0,"bw_agg": 0.00,"bw_mean": 0.00,"bw_dev": 0.00},"write": {"io_bytes": 2106508,"bw": 35107,"iops": 8776,"runtime": 60001,"slat": {"min": 8,"max": 5166,"mean": 11.83,"stddev": 7.05},"clat": {"min": 1,"max": 23472,"mean": 99.54,"stddev": 44.23,"percentile": {"1.000000": 85,"5.000000": 87,"10.000000": 88,"20.000000": 89,"30.000000": 90,"40.000000": 91,"50.000000": 93,"60.000000": 99,"70.000000": 104,"80.000000": 107,"90.000000": 113,"95.000000": 127,"99.000000": 161,"99.500000": 179,"99.900000": 231,"99.950000": 286,"99.990000": 628,"0.00": 0,"0.00": 0,"0.00": 0}},"lat": {"min": 87,"max": 23486,"mean": 111.74,"stddev": 45.61},"bw_min": 0,"bw_max": 37288,"bw_agg": 34839.53,"bw_mean": 34839.53,"bw_dev": 3387.37},"trim": {"io_bytes": 0,"bw": 0,"iops": 0,"runtime": 0,"slat": {"min": 0,"max": 0,"mean": 0.00,"stddev": 0.00},"clat": {"min": 0,"max": 0,"mean": 0.00,"stddev": 0.00,"percentile": {"1.000000": 0,"5.000000": 0,"10.000000": 0,"20.000000": 0,"30.000000": 0,"40.000000": 0,"50.000000": 0,"60.000000": 0,"70.000000": 0,"80.000000": 0,"90.000000": 0,"95.000000": 0,"99.000000": 0,"99.500000": 0,"99.900000": 0,"99.950000": 0,"99.990000": 0,"0.00": 0,"0.00": 0,"0.00": 0}},"lat": {"min": 0,"max": 0,"mean": 0.00,"stddev": 0.00},"bw_min": 0,"bw_max": 0,"bw_agg": 0.00,"bw_mean": 0.00,"bw_dev": 0.00},"usr_cpu": 5.25,"sys_cpu": 19.72,"ctx": 616160,"majf": 0,"minf": 27,"iodepth_level": {"1": 116.90,"2": 0.00,"4": 0.00,"8": 0.00,"16": 0.00,"32": 0.00,">=64": 0.00},"latency_us": {"2": 0.01,"4": 0.01,"10": 0.00,"20": 0.00,"50": 0.01,"100": 60.74,"250": 39.18,"500": 0.06,"750": 0.01,"1000": 0.01},"latency_ms": {"2": 0.01,"4": 0.01,"10": 0.01,"20": 0.00,"50": 0.01,"100": 0.00,"250": 0.00,"500": 0.00,"750": 0.00,"1000": 0.00,"2000": 0.00,">=2000": 0.00}}],"disk_util": [{"name": "vda","read_ios": 0,"write_ios": 615418,"read_merges": 0,"write_merges": 231,"read_ticks": 0,"write_ticks": 58284,"in_queue": 58024,"util": 82.45}]}
diff --git a/tests/unit/benchmark/scenarios/storage/test_bonnie.py b/tests/unit/benchmark/scenarios/storage/test_bonnie.py
deleted file mode 100644
index b3524e9a7..000000000
--- a/tests/unit/benchmark/scenarios/storage/test_bonnie.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# Unittest for yardstick.benchmark.scenarios.storage.bonnie.Bonnie
-
-from __future__ import absolute_import
-
-import unittest
-
-import mock
-
-from yardstick.common import utils
-from yardstick.benchmark.scenarios.storage import bonnie
-
-
-class BonnieTestCase(unittest.TestCase):
-
-    def setUp(self):
-        self.ctx = {
-            'host': {
-                'ip': '172.16.0.137',
-                'user': 'root',
-                'key_filename': "mykey.key"
-            }
-        }
-
-        self.result = {}
-
-    @mock.patch('yardstick.benchmark.scenarios.storage.bonnie.ssh')
-    def test_bonnie_successful_setup(self, mock_ssh):
-
-        options = {
-            "file_size": "1024",
-            "ram_size": "512",
-            "test_dir": "/tmp",
-            "concurrency": "1",
-            "test_user": "root"
-        }
-        args = {"options": options}
-        b = bonnie.Bonnie(args, self.ctx)
-        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
-
-        b.setup()
-        self.assertIsNotNone(b.client)
-        self.assertTrue(b.setup_done, True)
-
-    @mock.patch('yardstick.benchmark.scenarios.storage.bonnie.ssh')
-    def test_bonnie_unsuccessful_script_error(self, mock_ssh):
-        options = {
-            "file_size": "1024",
-            "ram_size": "512",
-            "test_dir": "/tmp",
-            "concurrency": "1",
-            "test_user": "root"
-        }
-        args = {"options": options}
-        b = bonnie.Bonnie(args, self.ctx)
-
-        mock_ssh.SSH.from_node().execute.return_value = (1, '', 'FOOBAR')
-        self.assertRaises(RuntimeError, b.run, self.result)
-
-def main():
-    unittest.main()
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/unit/benchmark/scenarios/storage/test_fio.py b/tests/unit/benchmark/scenarios/storage/test_fio.py
deleted file mode 100644
index 0cffea224..000000000
--- a/tests/unit/benchmark/scenarios/storage/test_fio.py
+++ /dev/null
@@ -1,273 +0,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# Unittest for yardstick.benchmark.scenarios.storage.fio.Fio
-
-from __future__ import absolute_import
-
-import os
-import unittest
-
-import mock
-from oslo_serialization import jsonutils
-
-from yardstick.benchmark.scenarios.storage import fio
-
-
-@mock.patch('yardstick.benchmark.scenarios.storage.fio.ssh')
-class FioTestCase(unittest.TestCase):
-
-    def setUp(self):
-        self.ctx = {
-            'host': {
-                'ip': '172.16.0.137',
-                'user': 'cirros',
-                'key_filename': 'mykey.key'
-            }
-        }
-        self.sample_output = {
-            'read': 'fio_read_sample_output.json',
-            'write': 'fio_write_sample_output.json',
-            'rw': 'fio_rw_sample_output.json'
-        }
-
-    def test_fio_successful_setup(self, mock_ssh):
-
-        options = {
-            'filename': '/home/ubuntu/data.raw',
-            'bs': '4k',
-            'rw': 'rw',
-            'ramp_time': 10
-        }
-        args = {'options': options}
-        p = fio.Fio(args, self.ctx)
-        p.setup()
-
-        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
-        self.assertIsNotNone(p.client)
-        self.assertTrue(p.setup_done)
-
-    def test_fio_job_file_successful_setup(self, mock_ssh):
-
-        options = {
-            'job_file': 'job_file.ini',
-            'directory': '/FIO_Test'
-        }
-        args = {'options': options}
-        p = fio.Fio(args, self.ctx)
-        p.setup()
-
-        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
-        self.assertIsNotNone(p.client)
-        self.assertTrue(p.setup_done)
-
-    def test_fio_successful_no_sla(self, mock_ssh):
-
-        options = {
-            'filename': '/home/ubuntu/data.raw',
-            'bs': '4k',
-            'rw': 'rw',
-            'ramp_time': 10
-        }
-        args = {'options': options}
-        p = fio.Fio(args, self.ctx)
-        result = {}
-
-        p.client = mock_ssh.SSH.from_node()
-
-        sample_output = self._read_sample_output(self.sample_output['rw'])
-        mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
-
-        p.run(result)
-
-        expected_result = '{"read_bw": 83888, "read_iops": 20972,' \
-            '"read_lat": 236.8, "write_bw": 84182, "write_iops": 21045,'\
-            '"write_lat": 233.55}'
-        expected_result = jsonutils.loads(expected_result)
-        self.assertEqual(result, expected_result)
-
-    def test_fio_successful_read_no_sla(self, mock_ssh):
-
-        options = {
-            'filename': '/home/ubuntu/data.raw',
-            'bs': '4k',
-            'rw': "read",
-            'ramp_time': 10
-        }
-        args = {'options': options}
-        p = fio.Fio(args, self.ctx)
-        result = {}
-
-        p.client = mock_ssh.SSH.from_node()
-
-        sample_output = self._read_sample_output(self.sample_output['read'])
-        mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
-
-        p.run(result)
-
-        expected_result = '{"read_bw": 36113, "read_iops": 9028,' \
-            '"read_lat": 108.7}'
-        expected_result = jsonutils.loads(expected_result)
-        self.assertEqual(result, expected_result)
-
-    def test_fio_successful_write_no_sla(self, mock_ssh):
-
-        options = {
-            'filename': '/home/ubuntu/data.raw',
-            'bs': '4k',
-            'rw': 'write',
-            'ramp_time': 10
-        }
-        args = {'options': options}
-        p = fio.Fio(args, self.ctx)
-        result = {}
-
-        p.client = mock_ssh.SSH.from_node()
-
-        sample_output = self._read_sample_output(self.sample_output['write'])
-        mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
-
-        p.run(result)
-
-        expected_result = '{"write_bw": 35107, "write_iops": 8776,'\
-            '"write_lat": 111.74}'
-        expected_result = jsonutils.loads(expected_result)
-        self.assertEqual(result, expected_result)
-
-    def test_fio_successful_lat_sla(self, mock_ssh):
-
-        options = {
-            'filename': '/home/ubuntu/data.raw',
-            'bs': '4k',
-            'rw': 'rw',
-            'ramp_time': 10
-        }
-        args = {
-            'options': options,
-            'sla': {'write_lat': 300.1}
-        }
-        p = fio.Fio(args, self.ctx)
-        result = {}
-
-        p.client = mock_ssh.SSH.from_node()
-
-        sample_output = self._read_sample_output(self.sample_output['rw'])
-        mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
-
-        p.run(result)
-
-        expected_result = '{"read_bw": 83888, "read_iops": 20972,' \
-            '"read_lat": 236.8, "write_bw": 84182, "write_iops": 21045,'\
-            '"write_lat": 233.55}'
-        expected_result = jsonutils.loads(expected_result)
-        self.assertEqual(result, expected_result)
-
-    def test_fio_unsuccessful_lat_sla(self, mock_ssh):
-
-        options = {
-            'filename': '/home/ubuntu/data.raw',
-            'bs': '4k',
-            'rw': 'rw',
-            'ramp_time': 10
-        }
-        args = {
-            'options': options,
-            'sla': {'write_lat': 200.1}
-        }
-        p = fio.Fio(args, self.ctx)
-        result = {}
-
-        p.client = mock_ssh.SSH.from_node()
-
-        sample_output = self._read_sample_output(self.sample_output['rw'])
-        mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
-        self.assertRaises(AssertionError, p.run, result)
-
-    def test_fio_successful_bw_iops_sla(self, mock_ssh):
-
-        options = {
-            'filename': '/home/ubuntu/data.raw',
-            'bs': '4k',
-            'rw': 'rw',
-            'ramp_time': 10
-        }
-        args = {
-            'options': options,
-            'sla': {'read_iops': 20000}
-        }
-        p = fio.Fio(args, self.ctx)
-        result = {}
-
-        p.client = mock_ssh.SSH.from_node()
-
-        sample_output = self._read_sample_output(self.sample_output['rw'])
-        mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
-
-        p.run(result)
-
-        expected_result = '{"read_bw": 83888, "read_iops": 20972,' \
-            '"read_lat": 236.8, "write_bw": 84182, "write_iops": 21045,'\
-            '"write_lat": 233.55}'
-        expected_result = jsonutils.loads(expected_result)
-        self.assertEqual(result, expected_result)
-
-    def test_fio_unsuccessful_bw_iops_sla(self, mock_ssh):
-
-        options = {
-            'filename': '/home/ubuntu/data.raw',
-            'bs': '4k',
-            'rw': 'rw',
-            'ramp_time': 10
-        }
-        args = {
-            'options': options,
-            'sla': {'read_iops': 30000}
-        }
-        p = fio.Fio(args, self.ctx)
-        result = {}
-
-        p.client = mock_ssh.SSH.from_node()
-
-        sample_output = self._read_sample_output(self.sample_output['rw'])
-        mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
-        self.assertRaises(AssertionError, p.run, result)
-
-    def test_fio_unsuccessful_script_error(self, mock_ssh):
-
-        options = {
-            'filename': '/home/ubuntu/data.raw',
-            'bs': '4k',
-            'rw': 'rw',
-            'ramp_time': 10
-        }
-        args = {'options': options}
-        p = fio.Fio(args, self.ctx)
-        result = {}
-
-        p.client = mock_ssh.SSH.from_node()
-
-        mock_ssh.SSH.from_node().execute.return_value = (1, '', 'FOOBAR')
-        self.assertRaises(RuntimeError, p.run, result)
-
-    def _read_sample_output(self, file_name):
-        curr_path = os.path.dirname(os.path.abspath(__file__))
-        output = os.path.join(curr_path, file_name)
-        with open(output) as f:
-            sample_output = f.read()
-        return sample_output
-
-
-def main():
-    unittest.main()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/unit/benchmark/scenarios/storage/test_storagecapacity.py b/tests/unit/benchmark/scenarios/storage/test_storagecapacity.py
deleted file mode 100644
index 095674f72..000000000
--- a/tests/unit/benchmark/scenarios/storage/test_storagecapacity.py
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# Unittest for
-# yardstick.benchmark.scenarios.storage.storagecapacity.StorageCapacity
-
-from __future__ import absolute_import
-
-import unittest
-
-import mock
-from oslo_serialization import jsonutils
-
-from yardstick.benchmark.scenarios.storage import storagecapacity
-
-DISK_SIZE_SAMPLE_OUTPUT = \
-    '{"Numberf of devides": "2", "Total disk size in bytes": "1024000000"}'
-BLOCK_SIZE_SAMPLE_OUTPUT = '{"/dev/sda": 1024, "/dev/sdb": 4096}'
-DISK_UTIL_RAW_OUTPUT = "vda 10.00\nvda 0.00"
-DISK_UTIL_SAMPLE_OUTPUT = \
-    '{"vda": {"avg_util": 5.0, "max_util": 10.0, "min_util": 0.0}}'
-
-
-@mock.patch('yardstick.benchmark.scenarios.storage.storagecapacity.ssh')
-class StorageCapacityTestCase(unittest.TestCase):
-
-    def setUp(self):
-        self.scn = {
-            "options": {
-                'test_type': 'disk_size'
-            }
-        }
-        self.ctx = {
-            "host": {
-                'ip': '172.16.0.137',
-                'user': 'cirros',
-                'password': "root"
-            }
-        }
-        self.result = {}
-
-    def test_capacity_successful_setup(self, mock_ssh):
-        c = storagecapacity.StorageCapacity(self.scn, self.ctx)
-
-        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
-        c.setup()
-        self.assertIsNotNone(c.client)
-        self.assertTrue(c.setup_done)
-
-    def test_capacity_disk_size_successful(self, mock_ssh):
-        c = storagecapacity.StorageCapacity(self.scn, self.ctx)
-
-        mock_ssh.SSH.from_node().execute.return_value = (0, DISK_SIZE_SAMPLE_OUTPUT, '')
-        c.run(self.result)
-        expected_result = jsonutils.loads(
-            DISK_SIZE_SAMPLE_OUTPUT)
-        self.assertEqual(self.result, expected_result)
-
-    def test_capacity_block_size_successful(self, mock_ssh):
-        args = {
-            "options": {
-                'test_type': 'block_size'
-            }
-        }
-        c = storagecapacity.StorageCapacity(args, self.ctx)
-
-        mock_ssh.SSH.from_node().execute.return_value = (0, BLOCK_SIZE_SAMPLE_OUTPUT, '')
-        c.run(self.result)
-        expected_result = jsonutils.loads(
-            BLOCK_SIZE_SAMPLE_OUTPUT)
-        self.assertEqual(self.result, expected_result)
-
-    def test_capacity_disk_utilization_successful(self, mock_ssh):
-        args = {
-            "options": {
-                'test_type': 'disk_utilization',
-                'interval': 1,
-                'count': 2
-            }
-        }
-        c = storagecapacity.StorageCapacity(args, self.ctx)
-
-        mock_ssh.SSH.from_node().execute.return_value = (0, DISK_UTIL_RAW_OUTPUT, '')
-        c.run(self.result)
-        expected_result = jsonutils.loads(
-            DISK_UTIL_SAMPLE_OUTPUT)
-        self.assertEqual(self.result, expected_result)
-
-    def test_capacity_unsuccessful_script_error(self, mock_ssh):
-        c = storagecapacity.StorageCapacity(self.scn, self.ctx)
-
-        mock_ssh.SSH.from_node().execute.return_value = (1, '', 'FOOBAR')
-        self.assertRaises(RuntimeError, c.run, self.result)
-
-
-def main():
-    unittest.main()
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/unit/benchmark/scenarios/storage/test_storperf.py b/tests/unit/benchmark/scenarios/storage/test_storperf.py
deleted file mode 100644
index 7b16bb37d..000000000
--- a/tests/unit/benchmark/scenarios/storage/test_storperf.py
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-# Copyright (c) 2016 Huawei Technologies Co.,Ltd.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# Unittest for yardstick.benchmark.scenarios.storage.storperf.StorPerf
-
-from __future__ import absolute_import
-
-import unittest
-
-import mock
-from oslo_serialization import jsonutils
-
-from yardstick.benchmark.scenarios.storage import storperf
-
-
-def mocked_requests_config_post(*args, **kwargs):
-    class MockResponseConfigPost:
-
-        def __init__(self, json_data, status_code):
-            self.content = json_data
-            self.status_code = status_code
-
-    return MockResponseConfigPost(
-        '{"stack_id": "dac27db1-3502-4300-b301-91c64e6a1622",'
-        '"stack_created": "false"}',
-        200)
-
-
-def mocked_requests_config_get(*args, **kwargs):
-    class MockResponseConfigGet:
-
-        def __init__(self, json_data, status_code):
-            self.content = json_data
-            self.status_code = status_code
-
-    return MockResponseConfigGet(
-        '{"stack_id": "dac27db1-3502-4300-b301-91c64e6a1622",'
-        '"stack_created": "true"}',
-        200)
-
-
-def mocked_requests_job_get(*args, **kwargs):
-    class MockResponseJobGet:
-
-        def __init__(self, json_data, status_code):
-            self.content = json_data
-            self.status_code = status_code
-
-    return MockResponseJobGet(
-        '{"Status": "Completed",\
-         "_ssd_preconditioning.queue-depth.8.block-size.16384.duration": 6}',
-        200)
-
-
-def mocked_requests_job_post(*args, **kwargs):
-    class MockResponseJobPost:
-
-        def __init__(self, json_data, status_code):
-            self.content = json_data
-            self.status_code = status_code
-
-    return MockResponseJobPost('{"job_id": \
-                                 "d46bfb8c-36f4-4a40-813b-c4b4a437f728"}', 200)
-
-
-def mocked_requests_job_delete(*args, **kwargs):
-    class MockResponseJobDelete:
-
-        def __init__(self, json_data, status_code):
-            self.content = json_data
-            self.status_code = status_code
-
-    return MockResponseJobDelete('{}', 200)
-
-
-def mocked_requests_delete(*args, **kwargs):
-    class MockResponseDelete:
-
-        def __init__(self, json_data, status_code):
-            self.json_data = json_data
-            self.status_code = status_code
-
-    return MockResponseDelete('{}', 200)
-
-
-def mocked_requests_delete_failed(*args, **kwargs):
-    class MockResponseDeleteFailed:
-
-        def __init__(self, json_data, status_code):
-            self.json_data = json_data
-            self.status_code = status_code
-
-    if args[0] == "http://172.16.0.137:5000/api/v1.0/configurations":
-        return MockResponseDeleteFailed('{"message": "Teardown failed"}', 400)
-
-    return MockResponseDeleteFailed('{}', 404)
-
-
-class StorPerfTestCase(unittest.TestCase):
-
-    def setUp(self):
-        self.ctx = {
-            'host': {
-                'ip': '172.16.0.137',
-                'user': 'cirros',
-                'key_filename': "mykey.key"
-            }
-        }
-
-        self.result = {}
-
-    @mock.patch('yardstick.benchmark.scenarios.storage.storperf.requests.post',
-                side_effect=mocked_requests_config_post)
-    @mock.patch('yardstick.benchmark.scenarios.storage.storperf.requests.get',
-                side_effect=mocked_requests_config_get)
-    def test_successful_setup(self, mock_post, mock_get):
-        options = {
-            "agent_count": 8,
-            "public_network": 'ext-net',
-            "volume_size": 10,
-            "block_sizes": 4096,
-            "queue_depths": 4,
-            "workload": "rs",
-            "StorPerf_ip": "192.168.23.2",
-            "query_interval": 0,
-            "timeout": 60
-        }
-
-        args = {
-            "options": options
-        }
-
-        s = storperf.StorPerf(args, self.ctx)
-
-        s.setup()
-
-        self.assertTrue(s.setup_done)
-
-    @mock.patch('yardstick.benchmark.scenarios.storage.storperf.requests.post',
-                side_effect=mocked_requests_job_post)
-    @mock.patch('yardstick.benchmark.scenarios.storage.storperf.requests.get',
-                side_effect=mocked_requests_job_get)
-    @mock.patch(
-        'yardstick.benchmark.scenarios.storage.storperf.requests.delete',
-        side_effect=mocked_requests_job_delete)
-    def test_successful_run(self, mock_post, mock_get, mock_delete):
-        options = {
-            "agent_count": 8,
-            "public_network": 'ext-net',
-            "volume_size": 10,
-            "block_sizes": 4096,
-            "queue_depths": 4,
-            "workload": "rs",
-            "StorPerf_ip": "192.168.23.2",
-            "query_interval": 0,
-            "timeout": 60
-        }
-
-        args = {
-            "options": options
-        }
-
-        s = storperf.StorPerf(args, self.ctx)
-        s.setup_done = True
-
-        sample_output = '{"Status": "Completed",\
-         "_ssd_preconditioning.queue-depth.8.block-size.16384.duration": 6}'
-
-        expected_result = jsonutils.loads(sample_output)
-
-        s.run(self.result)
-
-        self.assertEqual(self.result, expected_result)
-
-    @mock.patch(
-        'yardstick.benchmark.scenarios.storage.storperf.requests.delete',
-        side_effect=mocked_requests_delete)
-    def test_successful_teardown(self, mock_delete):
-        options = {
-            "agent_count": 8,
-            "public_network": 'ext-net',
-            "volume_size": 10,
-            "block_sizes": 4096,
-            "queue_depths": 4,
-            "workload": "rs",
-            "StorPerf_ip": "192.168.23.2",
-            "query_interval": 10,
-            "timeout": 60
-        }
-
-        args = {
-            "options": options
-        }
-
-        s = storperf.StorPerf(args, self.ctx)
-
-        s.teardown()
-
-        self.assertFalse(s.setup_done)
-
-    @mock.patch(
-        'yardstick.benchmark.scenarios.storage.storperf.requests.delete',
-        side_effect=mocked_requests_delete_failed)
-    def test_failed_teardown(self, mock_delete):
-        options = {
-            "agent_count": 8,
-            "public_network": 'ext-net',
-            "volume_size": 10,
-            "block_sizes": 4096,
-            "queue_depths": 4,
-            "workload": "rs",
-            "StorPerf_ip": "192.168.23.2",
-            "query_interval": 10,
-            "timeout": 60
-        }
-
-        args = {
-            "options": options
-        }
-
-        s = storperf.StorPerf(args, self.ctx)
-
-        self.assertRaises(AssertionError, s.teardown(), self.result)
-
-
-def main():
-    unittest.main()
-
-if __name__ == '__main__':
-    main()