Enable H306 check and fix import ordering

To better align with other OpenStack projects and to reduce the
ongoing problem with duplicate imports, this patch re-enables the
H306 check for proper module import order.

Change-Id: Iced92590829f6d9177d64ad4868aebe6eafd6a8a

33 files changed, 81 insertions, 85 deletions

diff --git a/designate/api/admin/__init__.py b/designate/api/admin/__init__.py
index 1ac7bd6e..7688db71 100644
--- a/designate/api/admin/__init__.py
+++ b/designate/api/admin/__init__.py
@@ -12,9 +12,9 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import pecan.deploy
 from oslo_config import cfg
 from oslo_log import log as logging
+import pecan.deploy
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/admin/app.py b/designate/api/admin/app.py
index a687e2d5..d3013f42 100644
--- a/designate/api/admin/app.py
+++ b/designate/api/admin/app.py
@@ -13,9 +13,9 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+from oslo_config import cfg
 import pecan
 import pecan.deploy
-from oslo_config import cfg
 
 from designate.api.v2 import patches
 
diff --git a/designate/api/admin/controllers/extensions/counts.py b/designate/api/admin/controllers/extensions/counts.py
index ed221a6a..9f609060 100644
--- a/designate/api/admin/controllers/extensions/counts.py
+++ b/designate/api/admin/controllers/extensions/counts.py
@@ -13,12 +13,11 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate.api.v2.controllers import rest
 from designate.api.admin.views.extensions import reports as reports_view
+from designate.api.v2.controllers import rest
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/admin/controllers/extensions/export.py b/designate/api/admin/controllers/extensions/export.py
index b468ca74..e42087bc 100644
--- a/designate/api/admin/controllers/extensions/export.py
+++ b/designate/api/admin/controllers/extensions/export.py
@@ -12,12 +12,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import pecan
 from oslo_log import log as logging
+import pecan
 
 from designate.api.v2.controllers import rest
-from designate import utils
 from designate import policy
+from designate import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/admin/controllers/extensions/quotas.py b/designate/api/admin/controllers/extensions/quotas.py
index 8985f442..440683a8 100644
--- a/designate/api/admin/controllers/extensions/quotas.py
+++ b/designate/api/admin/controllers/extensions/quotas.py
@@ -13,12 +13,12 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import schema
-from designate.api.v2.controllers import rest
 from designate.api.admin.views.extensions import quotas as quotas_view
+from designate.api.v2.controllers import rest
+from designate import schema
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/admin/controllers/extensions/reports.py b/designate/api/admin/controllers/extensions/reports.py
index 38a49d36..8a36d73c 100644
--- a/designate/api/admin/controllers/extensions/reports.py
+++ b/designate/api/admin/controllers/extensions/reports.py
@@ -16,9 +16,9 @@
 
 from oslo_log import log as logging
 
-from designate.api.v2.controllers import rest
 from designate.api.admin.controllers.extensions import counts
 from designate.api.admin.controllers.extensions import tenants
+from designate.api.v2.controllers import rest
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/admin/controllers/extensions/tenants.py b/designate/api/admin/controllers/extensions/tenants.py
index eac3125a..5e88338a 100644
--- a/designate/api/admin/controllers/extensions/tenants.py
+++ b/designate/api/admin/controllers/extensions/tenants.py
@@ -14,11 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate.api.v2.controllers import rest
 from designate.api.admin.views.extensions import reports as reports_view
+from designate.api.v2.controllers import rest
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/admin/controllers/extensions/zones.py b/designate/api/admin/controllers/extensions/zones.py
index aee4d92d..e0725b7f 100644
--- a/designate/api/admin/controllers/extensions/zones.py
+++ b/designate/api/admin/controllers/extensions/zones.py
@@ -14,8 +14,8 @@
 
 from oslo_log import log as logging
 
-from designate.api.v2.controllers import rest
 from designate.api.admin.controllers.extensions import export
+from designate.api.v2.controllers import rest
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/middleware.py b/designate/api/middleware.py
index 334da69c..a4cd5f50 100644
--- a/designate/api/middleware.py
+++ b/designate/api/middleware.py
@@ -14,18 +14,18 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
-import webob.dec
 from oslo_config import cfg
-import oslo_messaging as messaging
 from oslo_log import log as logging
+import oslo_messaging as messaging
 from oslo_middleware import base
 from oslo_middleware import request_id
 from oslo_serialization import jsonutils
 from oslo_utils import strutils
+import webob.dec
 
+from designate import context
 from designate import exceptions
 from designate import notifications
-from designate import context
 from designate import objects
 from designate.objects.adapters import DesignateAdapter
 
