Merge lp:~liv3d/maas/windows_allow_all into lp:~maas-committers/maas/trunk

[Dan Offord]

  Allow Windows images of any name to be valid

  There is a use case where you may want/need multiple Windows versions with
  different setups, but to still be one of the 6 currently allowed O/S.

  This change is also useful if in a specific use case the Windows build was
  dated with the date of build/last Windows Update baked in to it.

  If one of the previously allowed 6 names are used for the Windows image, it
  will still correctly give the title as expected, otherwise return the release
  name.

  Allow Windows images of any name to be valid

  There is a use case where you may want/need multiple Windows versions with
  different setups, but to still be one of the 6 currently allowed O/S.

  This change is also useful if in a specific use case the Windows build was
  dated with the date of build/last Windows Update baked in to it.

  If one of the previously allowed 6 names are used for the Windows image, it
  will still correctly give the title as expected, otherwise return the release
  name.

[Mike Pontillo (mpontillo)]

Thanks for your contribution. Unfortunately there is legal due diligence that must happen first. Would you please follow the instructions here?

    https://www.ubuntu.com/legal/contributors

We would be happy to consider your contributions after the agreement is in place.

As for the code, I'm confused about the requirement here. It looks like some validation is being bypassed here for Windows images, and it's not clear to me what the side effects might be. I read your commit message, but still don't fully understand. So a couple things we'll need to happen before we consider this change:

 - Please add additional comments to the code indicating why the is_release_supported() check is being bypassed. (It's not clear to me what side effects this might have.)

 - Please add unit tests for this change in order to prevent regressions (and, again, better capture the requirement).

review: Needs Information

[Mike Pontillo (mpontillo)]

Moving to "Rejected" due to lack of activity. We would be happy to consider this patch (given that the above concerns are addressed) or talk about other ways to meet your requirements. Let us know.

Unmerged revisions

5866. By Dan Offord <email address hidden> on 2017-03-28

Allow Windows images of any name to be valid

There is a use case where you may want/need multiple Windows versions with
different setups, but to still be one of the 6 currently allowed O/S.

This change is also useful if in a specific use case the Windows build was
dated with the date of build/last Windows Update baked in to it.

If one of the previously allowed 6 names are used for the Windows image, it
will still correctly give the title as expected, otherwise return the release
name.

=== modified file 'src/provisioningserver/drivers/osystem/windows.py'
--- src/provisioningserver/drivers/osystem/windows.py	2017-02-17 14:23:04 +0000
+++ src/provisioningserver/drivers/osystem/windows.py	2017-03-28 10:48:49 +0000
@@ -56,8 +56,9 @@
         return purposes
 
     def is_release_supported(self, release):
-        """Return True when the release is supported, False otherwise."""
-        return release in WINDOWS_CHOICES
+        """ To allow for customised Windows images, always return True. If we
+        know about the release return the title below."""
+        return True
 
     def get_default_release(self):
         """Gets the default release to use when a release is not
@@ -65,8 +66,11 @@
         return WINDOWS_DEFAULT
 
     def get_release_title(self, release):
-        """Return the title for the given release."""
-        return WINDOWS_CHOICES.get(release)
+        """Return the title for the given release, if known otherwise return
+        the release."""
+        if release in WINDOWS_CHOICES:
+            return WINDOWS_CHOICES.get(release)
+        return release
 
     def requires_license_key(self, release):
         return release in REQUIRE_LICENSE_KEY