Merge lp:~allenap/maas/move-forms-into-package into lp:~maas-committers/maas/trunk

[Gavin Panella]

Move maasserver.forms_* into a new maasserver.forms package.

"Namespaces are one honking great idea -- let's do more of those!" — The Zen of Python, by Tim Peters.

[Blake Rouse (blake-rouse)]

Looks very mechanical.

review: Approve

[Gavin Panella (allenap)]

> Looks very mechanical.

Yep, almost 100%.

Thanks!

=== modified file 'src/maasserver/api/blockdevices.py'
--- src/maasserver/api/blockdevices.py	2016-12-09 15:16:44 +0000
+++ src/maasserver/api/blockdevices.py	2017-02-09 15:43:04 +0000
@@ -26,7 +26,7 @@
     UpdatePhysicalBlockDeviceForm,
     UpdateVirtualBlockDeviceForm,
 )
-from maasserver.forms_filesystem import MountFilesystemForm
+from maasserver.forms.filesystem import MountFilesystemForm
 from maasserver.models import (
     BlockDevice,
     Machine,

=== modified file 'src/maasserver/api/dhcpsnippets.py'
--- src/maasserver/api/dhcpsnippets.py	2016-12-09 15:16:44 +0000
+++ src/maasserver/api/dhcpsnippets.py	2017-02-09 15:43:04 +0000
@@ -14,7 +14,7 @@
     OperationsHandler,
 )
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.forms_dhcpsnippet import DHCPSnippetForm
+from maasserver.forms.dhcpsnippet import DHCPSnippetForm
 from maasserver.models import DHCPSnippet
 from piston3.utils import rc
 

=== modified file 'src/maasserver/api/dnsresourcerecords.py'
--- src/maasserver/api/dnsresourcerecords.py	2016-12-09 15:16:44 +0000
+++ src/maasserver/api/dnsresourcerecords.py	2017-02-09 15:43:04 +0000
@@ -12,8 +12,8 @@
     MAASAPIBadRequest,
     MAASAPIValidationError,
 )
-from maasserver.forms_dnsdata import DNSDataForm
-from maasserver.forms_dnsresource import DNSResourceForm
+from maasserver.forms.dnsdata import DNSDataForm
+from maasserver.forms.dnsresource import DNSResourceForm
 from maasserver.models import (
     DNSData,
     DNSResource,

=== modified file 'src/maasserver/api/dnsresources.py'
--- src/maasserver/api/dnsresources.py	2016-12-09 15:16:44 +0000
+++ src/maasserver/api/dnsresources.py	2017-02-09 15:43:04 +0000
@@ -9,7 +9,7 @@
 )
 from maasserver.enum import NODE_PERMISSION
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.forms_dnsresource import DNSResourceForm
+from maasserver.forms.dnsresource import DNSResourceForm
 from maasserver.models import (
     DNSResource,
     Domain,

=== modified file 'src/maasserver/api/domains.py'
--- src/maasserver/api/domains.py	2016-12-09 15:16:44 +0000
+++ src/maasserver/api/domains.py	2017-02-09 15:43:04 +0000
@@ -12,7 +12,7 @@
 from maasserver.dns.config import dns_force_reload
 from maasserver.enum import NODE_PERMISSION
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.forms_domain import DomainForm
+from maasserver.forms.domain import DomainForm
 from maasserver.models import Domain
 from maasserver.models.dnspublication import zone_serial
 from maasserver.sequence import INT_MAX

=== modified file 'src/maasserver/api/fabrics.py'
--- src/maasserver/api/fabrics.py	2016-12-09 15:16:44 +0000
+++ src/maasserver/api/fabrics.py	2017-02-09 15:43:04 +0000
@@ -9,7 +9,7 @@
 )
 from maasserver.enum import NODE_PERMISSION
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.forms_fabric import FabricForm
+from maasserver.forms.fabric import FabricForm
 from maasserver.models import Fabric
 from piston3.utils import rc
 

=== modified file 'src/maasserver/api/fannetworks.py'
--- src/maasserver/api/fannetworks.py	2016-12-09 15:16:44 +0000
+++ src/maasserver/api/fannetworks.py	2017-02-09 15:43:04 +0000
@@ -9,7 +9,7 @@
 )
 from maasserver.enum import NODE_PERMISSION
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.forms_fannetwork import FanNetworkForm
+from maasserver.forms.fannetwork import FanNetworkForm
 from maasserver.models import FanNetwork
 from piston3.utils import rc
 

=== modified file 'src/maasserver/api/interfaces.py'
--- src/maasserver/api/interfaces.py	2017-01-26 22:28:41 +0000
+++ src/maasserver/api/interfaces.py	2017-02-09 15:43:04 +0000
@@ -25,7 +25,7 @@
     MAASAPIValidationError,
     NodeStateViolation,
 )