diff --git a/designate/api/v2/__init__.py b/designate/api/v2/__init__.py
index e7cda5a1..49c7e232 100644
--- a/designate/api/v2/__init__.py
+++ b/designate/api/v2/__init__.py
@@ -13,9 +13,9 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import pecan.deploy
 from oslo_config import cfg
 from oslo_log import log as logging
+import pecan.deploy
 
 
 LOG = logging.getLogger(__name__)
diff --git a/designate/api/v2/app.py b/designate/api/v2/app.py
index 1596d4fe..7d16c97f 100644
--- a/designate/api/v2/app.py
+++ b/designate/api/v2/app.py
@@ -13,9 +13,9 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+from oslo_config import cfg
 import pecan
 import pecan.deploy
-from oslo_config import cfg
 
 from designate.api.v2 import patches
 
diff --git a/designate/api/v2/controllers/blacklists.py b/designate/api/v2/controllers/blacklists.py
index 9fa8b5d8..2a104ce4 100644
--- a/designate/api/v2/controllers/blacklists.py
+++ b/designate/api/v2/controllers/blacklists.py
@@ -13,14 +13,13 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import utils
 from designate.api.v2.controllers import rest
-from designate.objects import Blacklist
 from designate.objects.adapters import DesignateAdapter
+from designate.objects import Blacklist
+from designate import utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/designate/api/v2/controllers/floatingips.py b/designate/api/v2/controllers/floatingips.py
index e2aa0159..5c984e97 100644
--- a/designate/api/v2/controllers/floatingips.py
+++ b/designate/api/v2/controllers/floatingips.py
@@ -15,13 +15,13 @@
 # under the License.
 import re
 
-import pecan
 from oslo_log import log as logging
+import pecan
 
+from designate.api.v2.controllers import rest
 from designate import exceptions
 from designate import objects
 from designate.objects.adapters import DesignateAdapter
-from designate.api.v2.controllers import rest
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/v2/controllers/limits.py b/designate/api/v2/controllers/limits.py
index 2dbdb62a..936ab819 100644
--- a/designate/api/v2/controllers/limits.py
+++ b/designate/api/v2/controllers/limits.py
@@ -13,9 +13,8 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-
-import pecan
 from oslo_config import cfg
+import pecan
 
 from designate.api.v2.controllers import rest
 
diff --git a/designate/api/v2/controllers/pools.py b/designate/api/v2/controllers/pools.py
index f5dd490e..f0b6675d 100644
--- a/designate/api/v2/controllers/pools.py
+++ b/designate/api/v2/controllers/pools.py
@@ -12,13 +12,13 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import utils
 from designate.api.v2.controllers import rest
-from designate.objects import Pool
 from designate.objects.adapters import DesignateAdapter
+from designate.objects import Pool
+from designate import utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/designate/api/v2/controllers/quotas.py b/designate/api/v2/controllers/quotas.py
index c4a766f4..7d0a74de 100644
--- a/designate/api/v2/controllers/quotas.py
+++ b/designate/api/v2/controllers/quotas.py
@@ -13,9 +13,9 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import pecan
 from oslo_config import cfg
 from oslo_log import log as logging
+import pecan
 
 from designate.api.v2.controllers import rest
 from designate.common import keystone
diff --git a/designate/api/v2/controllers/recordsets.py b/designate/api/v2/controllers/recordsets.py
index 8001f993..d2bc2f81 100644
--- a/designate/api/v2/controllers/recordsets.py
+++ b/designate/api/v2/controllers/recordsets.py
@@ -13,13 +13,13 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import utils
 from designate.api.v2.controllers import common
 from designate.api.v2.controllers import rest
 from designate.objects.adapters import DesignateAdapter
+from designate import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/v2/controllers/reverse.py b/designate/api/v2/controllers/reverse.py
index f59d3a56..f5347035 100644
--- a/designate/api/v2/controllers/reverse.py
+++ b/designate/api/v2/controllers/reverse.py
@@ -13,8 +13,8 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from designate.api.v2.controllers import rest
 from designate.api.v2.controllers import floatingips
+from designate.api.v2.controllers import rest
 
 
 class ReverseController(rest.RestController):
diff --git a/designate/api/v2/controllers/root.py b/designate/api/v2/controllers/root.py
index 76669db9..33f9d01d 100644
--- a/designate/api/v2/controllers/root.py
+++ b/designate/api/v2/controllers/root.py
@@ -16,17 +16,17 @@
 from oslo_config import cfg
 from stevedore import named
 
-from designate.api.v2.controllers import limits
-from designate.api.v2.controllers import reverse
-from designate.api.v2.controllers import tlds
 from designate.api.v2.controllers import blacklists
 from designate.api.v2.controllers import errors
