Changeset 79908 in vbox

Timestamp:

Jul 20, 2019 3:56:15 AM (6 years ago)

Author:

vboxsync

Message:

ValKit: Use IDHCPServer::findLeaseByMAC to resolve VM IP addresses when using host-only networking. This enables us to do unattended ubuntu installs w/o GAs. Reenabled newer ubuntu tests where GAs doesn't quite install yet, adding 19.04. bugref:9151

Location:

trunk/src/VBox/ValidationKit

Files:

• common/utils.py (modified) (2 diffs)
• testdriver/vboxwrappers.py (modified) (7 diffs)
• tests/installation/tdGuestOsUnattendedInst1.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/common/utils.py

@@ -1352 +1352 @@
     return time.time();
 
-
 def timestampNano():
     """
@@ -1376 +1375 @@
         return long(_winFloatTime());
     return long(time.time());
+
+def secondsSinceUnixEpoch():
+    """
+    Returns unix time, floating point second count since 1970-01-01T00:00:00Z
+    """
+    ## ASSUMES This returns unix epoch time on all systems we care about...
+    return time.time();
 
 def getTimePrefix():

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

@@ -2958 +2958 @@
     #
 
-    def txsConnectViaTcp(self, cMsTimeout = 10*60000, sIpAddr = None, sMacAddr = None, fNatForwardingForTxs = False):
+    def txsConnectViaTcp(self, cMsTimeout = 10*60000, sIpAddr = None, fNatForwardingForTxs = False):
         """
         Connects to the TXS using TCP/IP as transport.  If no IP or MAC is
@@ -2968 +2968 @@
         fReversedSetup = False;
         fUseNatForTxs  = False;
+        sMacAddr       = None;
+        oIDhcpServer   = None;
         if sIpAddr is None:
             try:
-                oNic = self.oVM.getNetworkAdapter(0);
-                if oNic.attachmentType == vboxcon.NetworkAttachmentType_NAT:
+                oNic              = self.oVM.getNetworkAdapter(0);
+                enmAttachmentType = oNic.attachmentType;
+                if enmAttachmentType == vboxcon.NetworkAttachmentType_NAT:
                     fUseNatForTxs = True;
+                elif enmAttachmentType == vboxcon.NetworkAttachmentType_HostOnly and not sIpAddr:
+                    # Get the MAC address and find the DHCP server.
+                    sMacAddr      = oNic.MACAddress;
+                    sHostOnlyNIC  = oNic.hostOnlyInterface;
+                    oIHostOnlyIf  = self.oVBox.host.findHostNetworkInterfaceByName(sHostOnlyNIC);
+                    sHostOnlyNet  = oIHostOnlyIf.networkName;
+                    oIDhcpServer  = self.oVBox.findDHCPServerByNetworkName(sHostOnlyNet);
             except:
                 reporter.errorXcpt();
                 return None;
+
         if fUseNatForTxs:
             fReversedSetup = not fNatForwardingForTxs;
@@ -2982 +2993 @@
         # Kick off the task.
         try:
