Merge lp:~mpontillo/maas/remove-check-compatibility-option-bug-1461977 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Remove obsolete 'Check component compatibility and certification' option.

[Gavin Panella (allenap)]

For users with a non-default value for "check_compatibility", is there anything that will puke on it? If so, a data migration to remove the config setting is probably in order.

review: Approve

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[Mike Pontillo (mpontillo)]

I did a sanity check in the dev env to make sure nothing puked, so I think we're okay.

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2015-05-20 12:41:00 +0000
+++ src/maasserver/forms.py	2015-06-04 14:32:29 +0000
@@ -1351,7 +1351,6 @@
 
 class CommissioningForm(ConfigForm):
     """Settings page, Commissioning section."""
-    check_compatibility = get_config_field('check_compatibility')
 
     def __init__(self, *args, **kwargs):
         # Skip ConfigForm.__init__ because we need the form intialized but

=== modified file 'src/maasserver/forms_settings.py'
--- src/maasserver/forms_settings.py	2015-05-13 19:20:54 +0000
+++ src/maasserver/forms_settings.py	2015-06-04 14:32:29 +0000
@@ -123,14 +123,6 @@
 
 
 CONFIG_ITEMS = {
-    'check_compatibility': {
-        'default': False,
-        'form': forms.BooleanField,
-        'form_kwargs': {
-            'required': False,
-            'label': "Check component compatibility and certification"
-        }
-    },
     'main_archive': {
         'default': 'http://archive.ubuntu.com/ubuntu',
         'form': forms.URLField,

=== modified file 'src/maasserver/models/config.py'
--- src/maasserver/models/config.py	2015-05-13 19:20:54 +0000
+++ src/maasserver/models/config.py	2015-06-04 14:32:29 +0000
@@ -41,10 +41,10 @@
 
 
 def get_default_config():
+    """
+    :return: A dictionary mapping default settings keys to default values.
+    """
     return {
-        # # settings default values.
-        # Commissioning section configuration.
-        'check_compatibility': False,
         # Ubuntu section configuration.
         'main_archive': 'http://archive.ubuntu.com/ubuntu',
         'ports_archive': 'http://ports.ubuntu.com/ubuntu-ports',

=== modified file 'src/maasserver/views/tests/test_settings.py'
--- src/maasserver/views/tests/test_settings.py	2015-05-13 19:20:54 +0000
+++ src/maasserver/views/tests/test_settings.py	2015-06-04 14:32:29 +0000
@@ -117,14 +117,12 @@
         osystem = make_rpc_osystem('ubuntu', releases=[release])
         patch_usable_osystems(self, [osystem])
 
-        new_check_compatibility = factory.pick_bool()
         new_commissioning = release['name']
         response = self.client.post(
             reverse('settings'),
             get_prefixed_form_data(
                 prefix='commissioning',
                 data={
-                    'check_compatibility': new_check_compatibility,
                     'commissioning_distro_series': (
                         new_commissioning),
                 }))
@@ -132,11 +130,9 @@
         self.assertEqual(httplib.FOUND, response.status_code)
         self.assertEqual(
             (
-                new_check_compatibility,
                 new_commissioning,
             ),
             (
-                Config.objects.get_config('check_compatibility'),
                 Config.objects.get_config('commissioning_distro_series'),
             ))