+from designate.api.v2.controllers import limits
 from designate.api.v2.controllers import pools
+from designate.api.v2.controllers import quotas
+from designate.api.v2.controllers import recordsets
+from designate.api.v2.controllers import reverse
 from designate.api.v2.controllers import service_status
-from designate.api.v2.controllers import zones
+from designate.api.v2.controllers import tlds
 from designate.api.v2.controllers import tsigkeys
-from designate.api.v2.controllers import recordsets
-from designate.api.v2.controllers import quotas
+from designate.api.v2.controllers import zones
 
 
 class RootController(object):
diff --git a/designate/api/v2/controllers/service_status.py b/designate/api/v2/controllers/service_status.py
index 88aaec0a..18a9e30c 100644
--- a/designate/api/v2/controllers/service_status.py
+++ b/designate/api/v2/controllers/service_status.py
@@ -14,9 +14,9 @@
 
 import pecan
 
-from designate import utils
 from designate.api.v2.controllers import rest
 from designate.objects.adapters import DesignateAdapter
+from designate import utils
 
 
 class ServiceStatusController(rest.RestController):
diff --git a/designate/api/v2/controllers/tlds.py b/designate/api/v2/controllers/tlds.py
index 9749e948..5251586e 100644
--- a/designate/api/v2/controllers/tlds.py
+++ b/designate/api/v2/controllers/tlds.py
@@ -12,13 +12,13 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import utils
 from designate.api.v2.controllers import rest
-from designate.objects import Tld
 from designate.objects.adapters import DesignateAdapter
+from designate.objects import Tld
+from designate import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/v2/controllers/tsigkeys.py b/designate/api/v2/controllers/tsigkeys.py
index 90451a93..8cb18bcf 100644
--- a/designate/api/v2/controllers/tsigkeys.py
+++ b/designate/api/v2/controllers/tsigkeys.py
@@ -13,14 +13,13 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import utils
 from designate.api.v2.controllers import rest
-from designate.objects import TsigKey
 from designate.objects.adapters import DesignateAdapter
+from designate.objects import TsigKey
+from designate import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/v2/controllers/zones/__init__.py b/designate/api/v2/controllers/zones/__init__.py
index 1f5a6f5d..2608822f 100644
--- a/designate/api/v2/controllers/zones/__init__.py
+++ b/designate/api/v2/controllers/zones/__init__.py
@@ -13,18 +13,18 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import pecan
 from oslo_config import cfg
 from oslo_log import log as logging
+import pecan
 
-from designate import exceptions
-from designate import utils
 from designate.api.v2.controllers import rest
+from designate.api.v2.controllers.zones import nameservers
 from designate.api.v2.controllers.zones import recordsets
 from designate.api.v2.controllers.zones import tasks
-from designate.api.v2.controllers.zones import nameservers
+from designate import exceptions
 from designate import objects
 from designate.objects.adapters import DesignateAdapter
+from designate import utils
 
 CONF = cfg.CONF
 
diff --git a/designate/api/v2/controllers/zones/nameservers.py b/designate/api/v2/controllers/zones/nameservers.py
index 8f5c7e26..b72fd2cd 100644
--- a/designate/api/v2/controllers/zones/nameservers.py
+++ b/designate/api/v2/controllers/zones/nameservers.py
@@ -13,12 +13,12 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import utils
 from designate.api.v2.controllers import rest
 from designate.objects.adapters import DesignateAdapter
+from designate import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/v2/controllers/zones/recordsets.py b/designate/api/v2/controllers/zones/recordsets.py
index f0f0cfb9..fdcbf61c 100644
--- a/designate/api/v2/controllers/zones/recordsets.py
+++ b/designate/api/v2/controllers/zones/recordsets.py
@@ -13,15 +13,15 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import exceptions
-from designate import utils
 from designate.api.v2.controllers import common
 from designate.api.v2.controllers import rest
-from designate.objects import RecordSet
+from designate import exceptions
 from designate.objects.adapters import DesignateAdapter
+from designate.objects import RecordSet
+from designate import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/v2/controllers/zones/tasks/__init__.py b/designate/api/v2/controllers/zones/tasks/__init__.py
index 0361d85b..28f1d207 100644
--- a/designate/api/v2/controllers/zones/tasks/__init__.py
+++ b/designate/api/v2/controllers/zones/tasks/__init__.py
@@ -15,18 +15,18 @@
 # under the License.
 from oslo_log import log as logging
 
-from designate.api.v2.controllers.zones.tasks.transfer_requests \
-    import TransferRequestsController as TRC
-from designate.api.v2.controllers.zones.tasks.transfer_accepts \
-    import TransferAcceptsController as TRA
 from designate.api.v2.controllers.zones.tasks import abandon