-            oTask = TxsConnectTask(self, cMsTimeout, sIpAddr, sMacAddr, fReversedSetup,
+            oTask = TxsConnectTask(self, cMsTimeout, sIpAddr, sMacAddr, oIDhcpServer, fReversedSetup,
                                    fnProcessEvents = self.oTstDrv.processPendingEvents);
         except:
@@ -3052 +3063 @@
 
 
-    def __init__(self, oSession, cMsTimeout, sIpAddr, sMacAddr, fReversedSetup, fnProcessEvents = None):
-        TdTaskBase.__init__(self, utils.getCallerName());
+    def __init__(self, oSession, cMsTimeout, sIpAddr, sMacAddr, oIDhcpServer, fReversedSetup, fnProcessEvents = None):
+        TdTaskBase.__init__(self, utils.getCallerName(), fnProcessEvents = fnProcessEvents);
         self.cMsTimeout         = cMsTimeout;
         self.fnProcessEvents    = fnProcessEvents;
@@ -3059 +3070 @@
         self.sNextIpAddr        = None;
         self.sMacAddr           = sMacAddr;
+        self.oIDhcpServer       = oIDhcpServer;
         self.fReversedSetup     = fReversedSetup;
         self.oVBoxEventHandler  = None;
         self.oTxsSession        = None;
 
-        # Skip things we don't implement.
-        if sMacAddr is not None:
-            reporter.error('TxsConnectTask does not implement sMacAddr yet');
+        # Check that the input makes sense:
+        if   (sMacAddr is None) != (oIDhcpServer is None)  \
+          or (sMacAddr and fReversedSetup) \
+          or (sMacAddr and sIpAddr):
+            reporter.error('TxsConnectTask sMacAddr=%s oIDhcpServer=%s sIpAddr=%s fReversedSetup=%s'
+                           % (sMacAddr, oIDhcpServer, sIpAddr, fReversedSetup,));
             raise base.GenError();
 
@@ -3100 +3115 @@
                 if sIpAddr is not None:
                     self._setIp(sIpAddr);
+
+            #
+            # If the network adapter of the VM is host-only we can talk poll IDHCPServer
+            # for the guest IP, allowing us to detect it for VMs without guest additions.
+            # This will when we're polled.
+            #
+            if sMacAddr is not None:
+                assert self.oIDhcpServer is not None;
+
+
         # end __init__
 
@@ -3203 +3228 @@
             self._deregisterEventHandler();
         return True;
+
+    def _pollDhcpServer(self):
+        """
+        Polls the DHCP server by MAC address in host-only setups.
+        """
+
+        if self.sIpAddr:
+            return False;
+
+        if self.oIDhcpServer is None or not self.sMacAddr:
+            return False;
+
+        try:
+            (sIpAddr, sState, secIssued, secExpire) = self.oIDhcpServer.findLeaseByMAC(self.sMacAddr, 0);
+        except:
+            reporter.log2Xcpt('sMacAddr=%s' % (self.sMacAddr,));
+            return False;
+
+        secNow = utils.secondsSinceUnixEpoch();
+        reporter.log2('dhcp poll: secNow=%s secExpire=%s secIssued=%s sState=%s sIpAddr=%s'
+                      % (secNow, secExpire, secIssued, sState, sIpAddr,));
+        if secNow > secExpire or sState != 'acked' or not sIpAddr:
+            return False;
+
+        reporter.log('dhcp poll: sIpAddr=%s secExpire=%s (%s TTL) secIssued=%s (%s ago)'
+                     % (sIpAddr, secExpire, secExpire - secNow, secIssued, secNow - secIssued,));
+        self._setIp(sIpAddr);
+        return True;
+
+    #
+    # Task methods
+    #
+
+    def pollTask(self, fLocked = False):
+        """
+        Overridden pollTask method.
+        """
+        self._pollDhcpServer();
+        return TdTaskBase.pollTask(self, fLocked);
 
     #

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

@@ -61 +61 @@
     ## @name VM option flags (OR together).
     ## @{
-    kfUbuntuAvx2Crash       = 0x0001; ## < Disables AVX2 as ubuntu 16.04 think it means AVX512 is available and compiz crashes.
+    kfUbuntuAvx2Crash       = 0x0001; ##< Disables AVX2 as ubuntu 16.04 think it means AVX512 is available and compiz crashes.
+    kfNoGAs                 = 0x0002; ##< No guest additions installation possible.
     kfIdeIrqDelay           = 0x1000;
     kfUbuntuNewAmdBug       = 0x2000;
@@ -113 +114 @@
         #
         if self.fOptInstallAdditions:
-            try:    oIUnattended.installGuestAdditions = True;
-            except: return reporter.errorXcpt();
-            try:    oIUnattended.additionsIsoPath      = oTestDrv.getGuestAdditionsIso();
-            except: return reporter.errorXcpt();
-            oTestDrv.processPendingEvents();
+            if (self.fInstVmFlags & self.kfNoGAs) == 0:
+                try:    oIUnattended.installGuestAdditions = True;
+                except: return reporter.errorXcpt();
+                try:    oIUnattended.additionsIsoPath      = oTestDrv.getGuestAdditionsIso();
+                except: return reporter.errorXcpt();
+                oTestDrv.processPendingEvents();
+            else:
+                reporter.log("Warning! Ignoring request to install Guest Additions as kfNoGAs is set!");
 
         return True;
@@ -405 +409 @@
             ## @todo ubuntu 17.10, 18.04 & 18.10 do not work.  They misses all the the build tools (make, gcc, perl, ++)
             ##       and has signed kmods:
-            ## @todo Mark these as no-install-additions for the time being?
-            #UnattendedVm(oSet, 'tst-ubuntu-17.10-64', 'Ubuntu_64', '6.0/uaisos/ubuntu-17.10-desktop-amd64.iso'), # >4.0Gib
-            #UnattendedVm(oSet, 'tst-ubuntu-18.04-64', 'Ubuntu_64', '6.0/uaisos/ubuntu-18.04-desktop-amd64.iso'), # >5.7GiB
-            #UnattendedVm(oSet, 'tst-ubuntu-18.10-64', 'Ubuntu_64', '6.0/uaisos/ubuntu-18.10-desktop-amd64.iso'),
+            UnattendedVm(oSet, 'tst-ubuntu-17.10-64', 'Ubuntu_64', '6.0/uaisos/ubuntu-17.10-desktop-amd64.iso', # >4.0Gib
+                         UnattendedVm.kfNoGAs),
+            UnattendedVm(oSet, 'tst-ubuntu-18.04-64', 'Ubuntu_64', '6.0/uaisos/ubuntu-18.04-desktop-amd64.iso', # >5.7GiB
+                         UnattendedVm.kfNoGAs),
+            # 18.10 hangs reading install DVD during "starting partitioner..."
+            #UnattendedVm(oSet, 'tst-ubuntu-18.10-64', 'Ubuntu_64', '6.0/uaisos/ubuntu-18.10-desktop-amd64.iso',
+            #             UnattendedVm.kfNoGAs),
+            UnattendedVm(oSet, 'tst-ubuntu-19.04-64', 'Ubuntu_64', '6.0/uaisos/ubuntu-19.04-desktop-amd64.iso', # >5.6GiB
+                         UnattendedVm.kfNoGAs),
         ]);
         self.oTestVmSet = oSet;