Changeset 92838 in vbox for trunk/src/VBox

Timestamp:

Dec 8, 2021 10:49:27 PM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: Move call oSessionWrapper::setNicLocalhostReachable() to the two places where they are needed (and remove from setupPreferredConfig()). bugref:9896

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• vbox.py (modified) (2 diffs)
• vboxwrappers.py (modified) (3 diffs)

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

@@ -2462 +2462 @@
                     sNic0MacAddr = '%02X' % (iGroup);
                 fRc = oSession.setNicMacAddress(sNic0MacAddr, 0);
+            # Needed to reach the host (localhost) from the guest. See xTracker #9896.
+            if fRc and self.fpApiVer >= 7.0 and eNic0AttachType == vboxcon.NetworkAttachmentType_NAT:
+                fRc = oSession.setNicLocalhostReachable(True, 0);
             if fRc and fNatForwardingForTxs is True:
                 fRc = oSession.setupNatForwardingForTxs();
@@ -2562 +2565 @@
                         sNic0MacAddr = '%02X' % (iGroup,);
                     fRc = oSession.setNicMacAddress(sNic0MacAddr, 0);
+                # Needed to reach the host (localhost) from the guest. See xTracker #9896.
+                if fRc and self.fpApiVer >= 7.0 and eNic0AttachType == vboxcon.NetworkAttachmentType_NAT:
+                    fRc = oSession.setNicLocalhostReachable(True, 0);
 
                 if fRc and fVmmDevTestingPart is not None:

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

@@ -1636 +1636 @@
             return reporter.errorXcpt('NIC enabled status (%s) failed for "%s"' % (iNic, self.sName,));
 
-        try:
-            sAdpName = self.oTstDrv.getNetworkAdapterNameFromType(oNic);
-            ## @todo Remove this check once we have more attachment types that support this.
-            if oNic.attachmentType != vboxcon.NetworkAttachmentType_NAT:
-                # Other attachments will fail if 'LocalhostReachable' extra data override is present
-                ## @todo r=andy Is this still needed, as we now have the API (see above) in place?
-                sKey = 'VBoxInternal/Devices/%s/%d/LUN#0/Config/LocalhostReachable' % (sAdpName, iNic);
-                reporter.log2('Disabling "LocalhostReachable" (NAT) for network adapter "%s" in slot %d (key: %s)' % \
-                              (sAdpName, iNic, sKey));
-                self.setExtraData(sKey, '');
-                return True;
-        except:
-            return reporter.errorXcpt('NIC adapter type (%s) failed for "%s"' % (iNic, self.sName,));
-
         reporter.log('Setting "LocalhostReachable" for network adapter "%s" in slot %d to %s' % (sAdpName, iNic, fReachable));
 
@@ -1658 +1644 @@
 
         try:
-            oNatEngine.LocalhostReachable = fReachable;
+            if hasattr(oNatEngine, "localhostReachable"):
+                oNatEngine.localhostReachable = fReachable;
+            else
+                oNatEngine.LocalhostReachable = fReachable;
         except:
             return reporter.errorXcpt('LocalhostReachable (%s) failed for "%s"' % (iNic, self.sName,));
@@ -2367 +2356 @@
         if self.fpApiVer >= 4.0:
             if not self.setupAudio(eAudioCtlType):      fRc = False;
-
-        if self.fpApiVer >= 7.0:
-            # Needed to reach the host (localhost) from the guest. See xTracker #9896.
-            for iSlot in range(0, self.oVBox.systemProperties.getMaxNetworkAdapters(self.o.machine.chipsetType)):
-                try:
-                    self.setNicLocalhostReachable(True, iSlot);
-                except:
-                    reporter.logXcpt();
 
         return fRc;