-from designate.api.v2.controllers.zones.tasks.xfr import XfrController
-from designate.api.v2.controllers.zones.tasks.imports \
-    import ZoneImportController
-from designate.api.v2.controllers.zones.tasks.exports \
-    import ZoneExportsController
 from designate.api.v2.controllers.zones.tasks.exports \
     import ZoneExportCreateController
+from designate.api.v2.controllers.zones.tasks.exports \
+    import ZoneExportsController
+from designate.api.v2.controllers.zones.tasks.imports \
+    import ZoneImportController
+from designate.api.v2.controllers.zones.tasks.transfer_accepts \
+    import TransferAcceptsController as TRA
+from designate.api.v2.controllers.zones.tasks.transfer_requests \
+    import TransferRequestsController as TRC
+from designate.api.v2.controllers.zones.tasks.xfr import XfrController
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/v2/controllers/zones/tasks/abandon.py b/designate/api/v2/controllers/zones/tasks/abandon.py
index e45e2e60..fbc79774 100644
--- a/designate/api/v2/controllers/zones/tasks/abandon.py
+++ b/designate/api/v2/controllers/zones/tasks/abandon.py
@@ -12,11 +12,11 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import utils
 from designate.api.v2.controllers import rest
+from designate import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/v2/controllers/zones/tasks/exports.py b/designate/api/v2/controllers/zones/tasks/exports.py
index 60a852b9..9252da08 100644
--- a/designate/api/v2/controllers/zones/tasks/exports.py
+++ b/designate/api/v2/controllers/zones/tasks/exports.py
@@ -13,14 +13,14 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import pecan
 from oslo_log import log as logging
+import pecan
 
+from designate.api.v2.controllers import rest
 from designate import exceptions
+from designate.objects.adapters import DesignateAdapter
 from designate import policy
 from designate import utils
-from designate.api.v2.controllers import rest
-from designate.objects.adapters import DesignateAdapter
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/v2/controllers/zones/tasks/imports.py b/designate/api/v2/controllers/zones/tasks/imports.py
index 25e4dc8c..3f74cbae 100644
--- a/designate/api/v2/controllers/zones/tasks/imports.py
+++ b/designate/api/v2/controllers/zones/tasks/imports.py
@@ -13,13 +13,13 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import exceptions
-from designate import utils
 from designate.api.v2.controllers import rest
+from designate import exceptions
 from designate.objects.adapters import DesignateAdapter
+from designate import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/v2/controllers/zones/tasks/transfer_accepts.py b/designate/api/v2/controllers/zones/tasks/transfer_accepts.py
index 6cd67652..b2a3299a 100644
--- a/designate/api/v2/controllers/zones/tasks/transfer_accepts.py
+++ b/designate/api/v2/controllers/zones/tasks/transfer_accepts.py
@@ -13,13 +13,13 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import utils
 from designate.api.v2.controllers import rest
-from designate.objects import ZoneTransferAccept
 from designate.objects.adapters import DesignateAdapter
+from designate.objects import ZoneTransferAccept
+from designate import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/v2/controllers/zones/tasks/transfer_requests.py b/designate/api/v2/controllers/zones/tasks/transfer_requests.py
index a6b24458..947bce8a 100644
--- a/designate/api/v2/controllers/zones/tasks/transfer_requests.py
+++ b/designate/api/v2/controllers/zones/tasks/transfer_requests.py
@@ -13,14 +13,14 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import utils
-from designate import exceptions
 from designate.api.v2.controllers import rest
-from designate.objects import ZoneTransferRequest
+from designate import exceptions
 from designate.objects.adapters import DesignateAdapter
+from designate.objects import ZoneTransferRequest
+from designate import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/v2/controllers/zones/tasks/xfr.py b/designate/api/v2/controllers/zones/tasks/xfr.py
index 9743dfa4..a80aa03d 100644
--- a/designate/api/v2/controllers/zones/tasks/xfr.py
+++ b/designate/api/v2/controllers/zones/tasks/xfr.py
@@ -13,11 +13,11 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import pecan
 from oslo_log import log as logging
+import pecan
 
-from designate import utils
 from designate.api.v2.controllers import rest
+from designate import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/api/wsgi.py b/designate/api/wsgi.py
index 4d2e41ec..35b8ae19 100644
--- a/designate/api/wsgi.py
+++ b/designate/api/wsgi.py
@@ -17,11 +17,11 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from paste import deploy
 
+from designate.common import config
 from designate import conf
 from designate import heartbeat_emitter
 from designate import policy
 from designate import rpc
-from designate.common import config
 
 CONF = conf.CONF