Changeset 70658 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jan 20, 2018 7:24:37 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120394

Message:

ValidationKit/vboxtestvms.py: Moved the VM creation to the TestVm class.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py (modified) (2 diffs)

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

@@ -350 +350 @@
         return asRet;
 
+    def createVm(self, oTestDrv, eNic0AttachType = None, sDvdImage = None):
+        """
+        Creates the VM with defaults and the few tweaks as per the arguments.
+
+        Returns same as vbox.TestDriver.createTestVM.
+        """
+        if sDvdImage is not None:
+            sMyDvdImage = sDvdImage;
+        else:
+            sMyDvdImage = self.sDvdImage;
+
+        if eNic0AttachType is not None:
+            eMyNic0AttachType = eNic0AttachType;
+        elif self.sNic0AttachType is None:
+            eMyNic0AttachType = None;
+        elif self.sNic0AttachType == 'nat':
+            eMyNic0AttachType = vboxcon.NetworkAttachmentType_NAT;
+        elif self.sNic0AttachType == 'bridged':
+            eMyNic0AttachType = vboxcon.NetworkAttachmentType_Bridged;
+        else:
+            assert False, self.sNic0AttachType;
+
+        return self.createVmInner(oTestDrv, eMyNic0AttachType, sMyDvdImage);
+
+    def createVmInner(self, oTestDrv, eNic0AttachType, sDvdImage):
+        """
+        Same as createVm but parameters resolved.
+
+        Returns same as vbox.TestDriver.createTestVM.
+        """
+        reporter.log2('');
+        reporter.log2('Calling createTestVM on %s...' % (self.sVmName,))
+        return oTestDrv.createTestVM(self.sVmName,
+                                     1,                 # iGroup
+                                     sHd                = self.sHd,
+                                     sKind              = self.sKind,
+                                     fIoApic            = self.fIoApic,
+                                     fPae               = self.fPae,
+                                     eNic0AttachType    = eNic0AttachType,
+                                     sDvdImage          = sDvdImage,
+                                     sDvdControllerType = self.sDvdControllerType,
+                                     sHddControllerType = self.sHddControllerType,
+                                     sFloppy            = self.sFloppy,
+                                     fVmmDevTestingPart = self.fVmmDevTestingPart,
+                                     fVmmDevTestingMmio = self.fVmmDevTestingPart,
+                                     sFirmwareType      = self.sFirmwareType,
+                                     sChipsetType       = self.sChipsetType);
+
     def getReconfiguredVm(self, oTestDrv, cCpus, sVirtMode, sParavirtMode = None):
         """
@@ -810 +858 @@
                 oVM = oTestDrv.addTestMachine(oTestVm.sVmName);
             else:
-                ## @todo This could possibly be moved to the TestVM object.
-                if sDvdImage is not None:
-                    sMyDvdImage = sDvdImage;
-                else:
-                    sMyDvdImage = oTestVm.sDvdImage;
-
-                if eNic0AttachType is not None:
-                    eMyNic0AttachType = eNic0AttachType;
-                elif oTestVm.sNic0AttachType is None:
-                    eMyNic0AttachType = None;
-                elif oTestVm.sNic0AttachType == 'nat':
-                    eMyNic0AttachType = vboxcon.NetworkAttachmentType_NAT;
-                elif oTestVm.sNic0AttachType == 'bridged':
-                    eMyNic0AttachType = vboxcon.NetworkAttachmentType_Bridged;
-                else:
-                    assert False, oTestVm.sNic0AttachType;
-
-                oVM = oTestDrv.createTestVM(oTestVm.sVmName, 1,
-                                            sHd                = oTestVm.sHd,
-                                            sKind              = oTestVm.sKind,
-                                            fIoApic            = oTestVm.fIoApic,
-                                            fPae               = oTestVm.fPae,
-                                            eNic0AttachType    = eMyNic0AttachType,
-                                            sDvdImage          = sMyDvdImage,
-                                            sDvdControllerType = oTestVm.sDvdControllerType,
-                                            sHddControllerType = oTestVm.sHddControllerType,
-                                            sFloppy            = oTestVm.sFloppy,
-                                            fVmmDevTestingPart = oTestVm.fVmmDevTestingPart,
-                                            fVmmDevTestingMmio = oTestVm.fVmmDevTestingPart,
-                                            sFirmwareType      = oTestVm.sFirmwareType,
-                                            sChipsetType       = oTestVm.sChipsetType);
+                oVM = oTestVm.createVm(oTestDrv, eNic0AttachType, sDvdImage);
             if oVM is None:
                 return False;