Order imports in alphabetical order (5/9)

This patch is one in a series to re-enable H306 style check rule
(imports are in alphabetical order).
It touches engine files (without resources).

Implements: blueprint reduce-flake8-ignored-rules (partial)
Change-Id: Ifd36fc49199c48af891bd8e7cc2d2262a53032eb

heat/engine/api.py

@@ -12,12 +12,11 @@
 #    under the License.
 
 from heat.common import template_format
-from heat.rpc import api
-from heat.openstack.common import timeutils
 from heat.engine import constraints as constr
-
-from heat.openstack.common import log as logging
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
+from heat.openstack.common import timeutils
+from heat.rpc import api
 
 logger = logging.getLogger(__name__)
 

heat/engine/cfn/functions.py

@@ -17,7 +17,6 @@ import json
 
 from heat.api.aws import utils as aws_utils
 from heat.common import exception
-
 from heat.engine import function
 
 

heat/engine/clients.py

@@ -12,19 +12,18 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
-
-from heat.openstack.common import importutils
-from heat.openstack.common import log as logging
-from heat.openstack.common.gettextutils import _
-
-logger = logging.getLogger(__name__)
-
-
-from heat.common import heat_keystoneclient as hkc
 from heatclient import client as heatclient
 from novaclient import client as novaclient
 from novaclient import shell as novashell
+from oslo.config import cfg
+
+from heat.common import heat_keystoneclient as hkc
+from heat.openstack.common.gettextutils import _
+from heat.openstack.common import importutils
+from heat.openstack.common import log as logging
+
+logger = logging.getLogger(__name__)
+
 
 try:
     from swiftclient import client as swiftclient

heat/engine/dependencies.py

@@ -18,7 +18,6 @@ import itertools
 from six.moves import xrange
 
 from heat.common import exception
-
 from heat.openstack.common.gettextutils import _
 
 

heat/engine/environment.py

@@ -18,10 +18,10 @@ import os.path
 
 from oslo.config import cfg
 
-from heat.openstack.common import log
-from heat.openstack.common.gettextutils import _
 from heat.common import environment_format
 from heat.common import exception
+from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

heat/engine/event.py

@@ -12,11 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from heat.db import api as db_api
 from heat.common import exception
 from heat.common import identifier
-from heat.openstack.common import log as logging
+from heat.db import api as db_api
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)
 

heat/engine/hot/functions.py

@@ -14,7 +14,6 @@
 import collections
 
 from heat.common import exception
-
 from heat.engine.cfn import functions as cfn_funcs
 from heat.engine import function
 

heat/engine/hot/parameters.py

@@ -14,10 +14,8 @@
 
 from heat.engine import constraints as constr
 from heat.engine import parameters
-
 from heat.openstack.common import log as logging
 
-
 logger = logging.getLogger(__name__)
 
 

heat/engine/hot/template.py

@@ -10,13 +10,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from heat.engine import template
 from heat.engine.cfn import template as cfn_template
 from heat.engine.hot import parameters
+from heat.engine import template
 from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 
-
 logger = logging.getLogger(__name__)
 
 

heat/engine/notification/autoscaling.py

@@ -11,10 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from heat.openstack.common.notifier import api as notifier_api
-
 from heat.engine import api as engine_api
 from heat.engine import notification
+from heat.openstack.common.notifier import api as notifier_api
 
 
 def send(stack,

heat/engine/notification/stack.py

@@ -11,10 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from heat.openstack.common.notifier import api as notifier_api
-
 from heat.engine import api as engine_api
 from heat.engine import notification
+from heat.openstack.common.notifier import api as notifier_api
 
 
 def send(stack):

heat/engine/parameter_groups.py

@@ -9,10 +9,10 @@
 #    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 heat.openstack.common import log as logging
-from heat.openstack.common.gettextutils import _
 
 from heat.common.exception import StackValidationFailed
+from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)
 

heat/engine/parameters.py

@@ -15,9 +15,9 @@
 import collections
 import itertools
 import json
