Changeset 68703 in vbox for trunk

Timestamp:

Sep 7, 2017 5:57:15 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit/tdStorageBenchmark: Add option to test with encryption configured

File:

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

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

@@ -50 +50 @@
 from testdriver import vbox;
 from testdriver import vboxcon;
+from testdriver import vboxwrappers;
 
 import remoteexecutor;
@@ -455 +456 @@
         'no-hostiocache' : 'HostCacheOff'
     };
+
+    # Password ID for encryption.
+    ksPwId = 'EncPwId';
 
     # Array indexes for the test configs.
@@ -503 +507 @@
         self.fUseRamDiskDef          = False;
         self.fUseRamDisk             = self.fUseRamDiskDef;
+        self.fEncryptDiskDef         = False;
+        self.fEncryptDisk            = self.fEncryptDiskDef;
+        self.sEncryptPwDef           = 'TestTestTest';
+        self.sEncryptPw              = self.sEncryptPwDef;
+        self.sEncryptAlgoDef         = 'AES-XTS256-PLAIN64';
+        self.sEncryptAlgo            = self.sEncryptAlgoDef;
 
     #
@@ -557 +567 @@
         reporter.log('  --use-ramdisk');
         reporter.log('      Default: %s' % (self.fUseRamDiskDef));
+        reporter.log('  --encrypt-disk');
+        reporter.log('      Default: %s' % (self.fEncryptDiskDef));
+        reporter.log('  --encrypt-password');
+        reporter.log('      Default: %s' % (self.sEncryptPwDef));
+        reporter.log('  --encrypt-algorithm');
+        reporter.log('      Default: %s' % (self.sEncryptAlgoDef));
         return rc;
 
@@ -642 +658 @@
             self.fReportBenchmarkResults = False;
         elif asArgs[iArg] == '--io-log-path':
+            iArg += 1;
             if iArg >= len(asArgs): raise base.InvalidOption('The "--io-log-path" takes a path argument');
             self.sIoLogPath = asArgs[iArg];
@@ -648 +665 @@
         elif asArgs[iArg] == '--use-ramdisk':
             self.fUseRamDisk = True;
+        elif asArgs[iArg] == '--encrypt-disk':
+            self.fEncryptDisk = True;
+        elif asArgs[iArg] == '--encrypt-password':
+            iArg += 1;
+            if iArg >= len(asArgs): raise base.InvalidOption('The "--encrypt-password" takes a string');
+            self.sEncryptPw = asArgs[iArg];
+        elif asArgs[iArg] == '--encrypt-algorithm':
+            iArg += 1;
+            if iArg >= len(asArgs): raise base.InvalidOption('The "--encrypt-algorithm" takes a string');
+            self.sEncryptAlgo = asArgs[iArg];
         else:
             return vbox.TestDriver.parseOption(self, asArgs, iArg);
@@ -965 +992 @@
                 oHd = oSession.createDiffHd(oHdParent, sDiskPath, None);
 
+            if oHd is not None and iDiffLvl == 0 and self.fEncryptDisk:
+                try:
+                    oIProgress = oHd.changeEncryption('', self.sEncryptAlgo, self.sEncryptPw, self.ksPwId);
+                    oProgress = vboxwrappers.ProgressWrapper(oIProgress, self.oVBoxMgr, self, 'Encrypting "%s"' % (sDiskPath,));
+                    oProgress.wait();
+                    if oProgress.logResult() is False:
+                        raise base.GenError('Encrypting disk "%s" failed' % (sDiskPath, ));
+                except:
+                    reporter.errorXcpt('changeEncryption("%s","%s","%s") failed on "%s"' \
+                                       % ('', self.sEncryptAlgo, self.sEncryptPw, oSession.sName) );
+                    self.oVBox.deleteHdByMedium(oHd);
+                    oHd = None;
+                else:
+                    reporter.log('Encrypted "%s"' % (sDiskPath,));
+
         return oHd;
+
+    def startVmAndConnect(self, sVmName):
+        """
+        Our own implementation of startVmAndConnectToTxsViaTcp to make it possible
+        to add passwords to a running VM when encryption is used.
+        """
+        oSession = self.startVmByName(sVmName);
+        if oSession is not None:
+            # Add password to the session in case encryption is used.
+            fRc = True;
+            if self.fEncryptDisk:
+                try:
+                    oSession.o.console.addDiskEncryptionPassword(self.ksPwId, self.sEncryptPw, False);
+                except:
+                    reporter.logXcpt();
+                    fRc = False;
+
+            # Connect to TXS.
+            if fRc:
+                reporter.log2('startVmAndConnect: Started(/prepared) "%s", connecting to TXS ...' % (sVmName,));
+                (fRc, oTxsSession) = self.txsDoConnectViaTcp(oSession, 15*60000, fNatForwardingForTxs = True);
+                if fRc is True:
+                    if fRc is True:
+                        # Success!
+                        return (oSession, oTxsSession);
+                else:
+                    reporter.error('startVmAndConnect: txsDoConnectViaTcp failed');
+                # If something went wrong while waiting for TXS to be started - take VM screenshot before terminate it
+
+            self.terminateVmBySession(oSession);
+
+        return (None, None);
 
     def testOneCfg(self, sVmName, eStorageController, sHostIoCache, sDiskFormat, # pylint: disable=R0913,R0914,R0915
@@ -991 +1065 @@
             # for benchmarks
             if self.fRecreateStorCfg:
-                sMountPoint = self.prepareStorage(self.oStorCfg, self.fUseRamDisk, cbDisk);
+                sMountPoint = self.prepareStorage(self.oStorCfg, self.fUseRamDisk, 2 * cbDisk);
                 if sMountPoint is not None:
                     # Create a directory where every normal user can write to.
@@ -1086 +1160 @@
             if fRc is True:
                 self.logVmInfo(oVM);
-                oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(sVmName, fCdWait = False, fNatForwardingForTxs = True);
+                oSession, oTxsSession = self.startVmAndConnect(sVmName);
                 if oSession is not None:
                     self.addTask(oTxsSession);