launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/maas-remove-dhcp into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/maas-remove-dhcp/+merge/99668

Remove DHCP option from settings.
-- 
https://code.launchpad.net/~rvb/maas/maas-remove-dhcp/+merge/99668
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/maas-remove-dhcp into lp:maas.

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2012-03-22 17:33:26 +0000
+++ src/maasserver/forms.py	2012-03-28 06:23:17 +0000
@@ -265,8 +265,6 @@
 class MAASAndNetworkForm(ConfigForm):
     """Settings page, MAAS and Network section."""
     maas_name = forms.CharField(label="MAAS name")
-    provide_dhcp = forms.BooleanField(
-        label="Provide DHCP on this subnet", required=False)
 
 
 class CommissioningForm(ConfigForm):

=== modified file 'src/maasserver/models.py'
--- src/maasserver/models.py	2012-03-27 10:40:40 +0000
+++ src/maasserver/models.py	2012-03-28 06:23:17 +0000
@@ -849,7 +849,6 @@
             [['archive.ubuntu.com', 'archive.ubuntu.com']]),
         # Network section configuration.
         'maas_name': gethostname(),
-        'provide_dhcp': False,
         ## /settings
         }
 

=== modified file 'src/maasserver/tests/test_views.py'
--- src/maasserver/tests/test_views.py	2012-03-23 19:20:59 +0000
+++ src/maasserver/tests/test_views.py	2012-03-28 06:23:17 +0000
@@ -515,20 +515,16 @@
 
     def test_settings_maas_and_network_POST(self):
         new_name = factory.getRandomString()
-        new_provide_dhcp = factory.getRandomBoolean()
         response = self.client.post(
             '/settings/',
             get_prefixed_form_data(
                 prefix='maas_and_network',
                 data={
                     'maas_name': new_name,
-                    'provide_dhcp': new_provide_dhcp,
                 }))
 
         self.assertEqual(httplib.FOUND, response.status_code)
         self.assertEqual(new_name, Config.objects.get_config('maas_name'))
-        self.assertEqual(
-            new_provide_dhcp, Config.objects.get_config('provide_dhcp'))
 
     def test_settings_commissioning_POST(self):
         new_after_commissioning = factory.getRandomEnum(