-from heat.engine import constraints as constr
 
 from heat.common import exception
+from heat.engine import constraints as constr
 
 
 PARAMETER_KEYS = (

heat/engine/parser.py

@@ -16,31 +16,29 @@ import collections
 import copy
 from datetime import datetime
 import re
-import six
 
 from oslo.config import cfg
+import six
 
-from heat.engine import environment
 from heat.common import exception
-from heat.engine import dependencies
+from heat.common.exception import StackValidationFailed
 from heat.common import identifier
+from heat.db import api as db_api
+from heat.engine.clients import Clients
+from heat.engine import dependencies
+from heat.engine import environment
 from heat.engine import function
+from heat.engine.notification import stack as notification
+from heat.engine.parameter_groups import ParameterGroups
 from heat.engine import resource
 from heat.engine import resources
 from heat.engine import scheduler
-from heat.engine import update
-from heat.engine.notification import stack as notification
-from heat.engine.parameter_groups import ParameterGroups
 from heat.engine.template import Template
-from heat.engine.clients import Clients
+from heat.engine import update
-from heat.db import api as db_api
-
-from heat.openstack.common import log as logging
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 from heat.openstack.common import strutils
 
-from heat.common.exception import StackValidationFailed
-
 logger = logging.getLogger(__name__)
 
 

heat/engine/plugin_manager.py

@@ -18,9 +18,8 @@ import sys
 
 from oslo.config import cfg
 
-from heat.openstack.common import log
 from heat.common import plugin_loader
-
+from heat.openstack.common import log
 
 logger = log.getLogger(__name__)
 

heat/engine/properties.py

@@ -15,9 +15,9 @@
 import collections
 
 from heat.common import exception
+from heat.engine import constraints as constr
 from heat.engine import parameters
 from heat.engine import support
-from heat.engine import constraints as constr
 
 SCHEMA_KEYS = (
     REQUIRED, IMPLEMENTED, DEFAULT, TYPE, SCHEMA,

heat/engine/resource.py

@@ -16,22 +16,20 @@ import base64
 import copy
 from datetime import datetime
 
-from heat.engine import event
 from heat.common import exception
-from heat.engine import function
-from heat.openstack.common import excutils
-from heat.db import api as db_api
 from heat.common import identifier
 from heat.common import short_id
-from heat.engine import scheduler
+from heat.db import api as db_api
-from heat.engine import resources
-from heat.engine import support
-# import class to avoid name collisions and ugly aliasing
 from heat.engine.attributes import Attributes
+from heat.engine import event
+from heat.engine import function
 from heat.engine.properties import Properties
-
+from heat.engine import resources
-from heat.openstack.common import log as logging
+from heat.engine import scheduler
+from heat.engine import support
+from heat.openstack.common import excutils
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)
 

heat/engine/scheduler.py

@@ -12,16 +12,17 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import eventlet
 import functools
 import itertools
 import sys
-import types
 from time import time as wallclock
+import types
+
+import eventlet
 
 from heat.openstack.common import excutils
-from heat.openstack.common import log as logging
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)
 

heat/engine/service.py

@@ -18,22 +18,16 @@ import json
 from oslo.config import cfg
 import webob
 
-cfg.CONF.import_opt('engine_life_check_timeout', 'heat.common.config')
-cfg.CONF.import_opt('max_resources_per_stack', 'heat.common.config')
-cfg.CONF.import_opt('max_stacks_per_tenant', 'heat.common.config')
-
-from heat.openstack.common import timeutils
 from heat.common import context
+from heat.common import exception
+from heat.common import heat_keystoneclient as hkc
+from heat.common import identifier
 from heat.db import api as db_api
 from heat.engine import api
-from heat.rpc import api as rpc_api
 from heat.engine import attributes
 from heat.engine import clients
-from heat.engine.event import Event
 from heat.engine import environment
