launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/doris-lint-munch-munch into lp:maas.

Commit message:
Remove some unneeded imports.  Looks like they happened while resolving a conflict involving code removal in trunk: the removed code's imports survived the merge.  I'd guess it's where dhcp management moved from the NodeGroup model into the maasserver.dhcp module.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~jtv/maas/doris-lint-munch-munch/+merge/126158

See commit message.  No pre-imp.  But this MP should ensure that at least I have witnesses.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/doris-lint-munch-munch/+merge/126158
Your team MAAS Maintainers is requested to review the proposed merge of lp:~jtv/maas/doris-lint-munch-munch into lp:maas.

=== modified file 'src/maasserver/models/nodegroup.py'
--- src/maasserver/models/nodegroup.py	2012-09-24 06:48:02 +0000
+++ src/maasserver/models/nodegroup.py	2012-09-25 05:50:25 +0000
@@ -30,18 +30,13 @@
 from maasserver.models.nodegroupinterface import NodeGroupInterface
 from maasserver.models.timestampedmodel import TimestampedModel
 from maasserver.refresh_worker import refresh_worker
-from maasserver.server_address import get_maas_facing_server_address
 from maasserver.utils.orm import get_one
-from netaddr import IPAddress
 from piston.models import (
     KEY_SIZE,
     Token,
     )
 from provisioningserver.omshell import generate_omapi_key
-from provisioningserver.tasks import (
-    add_new_dhcp_host_map,
-    write_dhcp_config,
-    )
+from provisioningserver.tasks import add_new_dhcp_host_map
 
 
 class NodeGroupManager(Manager):

=== modified file 'src/maasserver/tests/test_nodegroup.py'
--- src/maasserver/tests/test_nodegroup.py	2012-09-24 06:06:47 +0000
+++ src/maasserver/tests/test_nodegroup.py	2012-09-25 05:50:25 +0000
@@ -12,15 +12,11 @@
 __metaclass__ = type
 __all__ = []
 
-from django.conf import settings
-import maasserver
-from maasserver.dns import get_dns_server_address
 from maasserver.enum import (
     NODEGROUP_STATUS,
     NODEGROUPINTERFACE_MANAGEMENT,
     )
 from maasserver.models import NodeGroup
-from maasserver.server_address import get_maas_facing_server_address
 from maasserver.testing import reload_object
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import TestCase