From 2f1f4e9a7ace6ecde8a64176f8f6434fbbedfb06 Mon Sep 17 00:00:00 2001
From: mbeierl <mark.beierl@dell.com>
Date: Mon, 6 Mar 2017 14:53:40 -0500
Subject: Remove deprecated fields

Removes the nowarm and nossd fields as it is better to be
explicit about running the '_warm_up' workload.

Change-Id: I54b67006abdc071f6fd190d6a5eefe026609c150
JIRA: STORPERF-108
Signed-off-by: mbeierl <mark.beierl@dell.com>
---
 storperf/storperf_master.py | 16 ----------------
 storperf/test_executor.py   |  8 --------
 2 files changed, 24 deletions(-)

(limited to 'storperf')

diff --git a/storperf/storperf_master.py b/storperf/storperf_master.py
index d0e0dc1..7acc510 100644
--- a/storperf/storperf_master.py
+++ b/storperf/storperf_master.py
@@ -166,14 +166,6 @@ class StorPerfMaster(object):
     def filename(self, value):
         self._test_executor.filename = value
 
-    @property
-    def precondition(self):
-        return self._test_executor.precondition
-
-    @precondition.setter
-    def precondition(self, value):
-        self._test_executor.precondition = value
-
     @property
     def deadline(self):
         return self._test_executor.deadline
@@ -182,14 +174,6 @@ class StorPerfMaster(object):
     def deadline(self, value):
         self._test_executor.deadline = value
 
-    @property
-    def warm_up(self):
-        return self._test_executor.warm
-
-    @warm_up.setter
-    def warm_up(self, value):
-        self._test_executor.warm = value
-
     @property
     def queue_depths(self):
         return self._test_executor.queue_depths
diff --git a/storperf/test_executor.py b/storperf/test_executor.py
index 6b6316c..2fadc81 100644
--- a/storperf/test_executor.py
+++ b/storperf/test_executor.py
@@ -36,9 +36,7 @@ class TestExecutor(object):
         self.logger = logging.getLogger(__name__)
         self.workload_modules = []
         self.filename = None
-        self.precondition = True
         self.deadline = None
-        self.warm = True
         self.metadata = {}
         self.start_time = None
         self.end_time = None
@@ -134,12 +132,6 @@ class TestExecutor(object):
         else:
             workloads = workloads.split(',')
 
-        if (self.warm is True):
-            workloads.insert(0, "_warm_up")
-
-        if (self.precondition is True):
-            workloads.insert(0, "_ssd_preconditioning")
-
         for workload in workloads:
             try:
                 workload_module = self.load_from_file("workloads/" +
-- 
cgit 1.2.3-korg