Make IPAM more pythonic

__init__.py is usually an empty file, or contains platform specific
code to make the package function. One more use is to have __init__.py
contain import statements, to import functions and classes, for convenience.

http://docs.python-guide.org/en/latest/writing/structure/#packages
http://mikegrouchy.com/blog/2012/05/be-pythonic-__init__py.html

Change-Id: I7408ac95f4970fbd7009257dfb698102ffabb6e3

1 files changed, 5 insertions, 4 deletions

diff --git a/neutron/db/ipam_non_pluggable_backend.py b/neutron/db/ipam_non_pluggable_backend.py
index 9346bcb7bb..c515848b5e 100644
--- a/neutron/db/ipam_non_pluggable_backend.py
+++ b/neutron/db/ipam_non_pluggable_backend.py
@@ -27,7 +27,7 @@ from neutron.common import exceptions as n_exc
 from neutron.common import ipv6_utils
 from neutron.db import ipam_backend_mixin
 from neutron.db import models_v2
-from neutron import ipam
+from neutron.ipam import requests as ipam_req
 from neutron.ipam import subnet_alloc
 from neutron.ipam import utils as ipam_utils
 
@@ -486,9 +486,10 @@ class IpamNonPluggableBackend(ipam_backend_mixin.IpamBackendMixin):
                 subnet['allocation_pools'],
                 subnet['cidr'],
                 subnet['gateway_ip'])
-        subnet_request = ipam.SubnetRequestFactory.get_request(context,
-                                                               subnet,
-                                                               subnetpool)
+
+        subnet_request = ipam_req.SubnetRequestFactory.get_request(context,
+                                                                   subnet,
+                                                                   subnetpool)
 
         if subnetpool_id:
             driver = subnet_alloc.SubnetAllocator(subnetpool, context)