-from maasserver.forms_interface import (
+from maasserver.forms.interface import (
     AcquiredBridgeInterfaceForm,
     BondInterfaceForm,
     BridgeInterfaceForm,
@@ -35,7 +35,7 @@
     PhysicalInterfaceForm,
     VLANInterfaceForm,
 )
-from maasserver.forms_interface_link import (
+from maasserver.forms.interface_link import (
     InterfaceLinkForm,
     InterfaceSetDefaultGatwayForm,
     InterfaceUnlinkForm,

=== modified file 'src/maasserver/api/ipranges.py'
--- src/maasserver/api/ipranges.py	2016-12-09 15:16:44 +0000
+++ src/maasserver/api/ipranges.py	2017-02-09 15:43:04 +0000
@@ -9,7 +9,7 @@
     MAASAPIForbidden,
     MAASAPIValidationError,
 )
-from maasserver.forms_iprange import IPRangeForm
+from maasserver.forms.iprange import IPRangeForm
 from maasserver.models import IPRange
 from piston3.utils import rc
 

=== modified file 'src/maasserver/api/maas.py'
--- src/maasserver/api/maas.py	2016-09-01 13:12:15 +0000
+++ src/maasserver/api/maas.py	2017-02-09 15:43:04 +0000
@@ -19,7 +19,7 @@
 from maasserver.api.utils import get_mandatory_param
 from maasserver.exceptions import MAASAPIValidationError
 from maasserver.forms import UbuntuForm
-from maasserver.forms_settings import (
+from maasserver.forms.settings import (
     get_config_doc,
     get_config_form,
     validate_config_name,

=== modified file 'src/maasserver/api/machines.py'
--- src/maasserver/api/machines.py	2017-02-04 02:07:50 +0000
+++ src/maasserver/api/machines.py	2017-02-09 15:43:04 +0000
@@ -62,8 +62,8 @@
     get_machine_create_form,
     get_machine_edit_form,
 )
-from maasserver.forms_ephemeral import CommissionForm
-from maasserver.forms_filesystem import (
+from maasserver.forms.ephemeral import CommissionForm
+from maasserver.forms.filesystem import (
     MountNonStorageFilesystemForm,
     UnmountNonStorageFilesystemForm,
 )

=== modified file 'src/maasserver/api/nodes.py'
--- src/maasserver/api/nodes.py	2017-02-08 00:08:55 +0000
+++ src/maasserver/api/nodes.py	2017-02-09 15:43:04 +0000
@@ -43,7 +43,7 @@
 )
 from maasserver.fields import MAC_RE
 from maasserver.forms import BulkNodeActionForm
-from maasserver.forms_ephemeral import TestForm
+from maasserver.forms.ephemeral import TestForm
 from maasserver.models import (
     Interface,
     Node,

=== modified file 'src/maasserver/api/packagerepositories.py'
--- src/maasserver/api/packagerepositories.py	2016-12-09 15:16:44 +0000
+++ src/maasserver/api/packagerepositories.py	2017-02-09 15:43:04 +0000
@@ -11,7 +11,7 @@
     OperationsHandler,
 )
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.forms_packagerepository import PackageRepositoryForm
+from maasserver.forms.packagerepository import PackageRepositoryForm
 from maasserver.models import PackageRepository
 from piston3.utils import rc
 

=== modified file 'src/maasserver/api/partitions.py'
--- src/maasserver/api/partitions.py	2016-12-09 15:16:44 +0000
+++ src/maasserver/api/partitions.py	2017-02-09 15:43:04 +0000
@@ -23,7 +23,7 @@
     AddPartitionForm,
     FormatPartitionForm,
 )
-from maasserver.forms_filesystem import MountFilesystemForm
+from maasserver.forms.filesystem import MountFilesystemForm
 from maasserver.models import (
     BlockDevice,
     Partition,

=== modified file 'src/maasserver/api/pods.py'
--- src/maasserver/api/pods.py	2017-02-07 20:45:00 +0000
+++ src/maasserver/api/pods.py	2017-02-09 15:43:04 +0000
@@ -14,7 +14,7 @@
     OperationsHandler,
 )
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.forms_pods import (
+from maasserver.forms.pods import (
     ComposeMachineForm,
     PodForm,
 )

=== modified file 'src/maasserver/api/spaces.py'
--- src/maasserver/api/spaces.py	2017-01-27 17:22:47 +0000
+++ src/maasserver/api/spaces.py	2017-02-09 15:43:04 +0000
@@ -13,7 +13,7 @@
     MAASAPIBadRequest,
     MAASAPIValidationError,
 )
-from maasserver.forms_space import SpaceForm
+from maasserver.forms.space import SpaceForm
 from maasserver.models import (
     Space,
     Subnet,

=== modified file 'src/maasserver/api/staticroutes.py'
--- src/maasserver/api/staticroutes.py	2016-12-09 15:16:44 +0000
+++ src/maasserver/api/staticroutes.py	2017-02-09 15:43:04 +0000
@@ -9,7 +9,7 @@
 )
 from maasserver.enum import NODE_PERMISSION
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.forms_staticroute import StaticRouteForm
+from maasserver.forms.staticroute import StaticRouteForm
 from maasserver.models import StaticRoute
 from piston3.utils import rc
 

=== modified file 'src/maasserver/api/subnets.py'
--- src/maasserver/api/subnets.py	2017-01-22 21:50:06 +0000
+++ src/maasserver/api/subnets.py	2017-02-09 15:43:04 +0000
@@ -12,7 +12,7 @@
 from maasserver.api.utils import get_optional_param
 from maasserver.enum import NODE_PERMISSION
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.forms_subnet import SubnetForm
+from maasserver.forms.subnet import SubnetForm
 from maasserver.models import (
     Space,
     Subnet,

=== modified file 'src/maasserver/api/tests/test_api.py'
--- src/maasserver/api/tests/test_api.py	2016-12-14 18:31:14 +0000
+++ src/maasserver/api/tests/test_api.py	2017-02-09 15:43:04 +0000
@@ -26,7 +26,7 @@
     ClusterUnavailable,
     MAASAPIBadRequest,
 )
-from maasserver.forms_settings import INVALID_SETTING_MSG_TEMPLATE
+from maasserver.forms.settings import INVALID_SETTING_MSG_TEMPLATE
 from maasserver.models import (
     Config,
     KeySource,

=== modified file 'src/maasserver/api/tests/test_dhcpsnippets.py'
--- src/maasserver/api/tests/test_dhcpsnippets.py	2016-12-08 16:59:19 +0000
+++ src/maasserver/api/tests/test_dhcpsnippets.py	2017-02-09 15:43:04 +0000
@@ -11,7 +11,7 @@
 import random
 
 from django.core.urlresolvers import reverse
-from maasserver import forms_dhcpsnippet
+from maasserver.forms import dhcpsnippet
 from maasserver.models import (
     DHCPSnippet,
     VersionedTextFile,
@@ -114,7 +114,7 @@
             http.client.NOT_FOUND, response.status_code, response.content)
 
     def test_update(self):
-        self.patch(forms_dhcpsnippet, 'validate_dhcp_config').return_value = {}
+        self.patch(dhcpsnippet, 'validate_dhcp_config').return_value = {}
         self.become_admin()
         dhcp_snippet = factory.make_DHCPSnippet()
         new_value = factory.make_string()
@@ -288,7 +288,7 @@
         self.assertItemsEqual(expected_ids, result_ids)
 
     def test_create(self):
-        self.patch(forms_dhcpsnippet, 'validate_dhcp_config').return_value = {}
+        self.patch(dhcpsnippet, 'validate_dhcp_config').return_value = {}
         self.become_admin()
         name = factory.make_name('name')
         value = factory.make_string()

=== modified file 'src/maasserver/api/tests/test_maas.py'
--- src/maasserver/api/tests/test_maas.py	2016-09-25 03:40:16 +0000
+++ src/maasserver/api/tests/test_maas.py	2017-02-09 15:43:04 +0000
@@ -11,7 +11,7 @@
 
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from maasserver.forms_settings import CONFIG_ITEMS_KEYS
+from maasserver.forms.settings import CONFIG_ITEMS_KEYS
 from maasserver.models import PackageRepository
 from maasserver.models.config import (
     Config,

=== modified file 'src/maasserver/api/tests/test_pods.py'
--- src/maasserver/api/tests/test_pods.py	2017-02-07 20:45:00 +0000
+++ src/maasserver/api/tests/test_pods.py	2017-02-09 15:43:04 +0000
@@ -10,7 +10,7 @@
 from unittest.mock import MagicMock
 
 from django.core.urlresolvers import reverse
-from maasserver import forms_pods
+from maasserver.forms import pods
 from maasserver.models.node import Machine
 from maasserver.testing.api import APITestCase
 from maasserver.testing.factory import factory
@@ -55,7 +55,7 @@
         discovered_rack_1 = factory.make_RackController()
         discovered_rack_2 = factory.make_RackController()
         failed_rack = factory.make_RackController()
-        self.patch(forms_pods, "discover_pod").return_value = ({
+        self.patch(pods, "discover_pod").return_value = ({
             discovered_rack_1.system_id: discovered_pod,
             discovered_rack_2.system_id: discovered_pod,
         }, {
@@ -155,7 +155,7 @@
     def test_create_proper_return_on_exception(self):
         self.become_admin()
         failed_rack = factory.make_RackController()
-        self.patch(forms_pods, "discover_pod").return_value = ({}, {
+        self.patch(pods, "discover_pod").return_value = ({}, {
             failed_rack.system_id: factory.make_exception(),
         })
 
@@ -303,12 +303,12 @@
 
         # Mock the RPC client.
         client = MagicMock()
-        mock_getClient = self.patch(forms_pods, "getClientFromIdentifiers")
+        mock_getClient = self.patch(pods, "getClientFromIdentifiers")
         mock_getClient.return_value = succeed(client)
 
         # Mock the result of the composed machine.
         composed_machine, pod_hints = self.make_compose_machine_result(pod)
-        mock_compose_machine = self.patch(forms_pods, "compose_machine")
+        mock_compose_machine = self.patch(pods, "compose_machine")
         mock_compose_machine.return_value = succeed(
             (composed_machine, pod_hints))
 

=== modified file 'src/maasserver/api/vlans.py'
--- src/maasserver/api/vlans.py	2017-01-22 21:50:06 +0000
+++ src/maasserver/api/vlans.py	2017-02-09 15:43:04 +0000
@@ -8,7 +8,7 @@
 from maasserver.api.support import OperationsHandler
 from maasserver.enum import NODE_PERMISSION
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.forms_vlan import VLANForm
+from maasserver.forms.vlan import VLANForm
 from maasserver.models import (
     Fabric,
     Space,

=== added directory 'src/maasserver/forms'
=== renamed file 'src/maasserver/forms.py' => 'src/maasserver/forms/__init__.py'
--- src/maasserver/forms.py	2017-01-31 19:43:30 +0000
+++ src/maasserver/forms/__init__.py	2017-02-09 15:43:04 +0000
@@ -82,7 +82,7 @@
     LargeObjectFile,
     MACAddressFormField,
 )
-from maasserver.forms_settings import (
+from maasserver.forms.settings import (
     CONFIG_ITEMS_KEYS,
     get_config_field,
     INVALID_SETTING_MSG_TEMPLATE,
@@ -1409,7 +1409,7 @@
     def _get_default_distro_series_field_for_ui(self):
         """This create the field with os/release. This is needed by the UI
         to filter the releases based on the OS selection. The API uses the
-        field defined in forms_settings.py"""
+        field defined in settings.py"""
         usable_oses = list_all_usable_osystems()
         release_choices = list_release_choices(
             list_all_usable_releases(usable_oses), include_default=False)

=== renamed file 'src/maasserver/forms_dhcpsnippet.py' => 'src/maasserver/forms/dhcpsnippet.py'
=== renamed file 'src/maasserver/forms_dnsdata.py' => 'src/maasserver/forms/dnsdata.py'
=== renamed file 'src/maasserver/forms_dnsresource.py' => 'src/maasserver/forms/dnsresource.py'
=== renamed file 'src/maasserver/forms_domain.py' => 'src/maasserver/forms/domain.py'
=== renamed file 'src/maasserver/forms_ephemeral.py' => 'src/maasserver/forms/ephemeral.py'
=== renamed file 'src/maasserver/forms_fabric.py' => 'src/maasserver/forms/fabric.py'
=== renamed file 'src/maasserver/forms_fannetwork.py' => 'src/maasserver/forms/fannetwork.py'
=== renamed file 'src/maasserver/forms_filesystem.py' => 'src/maasserver/forms/filesystem.py'
=== renamed file 'src/maasserver/forms_interface.py' => 'src/maasserver/forms/interface.py'
=== renamed file 'src/maasserver/forms_interface_link.py' => 'src/maasserver/forms/interface_link.py'
=== renamed file 'src/maasserver/forms_iprange.py' => 'src/maasserver/forms/iprange.py'
=== renamed file 'src/maasserver/forms_packagerepository.py' => 'src/maasserver/forms/packagerepository.py'
=== renamed file 'src/maasserver/forms_pods.py' => 'src/maasserver/forms/pods.py'
=== renamed file 'src/maasserver/forms_settings.py' => 'src/maasserver/forms/settings.py'
=== renamed file 'src/maasserver/forms_space.py' => 'src/maasserver/forms/space.py'
=== renamed file 'src/maasserver/forms_staticroute.py' => 'src/maasserver/forms/staticroute.py'
=== renamed file 'src/maasserver/forms_subnet.py' => 'src/maasserver/forms/subnet.py'
=== added directory 'src/maasserver/forms/tests'
=== added file 'src/maasserver/forms/tests/__init__.py'
=== renamed file 'src/maasserver/tests/test_forms_bcache.py' => 'src/maasserver/forms/tests/test_bcache.py'
=== renamed file 'src/maasserver/tests/test_forms_blockdevice.py' => 'src/maasserver/forms/tests/test_blockdevice.py'
=== renamed file 'src/maasserver/tests/test_forms_bootresource.py' => 'src/maasserver/forms/tests/test_bootresource.py'
=== renamed file 'src/maasserver/tests/test_forms_bootsource.py' => 'src/maasserver/forms/tests/test_bootsource.py'
=== renamed file 'src/maasserver/tests/test_forms_bootsourceselection.py' => 'src/maasserver/forms/tests/test_bootsourceselection.py'
=== renamed file 'src/maasserver/tests/test_forms_bulknodeaction.py' => 'src/maasserver/forms/tests/test_bulknodeaction.py'
=== renamed file 'src/maasserver/tests/test_forms_cacheset.py' => 'src/maasserver/forms/tests/test_cacheset.py'
=== renamed file 'src/maasserver/tests/test_forms_commissioning.py' => 'src/maasserver/forms/tests/test_commissioning.py'
=== renamed file 'src/maasserver/tests/test_forms_config.py' => 'src/maasserver/forms/tests/test_config.py'
=== renamed file 'src/maasserver/tests/test_forms_controller.py' => 'src/maasserver/forms/tests/test_controller.py'
=== renamed file 'src/maasserver/tests/test_forms_deploy.py' => 'src/maasserver/forms/tests/test_deploy.py'
=== renamed file 'src/maasserver/tests/test_forms_device.py' => 'src/maasserver/forms/tests/test_device.py'
=== renamed file 'src/maasserver/tests/test_forms_dhcpsnippet.py' => 'src/maasserver/forms/tests/test_dhcpsnippet.py'
--- src/maasserver/tests/test_forms_dhcpsnippet.py	2016-04-11 16:23:26 +0000
+++ src/maasserver/forms/tests/test_dhcpsnippet.py	2017-02-09 15:43:04 +0000
@@ -8,8 +8,8 @@
 import random
 
 from django.core.exceptions import ValidationError
-from maasserver import forms_dhcpsnippet
-from maasserver.forms_dhcpsnippet import DHCPSnippetForm
+from maasserver.forms import dhcpsnippet
+from maasserver.forms.dhcpsnippet import DHCPSnippetForm
 from maasserver.models import (
     DHCPSnippet,
     VersionedTextFile,
@@ -23,7 +23,7 @@
 
     def setUp(self):
         super().setUp()
-        self.patch(forms_dhcpsnippet, 'validate_dhcp_config').return_value = (
+        self.patch(dhcpsnippet, 'validate_dhcp_config').return_value = (
             {})
 
     def test__create_dhcp_snippet_requies_name(self):
@@ -270,7 +270,7 @@
             'line': factory.make_name('line'),
             'position': factory.make_name('position'),
         }
-        self.patch(forms_dhcpsnippet, 'validate_dhcp_config').return_value = (
+        self.patch(dhcpsnippet, 'validate_dhcp_config').return_value = (
             [dhcpd_error])
         form = DHCPSnippetForm(data={
             'name': factory.make_name('name'),

=== renamed file 'src/maasserver/tests/test_forms_dnsdata.py' => 'src/maasserver/forms/tests/test_dnsdata.py'
--- src/maasserver/tests/test_forms_dnsdata.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/forms/tests/test_dnsdata.py	2017-02-09 15:43:04 +0000
@@ -7,7 +7,7 @@
 
 import random
 
-from maasserver.forms_dnsdata import DNSDataForm
+from maasserver.forms.dnsdata import DNSDataForm
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.orm import reload_object

=== renamed file 'src/maasserver/tests/test_forms_dnsresource.py' => 'src/maasserver/forms/tests/test_dnsresource.py'
--- src/maasserver/tests/test_forms_dnsresource.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/forms/tests/test_dnsresource.py	2017-02-09 15:43:04 +0000
@@ -7,7 +7,7 @@
 
 import random
 
-from maasserver.forms_dnsresource import DNSResourceForm
+from maasserver.forms.dnsresource import DNSResourceForm
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.orm import reload_object

=== renamed file 'src/maasserver/tests/test_forms_domain.py' => 'src/maasserver/forms/tests/test_domain.py'
--- src/maasserver/tests/test_forms_domain.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/forms/tests/test_domain.py	2017-02-09 15:43:04 +0000
@@ -7,7 +7,7 @@
 
 import random
 
-from maasserver.forms_domain import DomainForm
+from maasserver.forms.domain import DomainForm
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.orm import reload_object

=== renamed file 'src/maasserver/tests/test_forms_ephemeral.py' => 'src/maasserver/forms/tests/test_ephemeral.py'
--- src/maasserver/tests/test_forms_ephemeral.py	2017-02-08 00:08:55 +0000
+++ src/maasserver/forms/tests/test_ephemeral.py	2017-02-09 15:43:04 +0000
@@ -12,7 +12,7 @@
     NODE_TYPE_CHOICES,
     POWER_STATE,
 )
-from maasserver.forms_ephemeral import (
+from maasserver.forms.ephemeral import (
     CommissionForm,
     TestForm,
 )

=== renamed file 'src/maasserver/tests/test_forms_fabric.py' => 'src/maasserver/forms/tests/test_fabric.py'
--- src/maasserver/tests/test_forms_fabric.py	2016-04-27 20:18:20 +0000
+++ src/maasserver/forms/tests/test_fabric.py	2017-02-09 15:43:04 +0000
@@ -5,7 +5,7 @@
 
 __all__ = []
 
-from maasserver.forms_fabric import FabricForm
+from maasserver.forms.fabric import FabricForm
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.orm import reload_object

=== renamed file 'src/maasserver/tests/test_forms_fannetwork.py' => 'src/maasserver/forms/tests/test_fannetwork.py'
--- src/maasserver/tests/test_forms_fannetwork.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/forms/tests/test_fannetwork.py	2017-02-09 15:43:04 +0000
@@ -7,7 +7,7 @@
 
 import random
 
-from maasserver.forms_fannetwork import FanNetworkForm
+from maasserver.forms.fannetwork import FanNetworkForm
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.orm import reload_object

=== renamed file 'src/maasserver/tests/test_forms_filesystem.py' => 'src/maasserver/forms/tests/test_filesystem.py'
--- src/maasserver/tests/test_forms_filesystem.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/forms/tests/test_filesystem.py	2017-02-09 15:43:04 +0000
@@ -10,7 +10,7 @@
     FILESYSTEM_GROUP_TYPE,
     FILESYSTEM_TYPE,
 )
-from maasserver.forms_filesystem import (
+from maasserver.forms.filesystem import (
     MountFilesystemForm,
     MountNonStorageFilesystemForm,
     UnmountNonStorageFilesystemForm,

=== renamed file 'src/maasserver/tests/test_forms_helpers.py' => 'src/maasserver/forms/tests/test_helpers.py'
=== renamed file 'src/maasserver/tests/test_forms_instancelistfield.py' => 'src/maasserver/forms/tests/test_instancelistfield.py'
=== renamed file 'src/maasserver/tests/test_forms_interface.py' => 'src/maasserver/forms/tests/test_interface.py'
--- src/maasserver/tests/test_forms_interface.py	2016-10-20 16:04:24 +0000
+++ src/maasserver/forms/tests/test_interface.py	2017-02-09 15:43:04 +0000
@@ -12,7 +12,7 @@
     INTERFACE_TYPE,
     IPADDRESS_TYPE,
 )
-from maasserver.forms_interface import (
+from maasserver.forms.interface import (
     AcquiredBridgeInterfaceForm,
     BOND_LACP_RATE_CHOICES,
     BOND_MODE_CHOICES,

=== renamed file 'src/maasserver/tests/test_forms_interface_link.py' => 'src/maasserver/forms/tests/test_interface_link.py'
--- src/maasserver/tests/test_forms_interface_link.py	2017-01-27 19:44:19 +0000
+++ src/maasserver/forms/tests/test_interface_link.py	2017-02-09 15:43:04 +0000
@@ -12,7 +12,7 @@
     INTERFACE_TYPE,
     IPADDRESS_TYPE,
 )
-from maasserver.forms_interface_link import (
+from maasserver.forms.interface_link import (
     InterfaceLinkForm,
     InterfaceSetDefaultGatwayForm,
     InterfaceUnlinkForm,

=== renamed file 'src/maasserver/tests/test_forms_iprange.py' => 'src/maasserver/forms/tests/test_iprange.py'
--- src/maasserver/tests/test_forms_iprange.py	2016-05-12 19:07:37 +0000
+++ src/maasserver/forms/tests/test_iprange.py	2017-02-09 15:43:04 +0000
@@ -8,7 +8,7 @@
 from unittest.mock import Mock
 
 from maasserver.enum import IPRANGE_TYPE
-from maasserver.forms_iprange import IPRangeForm
+from maasserver.forms.iprange import IPRangeForm
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.orm import reload_object

=== renamed file 'src/maasserver/tests/test_forms_licensekey.py' => 'src/maasserver/forms/tests/test_licensekey.py'
=== renamed file 'src/maasserver/tests/test_forms_machine.py' => 'src/maasserver/forms/tests/test_machine.py'
=== renamed file 'src/maasserver/tests/test_forms_machinewithmacaddresses.py' => 'src/maasserver/forms/tests/test_machinewithmacaddresses.py'
=== renamed file 'src/maasserver/tests/test_forms_merge_error_messages.py' => 'src/maasserver/forms/tests/test_merge_error_messages.py'
=== renamed file 'src/maasserver/tests/test_forms_multiplechoicefield.py' => 'src/maasserver/forms/tests/test_multiplechoicefield.py'
=== renamed file 'src/maasserver/tests/test_forms_node.py' => 'src/maasserver/forms/tests/test_node.py'
=== renamed file 'src/maasserver/tests/test_forms_packagerepository.py' => 'src/maasserver/forms/tests/test_packagerepository.py'
--- src/maasserver/tests/test_forms_packagerepository.py	2016-08-26 20:38:54 +0000
+++ src/maasserver/forms/tests/test_packagerepository.py	2017-02-09 15:43:04 +0000
@@ -7,7 +7,7 @@
 import random
 
 from django.core.exceptions import ValidationError
-from maasserver.forms_packagerepository import PackageRepositoryForm
+from maasserver.forms.packagerepository import PackageRepositoryForm
 from maasserver.models import PackageRepository
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase

=== renamed file 'src/maasserver/tests/test_forms_partition.py' => 'src/maasserver/forms/tests/test_partition.py'
=== renamed file 'src/maasserver/tests/test_forms_pods.py' => 'src/maasserver/forms/tests/test_pods.py'
--- src/maasserver/tests/test_forms_pods.py	2017-02-07 20:03:26 +0000
+++ src/maasserver/forms/tests/test_pods.py	2017-02-09 15:43:04 +0000
@@ -13,10 +13,10 @@
     MaxValueValidator,
     MinValueValidator,
 )
-from maasserver import forms_pods
 from maasserver.enum import BMC_TYPE
 from maasserver.exceptions import PodProblem
-from maasserver.forms_pods import (
+from maasserver.forms import pods
+from maasserver.forms.pods import (
     ComposeMachineForm,
     PodForm,
 )
@@ -78,7 +78,7 @@
         discovered_rack_1 = factory.make_RackController()
         discovered_rack_2 = factory.make_RackController()
         failed_rack = factory.make_RackController()
-        self.patch(forms_pods, "discover_pod").return_value = ({
+        self.patch(pods, "discover_pod").return_value = ({
             discovered_rack_1.system_id: discovered_pod,
             discovered_rack_2.system_id: discovered_pod,
         }, {
@@ -235,7 +235,7 @@
         self.assertItemsEqual(not_routable_racks, failed_racks)
 
     def test_raises_unable_to_discover_because_no_racks(self):
-        self.patch(forms_pods, "discover_pod").return_value = ({}, {})
+        self.patch(pods, "discover_pod").return_value = ({}, {})
         form = PodForm(data=self.make_pod_info())
         self.assertTrue(form.is_valid(), form._errors)
         error = self.assertRaises(PodProblem, form.save)
@@ -245,7 +245,7 @@
     def test_raises_exception_from_rack_controller(self):
         failed_rack = factory.make_RackController()
         exc = factory.make_exception()
-        self.patch(forms_pods, "discover_pod").return_value = ({}, {
+        self.patch(pods, "discover_pod").return_value = ({}, {
             failed_rack.system_id: exc,
         })
         form = PodForm(data=self.make_pod_info())
@@ -402,12 +402,12 @@
 
         # Mock the RPC client.
         client = MagicMock()
-        mock_getClient = self.patch(forms_pods, "getClientFromIdentifiers")
+        mock_getClient = self.patch(pods, "getClientFromIdentifiers")
         mock_getClient.return_value = succeed(client)
 
         # Mock the result of the composed machine.
         composed_machine, pod_hints = self.make_compose_machine_result(pod)
-        mock_compose_machine = self.patch(forms_pods, "compose_machine")
+        mock_compose_machine = self.patch(pods, "compose_machine")
         mock_compose_machine.return_value = succeed(
             (composed_machine, pod_hints))
 
@@ -431,12 +431,12 @@
 
         # Mock the RPC client.
         client = MagicMock()
-        mock_getClient = self.patch(forms_pods, "getClientFromIdentifiers")
+        mock_getClient = self.patch(pods, "getClientFromIdentifiers")
         mock_getClient.return_value = succeed(client)
 
         # Mock the result of the composed machine.
         composed_machine, pod_hints = self.make_compose_machine_result(pod)
-        mock_compose_machine = self.patch(forms_pods, "compose_machine")
+        mock_compose_machine = self.patch(pods, "compose_machine")
         mock_compose_machine.return_value = succeed(
             (composed_machine, pod_hints))
 

=== renamed file 'src/maasserver/tests/test_forms_raid.py' => 'src/maasserver/forms/tests/test_raid.py'
=== renamed file 'src/maasserver/tests/test_forms_settings.py' => 'src/maasserver/forms/tests/test_settings.py'
--- src/maasserver/tests/test_forms_settings.py	2017-01-11 15:24:56 +0000
+++ src/maasserver/forms/tests/test_settings.py	2017-02-09 15:43:04 +0000
@@ -5,9 +5,8 @@
 
 __all__ = []
 
-
 from django import forms
-from maasserver.forms_settings import (
+from maasserver.forms.settings import (
     CONFIG_ITEMS,
     get_config_doc,
     get_config_field,

=== renamed file 'src/maasserver/tests/test_forms_space.py' => 'src/maasserver/forms/tests/test_space.py'
--- src/maasserver/tests/test_forms_space.py	2016-04-27 20:18:20 +0000
+++ src/maasserver/forms/tests/test_space.py	2017-02-09 15:43:04 +0000
@@ -5,7 +5,7 @@
 
 __all__ = []
 
-from maasserver.forms_space import SpaceForm
+from maasserver.forms.space import SpaceForm
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.orm import reload_object

=== renamed file 'src/maasserver/tests/test_forms_staticroute.py' => 'src/maasserver/forms/tests/test_staticroute.py'
--- src/maasserver/tests/test_forms_staticroute.py	2016-08-17 16:01:57 +0000
+++ src/maasserver/forms/tests/test_staticroute.py	2017-02-09 15:43:04 +0000
@@ -7,7 +7,7 @@
 
 import random
 
-from maasserver.forms_staticroute import StaticRouteForm
+from maasserver.forms.staticroute import StaticRouteForm
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 

=== renamed file 'src/maasserver/tests/test_forms_subnet.py' => 'src/maasserver/forms/tests/test_subnet.py'
--- src/maasserver/tests/test_forms_subnet.py	2017-01-22 21:44:12 +0000
+++ src/maasserver/forms/tests/test_subnet.py	2017-02-09 15:43:04 +0000
@@ -7,7 +7,7 @@
 
 import random
 
-from maasserver.forms_subnet import SubnetForm
+from maasserver.forms.subnet import SubnetForm
 from maasserver.models.fabric import Fabric
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase

=== renamed file 'src/maasserver/tests/test_forms_ubuntu.py' => 'src/maasserver/forms/tests/test_ubuntu.py'
=== renamed file 'src/maasserver/tests/test_forms_user.py' => 'src/maasserver/forms/tests/test_user.py'
=== renamed file 'src/maasserver/tests/test_forms_vlan.py' => 'src/maasserver/forms/tests/test_vlan.py'
--- src/maasserver/tests/test_forms_vlan.py	2017-01-22 21:44:12 +0000
+++ src/maasserver/forms/tests/test_vlan.py	2017-02-09 15:43:04 +0000
@@ -7,7 +7,7 @@
 
 import random
 
-from maasserver.forms_vlan import VLANForm
+from maasserver.forms.vlan import VLANForm
 from maasserver.models.fabric import Fabric
 from maasserver.models.vlan import DEFAULT_MTU
 from maasserver.testing.factory import factory

=== renamed file 'src/maasserver/tests/test_forms_volume_group.py' => 'src/maasserver/forms/tests/test_volume_group.py'
=== renamed file 'src/maasserver/tests/test_forms_zone.py' => 'src/maasserver/forms/tests/test_zone.py'
=== renamed file 'src/maasserver/forms_vlan.py' => 'src/maasserver/forms/vlan.py'
=== modified file 'src/maasserver/websockets/handlers/config.py'
--- src/maasserver/websockets/handlers/config.py	2016-10-22 04:56:35 +0000
+++ src/maasserver/websockets/handlers/config.py	2017-02-09 15:43:04 +0000
@@ -8,7 +8,7 @@
     ]
 
 from django.core.exceptions import ValidationError
-from maasserver.forms_settings import (
+from maasserver.forms.settings import (
     CONFIG_ITEMS,
     get_config_field,
     get_config_form,

=== modified file 'src/maasserver/websockets/handlers/device.py'
--- src/maasserver/websockets/handlers/device.py	2017-02-08 01:21:03 +0000
+++ src/maasserver/websockets/handlers/device.py	2017-02-09 15:43:04 +0000
@@ -17,7 +17,7 @@
     DeviceForm,
     DeviceWithMACsForm,
 )
-from maasserver.forms_interface import PhysicalInterfaceForm
+from maasserver.forms.interface import PhysicalInterfaceForm
 from maasserver.models.node import Device
 from maasserver.models.staticipaddress import StaticIPAddress
 from maasserver.models.subnet import Subnet

=== modified file 'src/maasserver/websockets/handlers/dhcpsnippet.py'
--- src/maasserver/websockets/handlers/dhcpsnippet.py	2016-10-12 21:37:41 +0000
+++ src/maasserver/websockets/handlers/dhcpsnippet.py	2017-02-09 15:43:04 +0000
@@ -9,7 +9,7 @@
 
 from email.utils import format_datetime
 
-from maasserver.forms_dhcpsnippet import DHCPSnippetForm
+from maasserver.forms.dhcpsnippet import DHCPSnippetForm
 from maasserver.models import DHCPSnippet
 from maasserver.utils.orm import reload_object
 from maasserver.websockets.base import (

=== modified file 'src/maasserver/websockets/handlers/fabric.py'
--- src/maasserver/websockets/handlers/fabric.py	2016-06-09 17:18:10 +0000
+++ src/maasserver/websockets/handlers/fabric.py	2017-02-09 15:43:04 +0000
@@ -8,7 +8,7 @@
     ]
 
 from maasserver.enum import NODE_PERMISSION
-from maasserver.forms_fabric import FabricForm
+from maasserver.forms.fabric import FabricForm
 from maasserver.models.fabric import Fabric
 from maasserver.websockets.handlers.timestampedmodel import (
     TimestampedModelHandler,

=== modified file 'src/maasserver/websockets/handlers/iprange.py'
--- src/maasserver/websockets/handlers/iprange.py	2016-05-12 19:07:37 +0000
+++ src/maasserver/websockets/handlers/iprange.py	2017-02-09 15:43:04 +0000
@@ -7,7 +7,7 @@
     "IPRangeHandler",
     ]
 
-from maasserver.forms_iprange import IPRangeForm
+from maasserver.forms.iprange import IPRangeForm
 from maasserver.models import IPRange
 from maasserver.websockets.handlers.timestampedmodel import (
     TimestampedModelHandler,

=== modified file 'src/maasserver/websockets/handlers/machine.py'
--- src/maasserver/websockets/handlers/machine.py	2017-02-08 01:21:03 +0000
+++ src/maasserver/websockets/handlers/machine.py	2017-02-09 15:43:04 +0000
@@ -36,12 +36,12 @@
     UpdatePhysicalBlockDeviceForm,
     UpdateVirtualBlockDeviceForm,
 )
-from maasserver.forms_filesystem import (
+from maasserver.forms.filesystem import (
     MountFilesystemForm,
     MountNonStorageFilesystemForm,
     UnmountNonStorageFilesystemForm,
 )
-from maasserver.forms_interface import (
+from maasserver.forms.interface import (
     AcquiredBridgeInterfaceForm,
     BondInterfaceForm,
     BridgeInterfaceForm,
@@ -50,7 +50,7 @@
     PhysicalInterfaceForm,
     VLANInterfaceForm,
 )
-from maasserver.forms_interface_link import InterfaceLinkForm
+from maasserver.forms.interface_link import InterfaceLinkForm
 from maasserver.models.blockdevice import BlockDevice
 from maasserver.models.cacheset import CacheSet
 from maasserver.models.config import Config

=== modified file 'src/maasserver/websockets/handlers/packagerepository.py'
--- src/maasserver/websockets/handlers/packagerepository.py	2016-10-12 21:37:41 +0000
+++ src/maasserver/websockets/handlers/packagerepository.py	2017-02-09 15:43:04 +0000
@@ -7,7 +7,7 @@
     "PackageRepositoryHandler",
     ]
 
-from maasserver.forms_packagerepository import PackageRepositoryForm
+from maasserver.forms.packagerepository import PackageRepositoryForm
 from maasserver.models import PackageRepository
 from maasserver.utils.orm import reload_object
 from maasserver.websockets.base import HandlerPermissionError

=== modified file 'src/maasserver/websockets/handlers/space.py'
--- src/maasserver/websockets/handlers/space.py	2016-12-20 06:52:13 +0000
+++ src/maasserver/websockets/handlers/space.py	2017-02-09 15:43:04 +0000
@@ -8,7 +8,7 @@
     ]
 
 from maasserver.enum import NODE_PERMISSION
-from maasserver.forms_space import SpaceForm
+from maasserver.forms.space import SpaceForm
 from maasserver.models.space import Space
 from maasserver.websockets.handlers.timestampedmodel import (
     TimestampedModelHandler,

=== modified file 'src/maasserver/websockets/handlers/staticroute.py'
--- src/maasserver/websockets/handlers/staticroute.py	2016-10-12 21:37:41 +0000
+++ src/maasserver/websockets/handlers/staticroute.py	2017-02-09 15:43:04 +0000
@@ -8,7 +8,7 @@
     ]
 
 from django.core.exceptions import PermissionDenied
-from maasserver.forms_staticroute import StaticRouteForm
+from maasserver.forms.staticroute import StaticRouteForm
 from maasserver.models import StaticRoute
 from maasserver.utils.orm import reload_object
 from maasserver.websockets.handlers.timestampedmodel import (

=== modified file 'src/maasserver/websockets/handlers/subnet.py'
--- src/maasserver/websockets/handlers/subnet.py	2017-01-27 02:50:12 +0000
+++ src/maasserver/websockets/handlers/subnet.py	2017-02-09 15:43:04 +0000
@@ -8,7 +8,7 @@
     ]
 
 from maasserver.enum import NODE_PERMISSION
-from maasserver.forms_subnet import SubnetForm
+from maasserver.forms.subnet import SubnetForm
 from maasserver.models import (
     Discovery,
     RackController,

=== modified file 'src/maasserver/websockets/handlers/tests/test_config.py'
--- src/maasserver/websockets/handlers/tests/test_config.py	2016-10-22 06:33:56 +0000
+++ src/maasserver/websockets/handlers/tests/test_config.py	2017-02-09 15:43:04 +0000
@@ -7,7 +7,7 @@
 
 import random
 
-from maasserver.forms_settings import (
+from maasserver.forms.settings import (
     CONFIG_ITEMS,
     get_config_field,
 )

=== modified file 'src/maasserver/websockets/handlers/tests/test_dhcpsnippet.py'
--- src/maasserver/websockets/handlers/tests/test_dhcpsnippet.py	2016-09-06 17:02:03 +0000
+++ src/maasserver/websockets/handlers/tests/test_dhcpsnippet.py	2017-02-09 15:43:04 +0000
@@ -8,7 +8,7 @@
 from email.utils import format_datetime
 import random
 
-import maasserver.forms_dhcpsnippet as forms_dhcpsnippet_module
+import maasserver.forms.dhcpsnippet as forms_dhcpsnippet_module
 from maasserver.models import (
     DHCPSnippet,
     VersionedTextFile,

=== modified file 'src/maasserver/websockets/handlers/tests/test_packagerepository.py'
--- src/maasserver/websockets/handlers/tests/test_packagerepository.py	2016-09-06 17:02:03 +0000
+++ src/maasserver/websockets/handlers/tests/test_packagerepository.py	2017-02-09 15:43:04 +0000
@@ -5,7 +5,7 @@
 
 __all__ = []
 
-import maasserver.forms_packagerepository as forms_packagerepository_module
+import maasserver.forms.packagerepository as forms_packagerepository_module
 from maasserver.models import PackageRepository
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase

=== modified file 'src/maasserver/websockets/handlers/vlan.py'
--- src/maasserver/websockets/handlers/vlan.py	2016-12-16 01:44:14 +0000
+++ src/maasserver/websockets/handlers/vlan.py	2017-02-09 15:43:04 +0000
@@ -11,8 +11,8 @@
     IPRANGE_TYPE,
     NODE_PERMISSION,
 )
-from maasserver.forms_iprange import IPRangeForm
-from maasserver.forms_vlan import VLANForm
+from maasserver.forms.iprange import IPRangeForm
+from maasserver.forms.vlan import VLANForm
 from maasserver.models import (
     Fabric,
     IPRange,

=== modified file 'src/provisioningserver/utils/tests/test_env.py'
--- src/provisioningserver/utils/tests/test_env.py	2017-01-25 10:11:14 +0000
+++ src/provisioningserver/utils/tests/test_env.py	2017-02-09 15:43:04 +0000
@@ -96,6 +96,7 @@
         super(TestMAASID, self).setUp()
         self.maas_id_path = get_path('/var/lib/maas/maas_id')
         self.addCleanup(env.set_maas_id, None)
+        env.set_maas_id(None)
 
     def test_get_returns_None_if_maas_id_file_does_not_exist(self):
         self.assertThat(self.maas_id_path, Not(FileExists()))