Merge lp:~mpontillo/maas/netaddr-assumes-mac-oui-ascii--bug-1628761 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Add except clause for UnicodeError while getting EUI registration.

[Blake Rouse (blake-rouse)]

Sucks this has to be performed. Looks good otherwise.

review: Approve

=== modified file 'src/provisioningserver/utils/network.py'
--- src/provisioningserver/utils/network.py	2016-09-23 15:26:39 +0000
+++ src/provisioningserver/utils/network.py	2016-10-04 04:38:18 +0000
@@ -802,6 +802,11 @@
         registration = eui.oui.registration()
         # Note that `registration` is not a dictionary, so we can't use .get().
         return registration['org']
+    except UnicodeError:
+        # See bug #1628761. Due to corrupt data in the OUI database, and/or
+        # the fact that netaddr assumes all the data is ASCII, sometimes
+        # netaddr will raise an exception during this process.
+        return None
     except NotRegisteredError:
         # This could happen for locally-administered MACs.
         return None

=== modified file 'src/provisioningserver/utils/tests/test_network.py'
--- src/provisioningserver/utils/tests/test_network.py	2016-08-20 13:58:58 +0000
+++ src/provisioningserver/utils/tests/test_network.py	2016-10-04 04:38:18 +0000
@@ -14,6 +14,7 @@
     IPPROTO_TCP,
 )
 from unittest import mock
+from unittest.mock import Mock
 
 from maastesting.factory import factory
 from maastesting.matchers import (
@@ -207,6 +208,14 @@
         organization = get_eui_organization(EUI("48:51:b7:00:00:00"))
         self.assertThat(organization, Equals("Intel Corporate"))
 
+    def test_get_eui_organization_returns_None_for_UnicodeError(self):
+        mock_eui = Mock()
+        mock_eui.oui = Mock()
+        mock_eui.oui.registration = Mock()
+        mock_eui.oui.registration.side_effect = UnicodeError
+        organization = get_eui_organization(mock_eui)
+        self.assertThat(organization, Is(None))
+
     def test_get_eui_organization_returns_none_for_invalid_mac(self):
         organization = get_eui_organization(EUI("FF:FF:b7:00:00:00"))
         self.assertThat(organization, Is(None))