-from heat.common import exception
+from heat.engine.event import Event
-from heat.common import identifier
-from heat.common import heat_keystoneclient as hkc
 from heat.engine import parameter_groups
 from heat.engine import parser
 from heat.engine import properties
@@ -41,15 +35,20 @@ from heat.engine import resource
 from heat.engine import resources
 from heat.engine import stack_lock
 from heat.engine import watchrule
-
+from heat.openstack.common import excutils
-from heat.openstack.common import log as logging
-from heat.openstack.common import threadgroup
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 from heat.openstack.common.rpc import common as rpc_common
 from heat.openstack.common.rpc import proxy
 from heat.openstack.common.rpc import service
-from heat.openstack.common import excutils
+from heat.openstack.common import threadgroup
+from heat.openstack.common import timeutils
 from heat.openstack.common import uuidutils
+from heat.rpc import api as rpc_api
+
+cfg.CONF.import_opt('engine_life_check_timeout', 'heat.common.config')
+cfg.CONF.import_opt('max_resources_per_stack', 'heat.common.config')
+cfg.CONF.import_opt('max_stacks_per_tenant', 'heat.common.config')
 
 logger = logging.getLogger(__name__)
 

heat/engine/signal_responder.py

@@ -12,18 +12,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from keystoneclient.contrib.ec2 import utils as ec2_utils
+from oslo.config import cfg
 from six.moves.urllib import parse as urlparse
 
-from oslo.config import cfg
-
-from keystoneclient.contrib.ec2 import utils as ec2_utils
-
-from heat.db import api as db_api
 from heat.common import exception
+from heat.db import api as db_api
 from heat.engine import stack_user
-
-from heat.openstack.common import log as logging
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 
 
 logger = logging.getLogger(__name__)

heat/engine/stack_lock.py

@@ -12,18 +12,18 @@
 #    under the License.
 
 import uuid
-from oslo.config import cfg
 
-cfg.CONF.import_opt('engine_life_check_timeout', 'heat.common.config')
+from oslo.config import cfg
 
 from heat.common import exception
 from heat.db import api as db_api
-
-from heat.openstack.common import log as logging
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 from heat.openstack.common.rpc import common as rpc_common
 from heat.openstack.common.rpc import proxy
 
+cfg.CONF.import_opt('engine_life_check_timeout', 'heat.common.config')
+
 logger = logging.getLogger(__name__)
 
 

heat/engine/stack_resource.py

@@ -20,9 +20,8 @@ from heat.engine import environment
 from heat.engine import parser
 from heat.engine import resource
 from heat.engine import scheduler
-
-from heat.openstack.common import log as logging
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)
 

heat/engine/stack_user.py

@@ -14,12 +14,11 @@
 
 import keystoneclient.exceptions as kc_exception
 
-from heat.db import api as db_api
 from heat.common import exception
+from heat.db import api as db_api
 from heat.engine import resource
-
-from heat.openstack.common import log as logging
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 
 
 logger = logging.getLogger(__name__)

heat/engine/template.py

@@ -16,8 +16,8 @@ import abc
 import collections
 import functools
 
-from heat.db import api as db_api
 from heat.common import exception
+from heat.db import api as db_api
 from heat.engine import plugin_manager
 
 

heat/engine/update.py

@@ -15,13 +15,11 @@
 import copy
 
 from heat.db import api as db_api
-
 from heat.engine import dependencies
 from heat.engine import resource
 from heat.engine import scheduler
-
-from heat.openstack.common import log as logging
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)
 

heat/engine/watchrule.py

@@ -14,13 +14,14 @@
 
 
 import datetime
+
 from heat.common import exception
-from heat.openstack.common import log as logging
-from heat.openstack.common.gettextutils import _
-from heat.openstack.common import timeutils
-from heat.engine import timestamp
 from heat.db import api as db_api
 from heat.engine import parser
+from heat.engine import timestamp
+from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
+from heat.openstack.common import timeutils
 from heat.rpc import api as rpc_api
 
 logger = logging.getLogger(__name__)