Changeset 54938 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Mar 25, 2015 1:04:20 PM (10 years ago)

Author:

vboxsync

Message:

tdTreeDepth1.py: new test for checking if VBoxSVC can deal with the maximum medium and snapshot tree depths
vboxwrappers.py: add functionality for creating base and diff disk images, and allow attaching them to a VM

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

@@ -1647 +1647 @@
         return fRc;
 
-    def attachHd(self, sHd, sController = "IDE Controller", iPort = 0, iDevice = 0, fImmutable = True):
+    def attachHd(self, sHd, sController = "IDE Controller", iPort = 0, iDevice = 0, fImmutable = True, fForceResource = True):
         """
         Attaches a HD to a VM.
@@ -1653 +1653 @@
         """
         # Input validation.
-        if not self.oTstDrv.isResourceFile(sHd):
+        if fForceResource and not self.oTstDrv.isResourceFile(sHd):
             reporter.fatal('"%s" is not in the resource set' % (sHd,));
             return None;
@@ -1661 +1661 @@
 
         # Find the HD, registering it if necessary (as immutable).
-        sFullName = self.oTstDrv.getFullResourceName(sHd);
+        if fForceResource:
+            sFullName = self.oTstDrv.getFullResourceName(sHd);
+        else:
+            sFullName = sHd;
         try:
             oHd = self.oVBox.findHardDisk(sFullName);
@@ -1703 +1706 @@
         return fRc;
 
+    def createBaseHd(self, sHd, sFmt = "VDI", cb = 10*1024*1024*1024):
+        """
+        Creates a base HD.
+        Returns Medium object on success and None on failure.  Error information is logged.
+        """
+        try:
+            if self.fpApiVer >= 4.4:
+                oHd = self.oVBox.createMedium(sFmt, sHd, vboxcon.AccessMode_ReadWrite, vboxcon.DeviceType_HardDisk);
+            else:
+                oHd = self.oVBox.createHardDisk(sFmt, sHd);
+            oProgressXpcom = oHd.createBaseStorage(cb, (vboxcon.MediumVariant_Standard, ))
+            oProgress = ProgressWrapper(oProgressXpcom, self.oVBoxMgr, self.oTstDrv, 'create base disk %s' % (sHd));
+            oProgress.wait();
+            oProgress.logResult();
+        except:
+            reporter.errorXcpt('failed to create base hd "%s"' % (sHd));
+            oHd = None
+
+        return oHd;
+
+    def createDiffHd(self, oParentHd, sHd, sFmt = "VDI"):
+        """
+        Creates a differencing HD.
+        Returns Medium object on success and None on failure.  Error information is logged.
+        """
+        try:
+            if self.fpApiVer >= 4.4:
+                oHd = self.oVBox.createMedium(sFmt, sHd, vboxcon.AccessMode_ReadWrite, vboxcon.DeviceType_HardDisk);
+            else:
+                oHd = self.oVBox.createHardDisk(sFmt, sHd);
+            oProgressXpcom = oParentHd.createDiffStorage(oHd, (vboxcon.MediumVariant_Standard, ))
+            oProgress = ProgressWrapper(oProgressXpcom, self.oVBoxMgr, self.oTstDrv, 'create diff disk %s' % (sHd));
+            oProgress.wait();
+            oProgress.logResult();
+        except:
+            reporter.errorXcpt('failed to create diff hd "%s"' % (sHd));
+            oHd = None
+
+        return oHd;
+
     def createAndAttachHd(self, sHd, sFmt = "VDI", sController = "IDE Controller", cb = 10*1024*1024*1024, \
                           iPort = 0, iDevice = 0, fImmutable = True):
@@ -1712 +1755 @@
             return False;
 
-        try:
-            if self.fpApiVer >= 4.4:
-                oHd = self.oVBox.createMedium(sFmt, sHd, vboxcon.AccessMode_ReadWrite, vboxcon.DeviceType_HardDisk);
-            else:
-                oHd = self.oVBox.createHardDisk(sFmt, sHd);
-            oProgressXpcom = oHd.createBaseStorage(cb, (vboxcon.MediumVariant_Standard, ))
-            oProgress = ProgressWrapper(oProgressXpcom, self.oVBoxMgr, self.oTstDrv, 'create disk %s' % (sHd));
-            oProgress.wait();
-            oProgress.logResult();
-        except:
-            reporter.errorXcpt('failed to create hd "%s"' % (sHd));
+        oHd = self.createBaseHd(sHd, sFmt, cb)
+        if oHd is None:
             return False;