Changeset 92241 in vbox for trunk

Timestamp:

Nov 5, 2021 3:24:36 PM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: Implemented oSessionWrapper::setNicLocalhostReachable(), which in turn uses the session object to configure localhost reachability. ​bugref:9896

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• vbox.py (modified) (1 diff)
• vboxwrappers.py (modified) (1 diff)

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

@@ -3072 +3072 @@
             for iSlot in range(0, self.oVBox.systemProperties.getMaxNetworkAdapters(oVM.chipsetType)):
                 try:
-                    oNic = oVM.getNetworkAdapter(iSlot);
-                    if not oNic.enabled:
-                        continue;
-                    sAdpName = self.getNetworkAdapterNameFromType(oNic);
-                    if oNic.attachmentType == vboxcon.NetworkAttachmentType_NAT:
-                        reporter.log2('Enabling "LocalhostReachable" (NAT) for network adapter "%s" in slot %d' % \
-                                      (sAdpName, iSlot));
-                        oNatEngine = oNic.NATEngine;
-                        oNatEngine.LocalhostReachable = True;
-                    else:
-                        # 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, iSlot);
-                        reporter.log2('Disabling "LocalhostReachable" (NAT) for network adapter "%s" in slot %d (key: %s)' % \
-                                      (sAdpName, iSlot, sKey));
-                        self.oVBox.setExtraData(sKey, '');
+                    oWrapped.setNicLocalhostReachable(True, iSlot);
                 except:
                     reporter.logXcpt();

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

@@ -1617 +1617 @@
         return True;
 
+    def setNicLocalhostReachable(self, fReachable, iNic = 0):
+        """
+        Sets whether the specified NIC can reach the host or not.
+        Only affects (enabled) NICs configured to NAT at the moment.
+
+        Returns True on success and False on failure.  Error information is logged.
+        """
+        try:
+            oNic = self.o.machine.getNetworkAdapter(iNic);
+        except:
+            return reporter.errorXcpt('getNetworkAdapter(%s) failed for "%s"' % (iNic, self.sName,));
+
+        try:
+            if not oNic.enabled: # NIC not enabled? Nothing to do here.
+                return True;
+        except:
+            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, iSlot);
+                reporter.log2('Disabling "LocalhostReachable" (NAT) for network adapter "%s" in slot %d (key: %s)' % \
+                              (sAdpName, iSlot, sKey));
+                self.setExtraData(sKey, '');
+                return True;
+        except:
+            return reporter.errorXcpt('NIC adapter type failed for "%s"' % (iNic, self.sName,));
+
+        reporter.log('Setting "LocalhostReachable" for network adapter "%s" in slot %d to %s' % (sAdpName, iNic, fReachable));
+
+        try:
+            oNatEngine = oNic.NATEngine;
+        except:
+            return reporter.errorXcpt('Getting NIC NAT engine failed for "%s"' % (iNic, self.sName,));
+
+        try:
+            oNatEngine.LocalhostReachable = fReachable;
+        except:
+            return reporter.errorXcpt('LocalhostReachable failed for "%s"' % (iNic, self.sName,));
+
+        return True;
+
     def setNicMacAddress(self, sMacAddr, iNic = 0):
         """