Changeset 62039 in vbox for trunk/src/VBox/ValidationKit/tests/storage

Timestamp:

Jul 6, 2016 9:42:47 AM (8 years ago)

Author:

vboxsync

Message:

ValidationKit/tests/storage: A bit more...

File:

• trunk/src/VBox/ValidationKit/tests/storage/tdStorageBenchmark1.py (modified) (6 diffs)

trunk/src/VBox/ValidationKit/tests/storage/tdStorageBenchmark1.py

@@ -45 +45 @@
 # Validation Kit imports.
 from common     import constants;
+from common     import utils;
 from testdriver import reporter;
 from testdriver import base;
@@ -378 +379 @@
     #
 
-    def test1Benchmark(self, sBenchmark, oTxsSession = None):
+    def test1Benchmark(self, sTargetOs, sBenchmark, oTxsSession = None):
         """
         Runs the given benchmark on the test host.
@@ -384 +385 @@
         lstBinaryPaths = ['/bin', '/sbin', '/usr/bin', '/usr/sbin', \
                           '/opt/csw/bin', '/usr/ccs/bin', '/usr/sfw/bin'];
-
         oExecutor = remoteexecutor.RemoteExecutor(oTxsSession, lstBinaryPaths, self.sScratchPath);
-        oTst = None;
-        if sBenchmark == 'iozone':
-            oTst = IozoneTest(oExecutor);
-        elif sBenchmark == 'fio':
-            oTst = FioTest(oExecutor); # pylint: disable=R0204
-
-        if oTst is not None:
-            reporter.testStart(sBenchmark);
-
-            # Create a basic pool with the default configuration.
-            oStorCfg = storagecfg.StorageCfg(oExecutor, socket.gethostname().lower());
-            fRc, sPoolId = oStorCfg.createStoragePool(oExecutor);
+
+        # Create a basic pool with the default configuration.
+        oStorCfg = storagecfg.StorageCfg(oExecutor, socket.gethostname().lower());
+        fRc, sPoolId = oStorCfg.createStoragePool(oExecutor);
+        if fRc:
+            fRc, sMountpoint = oStorCfg.createVolume(sPoolId);
             if fRc:
-                fRc, sMountpoint = oStorCfg.createVolume(sPoolId);
-                _ = sMountpoint;
-                if fRc:
-                    oTst = IozoneTest(oExecutor);
+
+                # Create a basic config
+                dCfg = {
+                    'RecordSize':  '64k',
+                    'TestsetSize': '20g',
+                    'QueueDepth':  '32',
+                    'FilePath': sMountpoint,
+                    'TargetOs': sTargetOs
+                };
+
+                oTst = None;
+                if sBenchmark == 'iozone':
+                    oTst = IozoneTest(oExecutor, dCfg);
+                elif sBenchmark == 'fio':
+                    oTst = FioTest(oExecutor, dCfg); # pylint: disable=R0204
+
+                if oTst is not None:
+                    reporter.testStart(sBenchmark);
                     fRc = oTst.prepare();
                     if fRc:
@@ -414 +422 @@
 
                     oTst.cleanup();
+                    reporter.testDone();
             else:
                 reporter.testFailure('Creating a storage pool on the target failed');
 
             oStorCfg.cleanup();
-            reporter.testDone();
-
-        return fRc;
-
-    def test1Benchmarks(self, oTxsSession = None):
+
+        return fRc;
+
+    def test1Benchmarks(self, sTargetOs, oTxsSession = None):
         """
         Runs all the configured benchmarks on the target.
@@ -428 +436 @@
         reporter.testStart('Host');
         for sTest in self.asTests:
-            self.test1Benchmark(sTest, oTxsSession);
+            self.test1Benchmark(sTargetOs, sTest, oTxsSession);
         reporter.testDone();
 
@@ -439 +447 @@
         fRc = True;
         if self.fTestHost:
-            fRc = self.test1Benchmarks()
+            fRc = self.test1Benchmarks(utils.getHostOs());
 
         # Loop thru the test VMs.