Changeset 92050 in vbox for trunk/src

Timestamp:

Oct 25, 2021 4:58:55 PM (3 years ago)

Author:

vboxsync

Message:

ValidationKit: bugref:9932 Use host-only networks instead of adapters on Mac OS

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vbox.py (modified) (1 diff)
• testdriver/vboxwrappers.py (modified) (2 diffs)
• tests/installation/tdGuestOsUnattendedInst1.py (modified) (1 diff)

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

@@ -2241 +2241 @@
                     reporter.log("    hostInterface:  %s" % (oNic.hostInterface,));
             else:
-                if self.fpApiVer >= 4.1:
+                if self.fpApiVer >= 7.0:
+                    if oNic.attachmentType == vboxcon.NetworkAttachmentType_HostOnlyNetwork:
+                        reporter.log("    attachmentType: HostOnlyNetwork (%s)" % (oNic.attachmentType,));
+                        reporter.log("    hostonly-net: %s" % (oNic.hostOnlyNetwork,));
+                elif self.fpApiVer >= 4.1:
                     if oNic.attachmentType == vboxcon.NetworkAttachmentType_Generic:
                         reporter.log("    attachmentType: Generic (%s)" % (oNic.attachmentType,));

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

@@ -1493 +1493 @@
                 reporter.log("Created host only NIC: '%s'" % (sRetName,));
 
+        elif self.fpApiVer >= 7.0 and eAttachmentType == vboxcon.NetworkAttachmentType_HostOnlyNetwork:
+            aoHostNetworks = self.oVBoxMgr.getArray(self.oVBox, 'hostOnlyNetworks');
+            if aoHostNetworks:
+                sRetName = aoHostNetworks[0].networkName;
+            else:
+                try:
+                    oHostOnlyNet = self.oVBox.createHostOnlyNetwork('Host-only Test Network');
+                    oHostOnlyNet.lowerIP = '192.168.56.1';
+                    oHostOnlyNet.upperIP = '192.168.56.199';
+                    oHostOnlyNet.networkMask = '255.255.255.0';
+                    sRetName = oHostOnlyNet.networkName;
+                except:
+                    reporter.errorXcpt();
+                    return '';
+
         elif eAttachmentType == vboxcon.NetworkAttachmentType_Internal:
             sRetName = 'VBoxTest';
@@ -1571 +1586 @@
                     except:
                         reporter.errorXcpt('failed to set the internalNetwork property on slot %s to "%s" for VM "%s"'
+                                           % (iNic, sName, self.sName,));
+                        return False;
+                elif self.fpApiVer >= 7.0 and eAttachmentType == vboxcon.NetworkAttachmentType_HostOnlyNetwork:
+                    try:
+                        oNic.hostOnlyNetwork = sName;
+                    except:
+                        reporter.errorXcpt('failed to set the hostOnlyNetwork property on slot %s to "%s" for VM "%s"'
                                            % (iNic, sName, self.sName,));
                         return False;

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

@@ -242 +242 @@
             if self.sKind in ('WindowsXP','WindowsXP_64',):
                 eNic0AttachType = vboxcon.NetworkAttachmentType_HostOnly;
+
+        #
+        # Use host-only networks instead of host-only adapters for trunk builds on Mac OS.
+        #
+        if eNic0AttachType == vboxcon.NetworkAttachmentType_HostOnly \
+            and utils.getHostOs() == 'darwin' \
+            and oTestDrv.fpApiVer >= 7.0:
+            eNic0AttachType = vboxcon.NetworkAttachmentType_HostOnlyNetwork;
 
         return vboxtestvms.BaseTestVm._createVmDoIt(self, oTestDrv, eNic0AttachType, sDvdImage);