Changeset 72298 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

May 23, 2018 12:24:41 PM (7 years ago)

Author:

vboxsync

Message:

valkit/vboxwrappers.py: Use common.netutils functions for getting the host IP and name.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py (modified) (2 diffs)

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

@@ -38 +38 @@
 # Validation Kit imports.
 from common     import utils;
+from common     import netutils;
 from testdriver import base;
 from testdriver import reporter;
@@ -1530 +1531 @@
         """
 
-        # Resolve missing MAC address prefix
-        cchMacAddr = len(sMacAddr)
+        # Resolve missing MAC address prefix by feeding in the host IP address bytes.
+        cchMacAddr = len(sMacAddr);
         if cchMacAddr > 0 and cchMacAddr < 12:
-            sHostName = ''
-            try:
-                sHostName = socket.getfqdn()
-                if '.' not in sHostName and not sHostName.startswith('localhost'):
-                    # somewhat misconfigured system, needs expensive approach to guessing FQDN
-                    for aAI in socket.getaddrinfo(sHostName, None):
-                        sName, _ = socket.getnameinfo(aAI[4], 0)
-                        if '.' in sName and not set(sName).issubset(set('0123456789.')) and not sName.startswith('localhost'):
-                            sHostName = sName
-                            break
-
-                sHostIP = socket.gethostbyname(sHostName)
-                abHostIP = socket.inet_aton(sHostIP)
-                if sys.version_info[0] < 3:
-                    abHostIP = (ord(abHostIP[0]), ord(abHostIP[1]), ord(abHostIP[2]), ord(abHostIP[3]));
-            except:
-                return reporter.errorXcpt('failed to determine the host IP for "%s".' % (sHostName,))
+            sHostIP = netutils.getPrimaryHostIp();
+            abHostIP = socket.inet_aton(sHostIP);
+            if sys.version_info[0] < 3:
+                abHostIP = (ord(abHostIP[0]), ord(abHostIP[1]), ord(abHostIP[2]), ord(abHostIP[3]));
+
             if   abHostIP[0] == 127 \
               or (abHostIP[0] == 169 and abHostIP[1] == 254) \
               or (abHostIP[0] == 192 and abHostIP[1] == 168 and abHostIP[2] == 56):
-                return reporter.error('host IP for "%s" is %s, most likely not unique.' % (sHostName, sHostIP))
-
-            sDefaultMac = '%02X%02X%02X%02X%02X%02X' \
-                % (0x02, abHostIP[0], abHostIP[1], abHostIP[2], abHostIP[3], iNic)
-            sMacAddr = sDefaultMac[0:(12 - cchMacAddr)] + sMacAddr
+                return reporter.error('host IP for "%s" is %s, most likely not unique.' % (netutils.getHostnameFqdn(), sHostIP,));
+
+            sDefaultMac = '%02X%02X%02X%02X%02X%02X' % (0x02, abHostIP[0], abHostIP[1], abHostIP[2], abHostIP[3], iNic);
+            sMacAddr = sDefaultMac[0:(12 - cchMacAddr)] + sMacAddr;
 
         # Get the NIC object and try set it address.
         try:
-            oNic = self.o.machine.getNetworkAdapter(iNic)
-        except:
-            return reporter.errorXcpt('getNetworkAdapter(%s) failed for "%s"' % (iNic, self.sName))
-
-        try:
-            oNic.MACAddress = sMacAddr
-        except:
-            return reporter.errorXcpt('failed to set the MAC address on slot %s to "%s" for VM "%s"' \
-                % (iNic, sMacAddr, self.sName))
-
-        reporter.log('set MAC address on slot %s to %s for VM "%s"' % (iNic, sMacAddr, self.sName))
-        return True
+            oNic = self.o.machine.getNetworkAdapter(iNic);
+        except:
+            return reporter.errorXcpt('getNetworkAdapter(%s) failed for "%s"' % (iNic, self.sName,));
+
+        try:
+            oNic.MACAddress = sMacAddr;
+        except:
+            return reporter.errorXcpt('failed to set the MAC address on slot %s to "%s" for VM "%s"'
+                                      % (iNic, sMacAddr, self.sName));
+
+        reporter.log('set MAC address on slot %s to %s for VM "%s"' % (iNic, sMacAddr, self.sName,));
+        return True;
 
     def setRamSize(self, cMB):