Merge lp:~rvb/maas/bug-1456892 into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Do not break the computation of the initial distro series if the OS associated with a node isn't part of the list of supported OS.

This is simple defensive programming: avoid breaking when the OS associated with a node isn't part of the list of supported OSes. Note that this may be indicative of a bigger problem… and the deployment might fail but things should obviously break in get_distro_series_initial().

[Gavin Panella (allenap)]

review: Approve

=== modified file 'src/maasserver/utils/osystems.py'
--- src/maasserver/utils/osystems.py	2014-09-22 14:28:42 +0000
+++ src/maasserver/utils/osystems.py	2015-05-21 09:48:44 +0000
@@ -151,6 +151,11 @@
             key_required = get_release_requires_key(release)
         else:
             key_required = ''
+    else:
+        # OS of the instance isn't part of the given OSes list so we can't
+        # figure out if the key is required or not, default to not requiring
+        # it.
+        key_required = ''
     if osystem_name is not None and osystem_name != '':
         if series is None:
             series = ''

=== modified file 'src/maasserver/utils/tests/test_osystems.py'
--- src/maasserver/utils/tests/test_osystems.py	2015-05-07 18:14:38 +0000
+++ src/maasserver/utils/tests/test_osystems.py	2015-05-21 09:48:44 +0000
@@ -212,6 +212,19 @@
             get_distro_series_initial(
                 [osystem], node, with_key_required=True))
 
+    def test_get_distro_series_initial_works_around_conflicting_os(self):
+        # Test for bug 1456892.
+        releases = [
+            make_rpc_release(requires_license_key=True) for _ in range(3)]
+        osystem = make_rpc_osystem(releases=releases)
+        release = random.choice(releases)
+        node = factory.make_Node(
+            osystem=osystem['name'], distro_series=release['name'])
+        self.assertEqual(
+            '%s/%s' % (osystem['name'], release['name']),
+            get_distro_series_initial(
+                [], node, with_key_required=True))
+
     def test_list_commissioning_choices_returns_empty_list_if_not_ubuntu(self):
         osystem = make_rpc_osystem()
         self.assertEqual([], list_commissioning_choices([osystem]))