Changeset 71084 in vbox

Timestamp:

Feb 21, 2018 1:01:33 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: Turn the warning about likely non-unique IP detected for the host into an error, and teach the vsheriff to look for it. Usually happens with Linux and Solaris, who cleverly map their FQDN to an IP in localnet through /etc/hosts. bugref:7994

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vboxwrappers.py (modified) (2 diffs)
• testmanager/batch/virtual_test_sheriff.py (modified) (4 diffs)

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

@@ -1548 +1548 @@
                 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):
-                    reporter.log('warning: host IP for "%s" is %s, most likely not unique.' % (sHostName, sHostIP))
-            except:
-                reporter.errorXcpt('failed to determine the host IP for "%s".' % (sHostName,))
-                return False
+            except:
+                return reporter.errorXcpt('failed to determine the host IP for "%s".' % (sHostName,))
+            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)
@@ -1563 +1563 @@
             oNic = self.o.machine.getNetworkAdapter(iNic)
         except:
-            reporter.errorXcpt('getNetworkAdapter(%s) failed for "%s"' % (iNic, self.sName))
-            return False
+            return reporter.errorXcpt('getNetworkAdapter(%s) failed for "%s"' % (iNic, self.sName))
 
         try:
             oNic.MACAddress = sMacAddr
         except:
-            reporter.errorXcpt('failed to set the MAC address on slot %s to "%s" for VM "%s"' \
+            return reporter.errorXcpt('failed to set the MAC address on slot %s to "%s" for VM "%s"' \
                 % (iNic, sMacAddr, self.sName))
-            return False
 
         reporter.log('set MAC address on slot %s to %s for VM "%s"' % (iNic, sMacAddr, self.sName))

trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py

@@ -188 +188 @@
     def getMainLog(self):
         """
-        Tries to reads the main log file since this will be the first source of information.
+        Tries to read the main log file since this will be the first source of information.
         """
         if self.sMainLog:
@@ -205 +205 @@
     def getLogFile(self, oFile):
         """
-        Tries to reads the given file as a utf-8 log file.
+        Tries to read the given file as a utf-8 log file.
         oFile is a TestFileDataEx instance.
         Returns empty string if problems opening or reading the file.
@@ -486 +486 @@
     ktReason_Host_Modprobe_Failed                      = ( 'Host',              'Modprobe failed' );
     ktReason_Host_Install_Hang                         = ( 'Host',              'Install hang' );
+    ktReason_Host_NetworkMisconfiguration              = ( 'Host',              'Network misconfiguration' );
     ktReason_Networking_Nonexistent_host_nic           = ( 'Networking',        'Nonexistent host networking interface' );
     ktReason_OSInstall_GRUB_hang                       = ( 'O/S Install',       'GRUB hang' );
@@ -883 +884 @@
         ( True,  ktReason_OSInstall_Sata_no_BM,                     'PCHS=14128/14134/8224' ),
         ( True,  ktReason_Host_DoubleFreeHeap,                      'double free or corruption' ),
+        ( True,  ktReason_Host_NetworkMisconfiguration,             'most likely not unique' ),
     ];