Changeset 53580 in vbox

Timestamp:

Dec 19, 2014 8:57:54 PM (10 years ago)

Author:

vboxsync

Message:

tdGuestOSInstTest1.py,vboxtestvms.py: Untested revision of the --paravirt-modes code.

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vboxtestvms.py (modified) (17 diffs)
• tests/installation/tdGuestOsInstTest1.py (modified) (1 diff)

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

@@ -30 +30 @@
 
 # Standard Python imports.
-import re
-import random
+import re;
+import random;
 
 # Validation Kit imports.
@@ -99 +99 @@
 ];
 
-# Guest OS type string constants.
-g_ksGuestOsTypeDarwin  = 'darwin'
-g_ksGuestOsTypeFreeBSD = 'freebsd'
-g_ksGuestOsTypeLinux   = 'linux'
-g_ksGuestOsTypeOS2     = 'os2'
-g_ksGuestOsTypeSolaris = 'solaris'
-g_ksGuestOsTypeWindows = 'windows'
-
-# String constants for hypervisor types.
-g_ksParavirtProviderNone    = 'none'
-g_ksParavirtProviderDefault = 'default'
-g_ksParavirtProviderLegacy  = 'legacy'
-g_ksParavirtProviderMinimal = 'minimal'
-g_ksParavirtProviderHyperV  = 'hyperv'
+
+## @name Guest OS type string constants.
+## @{
+g_ksGuestOsTypeDarwin  = 'darwin';
+g_ksGuestOsTypeFreeBSD = 'freebsd';
+g_ksGuestOsTypeLinux   = 'linux';
+g_ksGuestOsTypeOS2     = 'os2';
+g_ksGuestOsTypeSolaris = 'solaris';
+g_ksGuestOsTypeWindows = 'windows';
+## @}
+
+## @name String constants for paravirtualization providers.
+## @{
+g_ksParavirtProviderNone    = 'none';
+g_ksParavirtProviderDefault = 'default';
+g_ksParavirtProviderLegacy  = 'legacy';
+g_ksParavirtProviderMinimal = 'minimal';
+g_ksParavirtProviderHyperV  = 'hyperv';
+## @}
+
+## Valid paravirtualization providers.
+g_kasParavirtProviders = ( g_ksParavirtProviderNone, g_ksParavirtProviderDefault, g_ksParavirtProviderLegacy,
+                           g_ksParavirtProviderMinimal, g_ksParavirtProviderHyperV );
 
 # Mapping for support of paravirtualisation providers per guest OS.
@@ -160 +169 @@
     def __init__(self, oSet, sVmName, sHd = None, sKind = None, acCpusSup = None, asVirtModesSup = None, # pylint: disable=R0913
                  fIoApic = None, fPae = None, sNic0AttachType = None, sHddControllerType = 'IDE Controller',
-                 sFloppy = None, fVmmDevTestingPart = None, fVmmDevTestingMmio = False, fUseParavirtProvider = False):
+                 sFloppy = None, fVmmDevTestingPart = None, fVmmDevTestingMmio = False, asParavirtModesSup = None,
+                 fRandomPvPMode = False):
         self.oSet                    = oSet;
         self.sVmName                 = sVmName;
@@ -166 +176 @@
         self.acCpusSup               = acCpusSup;
         self.asVirtModesSup          = asVirtModesSup;
+        self.asParavirtModesSup      = asParavirtModesSup;
         self.sKind                   = sKind;
         self.sGuestOsType            = None;
@@ -177 +188 @@
         self.fVmmDevTestingMmio      = fVmmDevTestingMmio;
 
-        self.fSnapshotRestoreCurrent = False;       # Whether to restore execution on the current snapshot.
+        self.fSnapshotRestoreCurrent = False;        # Whether to restore execution on the current snapshot.
         self.fSkip                   = False;        # All VMs are included in the configured set by default.
         self.aInfo                   = None;
-        self._guessStuff();
-
-        # Assign all available paravirt providers for current VM type if fUseParavirtProvider allows to do that.
-        # The list might be overwritten later once --paravirt-modes option is specified.
-        #
-        # Temporary solution: in order to do not overload testboxes, the only one provider is enabled by default (a random one).
-        if fUseParavirtProvider:
-            random.seed()
-            self.asParavirtModes = (random.choice(g_kdaParavirtProvidersSupported[self.sGuestOsType]),)
-        else:
-            self.asParavirtModes = (None,)
+        self._guessStuff(fRandomPvPMode);
 
     def _mkCanonicalGuestOSType(self, sType):
@@ -211 +212 @@
         raise base.GenError(sWhat="unknown guest OS kind: %s" % str(sType))
 
