Merge lp:~mpontillo/maas/fix-map-interfaces-by-mac-failure-with-bond-driver-loaded into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Make map_interfaces_by_mac() more robust by ignoring files in /sys/class/net (objects that do not represent interfaces are not directories)

The unit tests fail as follows when the bonding driver is loaded, and no bond interfaces are configured:

http://paste.ubuntu.com/11727748/

I'm not certain, but I think this may fail in production if the bonding driver is loaded. If so, this is a critical bug that should be backported to 1.8.

[Raphaël Badin (rvb)]

Looks good, defensive programming FTW. Can you confirm that this is indeed a critical bug? Tweak the preseed to load the bonding driver and make sure the deploy fails. If it fails (and this fixes the problem), let's file a critical bug, add a mention to the 1.8.0 changelog and backport this to 1.8.

review: Approve

[Raphaël Badin (rvb)]

I think we want to get 1.8 out of the door right now so, if this is confirmed, let's target 1.8.1.

[Mike Pontillo (mpontillo)]

Yeah, let me land this and then look into that for the 1.8 version of this branch.

=== modified file 'etc/maas/templates/deployment-user-data/maas_configure_interfaces.py'
--- etc/maas/templates/deployment-user-data/maas_configure_interfaces.py	2015-05-07 18:14:38 +0000
+++ etc/maas/templates/deployment-user-data/maas_configure_interfaces.py	2015-06-16 23:14:48 +0000
@@ -26,7 +26,10 @@
 __metaclass__ = type
 
 from argparse import ArgumentParser
-from errno import ENOENT
+from errno import (
+    ENOENT,
+    ENOTDIR,
+)
 from logging import getLogger
 from os import (
     listdir,
@@ -120,9 +123,9 @@
             mac = read_file(
                 os.path.join('/sys/class/net', interface, 'address'))
         except IOError as e:
-            # Tolerate file-not-found errors, to absorb any variability in
-            # the /sys/class/net API that doesn't concern us.
-            if e.errno != ENOENT:
+            # Tolerate file or directory not found errors, to absorb any
+            # variability in the /sys/class/net API that doesn't concern us.
+            if e.errno != ENOENT and e.errno != ENOTDIR:
                 raise
         else:
             mac = normalise_mac(mac)