Merge lp:~andreserl/maas/lp1573046 into lp:maas/1.9

[Andres Rodriguez]

DistroInfo has changed and shows Xenial as LTS. As such, MAAS 1.9 no longer shows available commissioning images for Trusty. This ensures that commissioning images available are only the supported ones.

[Blake Rouse (blake-rouse)]

Code looks good, but no tests!

review: Needs Fixing

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~andreserl/maas/lp1573046 into lp:maas/1.9 failed. Below is the output from the failed tests.

Ign http://prodstack-zone-1.clouds.archive.ubuntu.com trusty InRelease
Get:1 http://security.ubuntu.com trusty-security InRelease [65.9 kB]
Get:2 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates InRelease [65.9 kB]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release
Get:3 http://security.ubuntu.com trusty-security/main Sources [112 kB]
Get:4 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Sources [273 kB]
Get:5 http://security.ubuntu.com trusty-security/universe Sources [35.5 kB]
Get:6 http://security.ubuntu.com trusty-security/main amd64 Packages [457 kB]
Get:7 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Sources [5,352 B]
Get:8 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Sources [154 kB]
Get:9 http://security.ubuntu.com trusty-security/universe amd64 Packages [126 kB]
Get:10 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Sources [5,928 B]
Get:11 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [755 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:12 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted amd64 Packages [15.9 kB]
Get:13 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [358 kB]
Get:14 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse amd64 Packages [13.2 kB]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restri...

[Blake Rouse (blake-rouse)]

======================================================================
FAIL: maasserver.api.tests.test_pxeconfig.TestPXEConfigAPI.test_pxeconfig_returns_commissioning_os_series_for_other_oses
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/tmp/tarmac/branch.9kmefJ/src/maastesting/runtest.py", line 68, in _run_user
    result = function(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 616, in _run_test_method
    return self._get_test_method()()
  File "/tmp/tarmac/branch.9kmefJ/src/maasserver/api/tests/test_pxeconfig.py", line 641, in test_pxeconfig_returns_commissioning_os_series_for_other_oses
    self.assertEqual(release, params_out["release"])
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 321, in assertEqual
    self.assertThat(observed, matcher, message)
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 406, in assertThat
    raise mismatch_error
MismatchError: 'xenial' != u'trusty'

[Andres Rodriguez (andreserl)]

fixed test!

review: Approve

=== modified file 'src/maasserver/api/tests/test_pxeconfig.py'
--- src/maasserver/api/tests/test_pxeconfig.py	2015-10-23 17:53:22 +0000
+++ src/maasserver/api/tests/test_pxeconfig.py	2016-04-21 16:06:20 +0000
@@ -617,7 +617,7 @@
 
     def test_pxeconfig_returns_commissioning_os_series_for_other_oses(self):
         osystem = Config.objects.get_config('default_osystem')
-        release = Config.objects.get_config('default_distro_series')
+        release = Config.objects.get_config('commissioning_distro_series')
         nodegroup = factory.make_NodeGroup()
         os_image = make_rpc_boot_image(purpose='xinstall')
         architecture = '%s/%s' % (

=== modified file 'src/provisioningserver/drivers/osystem/tests/test_ubuntu.py'
--- src/provisioningserver/drivers/osystem/tests/test_ubuntu.py	2015-09-10 19:19:24 +0000
+++ src/provisioningserver/drivers/osystem/tests/test_ubuntu.py	2016-04-21 16:06:20 +0000
@@ -36,6 +36,13 @@
                 return info._format("fullname", row)
         return None
 
+    def get_supported_lts_releases(self):
+        info = UbuntuDistroInfo()
+        unsupported_releases = ['precise', 'xenial']
+        return [name for name in info.supported()
+                if name not in unsupported_releases
+                if info.is_lts(name)]
+
     def test_get_boot_image_purposes(self):
         osystem = UbuntuOS()
         archs = [factory.make_name('arch') for _ in range(2)]
@@ -63,12 +70,12 @@
         osystem = UbuntuOS()
         expected = osystem.get_supported_commissioning_releases()
         self.assertIsInstance(expected, list)
-        self.assertEqual(expected, [self.get_lts_release()])
+        self.assertEqual(expected, self.get_supported_lts_releases())
 
     def test_default_commissioning_release(self):
         osystem = UbuntuOS()
         expected = osystem.get_default_commissioning_release()
-        self.assertEqual(expected, self.get_lts_release())
+        self.assertEqual(expected, 'trusty')
 
     def test_get_release_title(self):
         osystem = UbuntuOS()

=== modified file 'src/provisioningserver/drivers/osystem/ubuntu.py'
--- src/provisioningserver/drivers/osystem/ubuntu.py	2015-09-24 16:22:12 +0000
+++ src/provisioningserver/drivers/osystem/ubuntu.py	2016-04-21 16:06:20 +0000
@@ -57,14 +57,18 @@
         only exists on Ubuntu, because that is the only operating
         system that supports commissioning.
         """
-        return [self.get_lts_release()]
+        info = UbuntuDistroInfo()
+        unsupported_releases = ['precise', 'xenial']
+        return [name for name in info.supported()
+                if name not in unsupported_releases
+                if info.is_lts(name)]
 
     def get_default_commissioning_release(self):
         """Gets the default commissioning release for Ubuntu. This only exists
         on Ubuntu, because that is the only operating system that supports
         commissioning.
         """
-        return self.get_lts_release()
+        return 'trusty'
 
     def get_distro_series_info_row(self, release):
         """Returns the distro series row information from python-distro-info.