-    def _guessStuff(self):
+    def _guessStuff(self, fRandomPvPMode):
         """
         Used by the constructor to guess stuff.
@@ -271 +272 @@
             else:
                 self.acCpusSup = [1];
+
+        # Figure relevant PV modes based on the OS.
+        if self.asParavirtModesSup is None:
+            self.asParavirtModesSup = g_kdaParavirtProvidersSupported[self.sGuestOsType];
+            ## @todo Remove this hack as soon as we've got around to explictly configure test variations
+            ## on the server side. Client side random is interesting but not the best option.
+            if fRandomPvPMode:
+                random.seed();
+                self.asParavirtModesSup = (random.choice(self.asParavirtModesSup),);
 
         return True;
@@ -300 +310 @@
                         fRc = fRc and oSession.setCpuCount(cCpus);
 
-                        if oSession.fpApiVer >= 4.4 and sParavirtMode is not None:
+                        if sParavirtMode is not None and oSession.fpApiVer >= 4.4:
                             adParavirtProviders = {
                                 g_ksParavirtProviderNone   : vboxcon.ParavirtProvider_None,
@@ -309 +319 @@
                             };
                             fRc = fRc and oSession.setParavirtProvider(adParavirtProviders[sParavirtMode]);
-                            reporter.log('Set paravirtualization provider [%s].' % sParavirtMode);
 
                         fCfg64Bit = self.is64bitRequired() or (self.is64bit() and fHostSupports64bit and sVirtMode != 'raw');
@@ -424 +433 @@
         self.aoTestVms      = [];
         self.fIgnoreSkippedVm = fIgnoreSkippedVm;
-        self.asParavirtModes = None
+        self.asParavirtModes = None; ##< If None, use the first PV mode of the test VM, otherwise all modes in this list.
 
     def findTestVmByName(self, sVmName):
@@ -470 +479 @@
         reporter.log('  --snapshot-restore-current');
         reporter.log('      Restores the current snapshot and resumes execution.');
-        reporter.log('  --paravirt-modes   <m1[:m2[:]]')
-        reporter.log('      Default for OS X guests   : %s' % (':'.join(str(m) for m in g_kdaParavirtProvidersSupported[g_ksGuestOsTypeDarwin  ]))) # pylint: disable=C0301
-        reporter.log('      Default for FreeBSD guests: %s' % (':'.join(str(m) for m in g_kdaParavirtProvidersSupported[g_ksGuestOsTypeFreeBSD ]))) # pylint: disable=C0301
-        reporter.log('      Default for Linux guests  : %s' % (':'.join(str(m) for m in g_kdaParavirtProvidersSupported[g_ksGuestOsTypeLinux   ]))) # pylint: disable=C0301
-        reporter.log('      Default for OS/2 guests   : %s' % (':'.join(str(m) for m in g_kdaParavirtProvidersSupported[g_ksGuestOsTypeOS2     ]))) # pylint: disable=C0301
-        reporter.log('      Default for Solaris guests: %s' % (':'.join(str(m) for m in g_kdaParavirtProvidersSupported[g_ksGuestOsTypeSolaris ]))) # pylint: disable=C0301
-        reporter.log('      Default for Windows guests: %s' % (':'.join(str(m) for m in g_kdaParavirtProvidersSupported[g_ksGuestOsTypeWindows ]))) # pylint: disable=C0301
-        reporter.log('      NOTE: this option can be applied only in case if VM set contains')
-        reporter.log('            the only one VM because different VMs might not support all')
-        reporter.log('            the specified paravirtualisation providers. If the option not')
-        reporter.log('            specified, default set of paravirtualisation providers assigned')
-        reporter.log('            to VM according to its type.')
-
+        reporter.log('  --paravirt-modes   <pv1[:pv2[:]]>');
+        reporter.log('      Set of paravirtualized providers (modes) to tests. Intersected with what the test VM supports.');
+        reporter.log('      Default is the first PV mode the test VMs support, generally same as "legacy".');
         ## @todo Add more options for controlling individual VMs.
         return True;
@@ -577 +576 @@
                 raise base.InvalidOption('The "--paravirt-modes" takes a colon separated list of modes');
 
-            # Check and remember specified paravirtualisation providers list.
             self.asParavirtModes = asArgs[iArg].split(':')
-
-            for sMode in self.asParavirtModes:
-                if sMode not in (g_ksParavirtProviderNone, g_ksParavirtProviderDefault,
-                                 g_ksParavirtProviderLegacy, g_ksParavirtProviderMinimal, g_ksParavirtProviderHyperV):
-                    raise base.InvalidOption('Bad paravirtualisation provider specified: %s' % sMode);
+            for sPvMode in self.asParavirtModes:
+                if sPvMode not in g_kasParavirtProviders:
+                    raise base.InvalidOption('The "--paravirt-modes" value "%s" is not valid; valid values are: %s'
+                                             % (sPvMode, ', '.join(g_kasParavirtProviders),));
+            if len(self.asParavirtModes) == 0:
+                self.asParavirtModes = None;
 
         else:
@@ -611 +610 @@
         """
 
