Changeset 62190 in vbox for trunk/src

Timestamp:

Jul 12, 2016 12:31:05 PM (9 years ago)

Author:

vboxsync

Message:

ValidationKit/storage: Fixes in general and add support for NVMe controllers

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• remoteexecutor.py (modified) (1 diff)
• storagecfg.py (modified) (1 diff)
• tdStorageBenchmark1.py (modified) (9 diffs)

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

@@ -152 +152 @@
                 oStdIn = StdInOutBuffer(sInput);
             else:
-                oStdIn = '/dev/null';
+                oStdIn = '/dev/null'; # pylint: disable=R0204
             fRc = self.oTxsSession.syncExecEx(sExec, (sExec,) + asArgs,
                                               oStdIn = oStdIn, oStdOut = oStdOut);

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

@@ -230 +230 @@
             fRc, _ = oExec.execBinary('sfdisk', ('--no-reread', '--wipe', 'always', '-q', '-f', sDiskPath), sFdiskScript);
             if fRc:
-                sBlkDev = sDiskPath + '1';
+                if sDiskPath.find('nvme') is not -1:
+                    sBlkDev = sDiskPath + 'p1';
+                else:
+                    sBlkDev = sDiskPath + '1';
         else:
             if cbVol is None:

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

@@ -64 +64 @@
     elif eControllerType == vboxcon.StorageControllerType_LsiLogic or eControllerType == vboxcon.StorageControllerType_BusLogic:
         sType = "SCSI Controller";
+    elif eControllerType == vboxcon.StorageControllerType_NVMe:
+        sType = "NVMe Controller";
     else:
         sType = "Storage Controller";
@@ -250 +252 @@
         self.acCpusDef         = [1, 2,]
         self.acCpus            = self.acCpusDef;
-        self.asStorageCtrlsDef = ['AHCI', 'IDE', 'LsiLogicSAS', 'LsiLogic', 'BusLogic'];
+        self.asStorageCtrlsDef = ['AHCI', 'IDE', 'LsiLogicSAS', 'LsiLogic', 'BusLogic', 'NVMe'];
         self.asStorageCtrls    = self.asStorageCtrlsDef;
         self.asDiskFormatsDef  = ['VDI', 'VMDK', 'VHD', 'QED', 'Parallels', 'QCOW', 'iSCSI'];
@@ -484 +486 @@
             fRc = fRc and oSession.setStorageControllerType(eStorageController, _ControllerTypeToName(eStorageController));
 
+            iDevice = 0;
+            if eStorageController == vboxcon.StorageControllerType_PIIX3 or \
+               eStorageController == vboxcon.StorageControllerType_PIIX4:
+                iDevice = 1; # Master is for the OS.
+
             if sDiskFormat == "iSCSI":
                 listNames = [];
@@ -505 +512 @@
                         if oSession.fpApiVer >= 4.0:
                             oSession.o.machine.attachDevice(_ControllerTypeToName(eStorageController), \
-                                                            1, 0, vboxcon.DeviceType_HardDisk, oHd);
+                                                            0, iDevice, vboxcon.DeviceType_HardDisk, oHd);
                         else:
                             oSession.o.machine.attachDevice(_ControllerTypeToName(eStorageController), \
-                                                            1, 0, vboxcon.DeviceType_HardDisk, oHd.id);
+                                                            0, iDevice, vboxcon.DeviceType_HardDisk, oHd.id);
                     except:
                         reporter.errorXcpt('attachDevice("%s",%s,%s,HardDisk,"%s") failed on "%s"' \
@@ -517 +524 @@
             else:
                 fRc = fRc and oSession.createAndAttachHd(sDiskPath, sDiskFormat, _ControllerTypeToName(eStorageController), \
-                                                         cb = 300*1024*1024*1024, iPort = 1, fImmutable = False);
+                                                         cb = 300*1024*1024*1024, iPort = 0, iDevice = iDevice, \
+                                                         fImmutable = False);
             fRc = fRc and oSession.enableVirtEx(fHwVirt);
             fRc = fRc and oSession.enableNestedPaging(fNestedPaging);
@@ -540 +548 @@
                 lstBinaryPaths = ['/bin', '/sbin', '/usr/bin', '/usr/sbin' ];
                 oExecVm = remoteexecutor.RemoteExecutor(oTxsSession, lstBinaryPaths, '${SCRATCH}');
-                oStorCfgVm = storagecfg.StorageCfg(oExecVm, 'linux', [ '/dev/sdb' ]);
+                lstDisks = [ '/dev/sdb' ];
+                # The naming scheme for NVMe is different.
+                if eStorageController == vboxcon.StorageControllerType_NVMe:
+                    lstDisks = [ '/dev/nvme0n1' ];
+                oStorCfgVm = storagecfg.StorageCfg(oExecVm, 'linux', lstDisks);
 
                 sMountPoint = self.prepareStorage(oStorCfgVm);
@@ -557 +569 @@
                 if oSession is not None:
                     try:
-                        oSession.o.machine.detachDevice(_ControllerTypeToName(eStorageController), 1, 0);
+                        oSession.o.machine.detachDevice(_ControllerTypeToName(eStorageController), 0, iDevice);
 
                         # Remove storage controller if it is not an IDE controller.
@@ -596 +608 @@
             elif sStorageCtrl == 'BusLogic':
                 eStorageCtrl = vboxcon.StorageControllerType_BusLogic;
+            elif sStorageCtrl == 'NVMe':
+                eStorageCtrl = vboxcon.StorageControllerType_NVMe;
             else:
                 eStorageCtrl = None;
@@ -648 +662 @@
                         reporter.testDone();
                     reporter.testDone();
+
+                # Cleanup storage area
+                if sDiskFormat != 'iSCSI' and not self.fUseScratch:
+                    self.cleanupStorage(self.oStorCfg);
+
                 reporter.testDone();
             reporter.testDone();