-        # Check if --paravirt-modes option was specified and it meets requirements.
-        if self.asParavirtModes is not None:
-            iNumberOfActivatedVMs = len([item for item in self.aoTestVms if item.fSkip is not True])
-            if iNumberOfActivatedVMs != 1:
-                raise base.InvalidOption('The --paravirt-modes option assumes that the only one VM '
-                                         'is activated in test VMs set while %d are active.' % iNumberOfActivatedVMs)
-
         for oTestVm in self.aoTestVms:
             if oTestVm.fSkip:
                 continue;
-
-            # At this point we know that if --paravirt-modes option was specified, there is only one VM in set.
-            if self.asParavirtModes is not None:
-                for sMode in self.asParavirtModes:
-                    if sMode not in g_kdaParavirtProvidersSupported[oTestVm.sGuestOsType]:
-                        raise base.InvalidOption('Paravirtualisation provider "%s" is not supported by current guest OS.' % sMode)
-                # At this point oTestVm' asParavirtModes might be safely overwritten.
-                oTestVm.asParavirtModes = self.asParavirtModes
 
             if oTestVm.fSnapshotRestoreCurrent:
@@ -715 +699 @@
             acCpusSup      = [cCpus for cCpus in oTestVm.acCpusSup      if cCpus in self.acCpus];
 
+            # Ditto for paravirtualization modes, except if not specified we got a less obvious default.
+            if self.asParavirtModes is not None  and  oTestDrv.fpApiVer >= 4.4:
+                asParavirtModes = [sPvMode for sPvMode in oTestVm.asParavirtModesSup if sPvMode in self.asParavirtModes];
+                assert None not in asParavirtModes;
+            elif oTestDrv.fpApiVer >= 4.4:
+                asParavirtModes = oTestVm.asParavirtModesSup[0];
+                assert None not in asParavirtModes;
+            else:
+                asParavirtModes = (None,);
+
             for cCpus in acCpusSup:
                 if cCpus == 1:
@@ -728 +722 @@
                     if sVirtMode == 'raw' and cCpus > 1:
                         continue;
-
-                    for sParavirtMode in oTestVm.asParavirtModes:
-
-                        reporter.testStart("%s/%s" % (g_dsVirtModeDescs[sVirtMode], sParavirtMode if sParavirtMode is not None else "[paravirtualisation provider not set]")); # pylint: disable=C0301
+                    reporter.testStart('%s' % ( g_dsVirtModeDescs[sVirtMode], ) );
+                    cStartTests = cTests;
+
+                    for sParavirtMode in asParavirtModes:
+                        if sParavirtMode is not None:
+                            assert oTestDrv.fpApiVer >= 4.4;
+                            reporter.testStart('%s' % ( sParavirtMode, ) );
 
                         # Reconfigure the VM.
                         try:
-                            (rc2, oVM) = oTestVm.getReconfiguredVm(oTestDrv, cCpus, sVirtMode, sParavirtMode=sParavirtMode);
+                            (rc2, oVM) = oTestVm.getReconfiguredVm(oTestDrv, cCpus, sVirtMode, sParavirtMode = sParavirtMode);
                         except KeyboardInterrupt:
                             raise;
@@ -742 +739 @@
                             rc2 = False;
                         if rc2 is True:
+                            # Do the testing.
                             try:
                                 rc2 = fnCallback(oVM, oTestVm);
@@ -757 +755 @@
 
                         cTests = cTests + (rc2 is not None);
-                        reporter.testDone(fSkipped = (rc2 is None));
+                        if sParavirtMode is not None:
+                            reporter.testDone(fSkipped = (rc2 is None));
+
+                    reporter.testDone(fSkipped = cTests == cStartTests);
 
                 reporter.testDone(fSkipped = cTests == 0);

trunk/src/VBox/ValidationKit/tests/installation/tdGuestOsInstTest1.py

@@ -76 +76 @@
 
     def __init__(self, oSet, sVmName, sKind, sInstallIso, sHdCtrlNm, cGbHdd, fFlags):
-        fUseParavirtProvider = True;
-        if fFlags & self.kfNoWin81Paravirt:
-            fUseParavirtProvider = False;
         vboxtestvms.TestVm.__init__(self, oSet, sVmName, sKind = sKind, sHddControllerType = sHdCtrlNm,
-                                    fUseParavirtProvider = fUseParavirtProvider); # pylint: disable=C0301
+                                    fRandomPvPMode = (fFlags & self.kfNoWin81Paravirt) != 0);
         self.sDvdImage    = os.path.join(self.ksIsoPathBase, sInstallIso);
         self.cGbHdd       = cGbHdd;