Fix import order of modules

Make corrections in import order for six, yaml, eventlet and
greenlet as per OpenStack import standards [1].

[1] http://docs.openstack.org/developer/hacking/#import-order-template

Change-Id: I26feb4adb81e8b07a7a36ac7f0a6235536a8c119

contrib/plugins/cloudify_plugin/murano_cloudify_plugin/cloudify_tosca_package.py

@@ -11,9 +11,9 @@
 #    under the License.
 
 import os
-import yaml
 
 import six
+import yaml
 
 from murano.packages import exceptions
 from murano.packages import package_base

murano/api/middleware/fault.py

@@ -14,11 +14,11 @@
 Cinder's faultwrapper
 """
 
-import six
 import sys
 import traceback
 
 from oslo_config import cfg
+import six
 import webob
 
 from murano.common import wsgi

murano/api/v1/cloudfoundry/router.py

@@ -14,7 +14,6 @@
 import routes
 
 from murano.api.v1.cloudfoundry import cfapi
-
 from murano.common import wsgi
 
 

murano/api/v1/environments.py

@@ -12,10 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 from oslo_db import exception as db_exc
 from oslo_log import log as logging
+import six
 from sqlalchemy import desc
 from webob import exc
 

murano/api/v1/templates.py

@@ -12,10 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 from oslo_db import exception as db_exc
 from oslo_log import log as logging
+import six
 from webob import exc
 
 from murano.api.v1 import request_statistics

murano/cmd/api.py

@@ -19,7 +19,6 @@ import os
 import sys
 
 import eventlet
-
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_service import service

murano/cmd/cfapi.py

@@ -19,7 +19,6 @@ import os
 import sys
 
 import eventlet
-
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_service import service

murano/cmd/engine.py

@@ -18,7 +18,6 @@ import os
 import sys
 
 import eventlet
-
 from oslo_log import log as logging
 from oslo_service import service
 

murano/common/messaging/subscription.py

@@ -18,6 +18,7 @@ import socket
 import time
 
 from eventlet import patcher
+
 from murano.common.messaging import message
 
 kombu = patcher.import_patched('kombu')

murano/common/wsgi.py

@@ -18,7 +18,6 @@
 import datetime
 import errno
 import re
-import six
 import socket
 import sys
 import time
@@ -35,6 +34,7 @@ from oslo_service import service
 from oslo_service import sslutils
 import routes
 import routes.middleware
+import six
 import webob.dec
 import webob.exc
 

murano/context.py

@@ -12,9 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from murano.common import policy
 from oslo_context import context
 
+from murano.common import policy
+
 
 class RequestContext(context.RequestContext):
     """Class that stores context info about an API request.

murano/db/migration/helpers.py

@@ -12,9 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 from alembic import op
+import six
 import sqlalchemy as sa
 
 

murano/db/services/environments.py

@@ -12,11 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
 
 from keystoneclient import exceptions as ks_exceptions
 from oslo_config import cfg
 from oslo_log import log as logging
+import six
 import yaml
 
 from murano.common import auth_utils

murano/dsl/executor.py

@@ -15,12 +15,12 @@
 import collections
 import contextlib
 import itertools
-import six
 import weakref
 
 import eventlet
 import eventlet.event
 from oslo_log import log as logging
+import six
 from yaql.language import specs
 
 from murano.common.i18n import _LW

murano/dsl/principal_objects/stack_trace.py

@@ -14,8 +14,8 @@
 
 import inspect
 import os.path
-import six
 
+import six
 from yaql import specs
 
 from murano.dsl import constants

murano/dsl/type_scheme.py

@@ -12,10 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
 import sys
 import uuid
 
+import six
 from yaql.language import specs
 from yaql.language import utils
 from yaql.language import yaqltypes

murano/dsl/typespec.py

@@ -12,10 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
 import sys
 import weakref
 
+import six
+
 from murano.dsl import exceptions
 from murano.dsl import type_scheme
 

murano/dsl/yaql_expression.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 import re
-import six
 
+import six
 from yaql.language import exceptions as yaql_exceptions
 from yaql.language import expressions
 

murano/engine/system/agent_listener.py

@@ -15,7 +15,6 @@
 
 import eventlet
 import greenlet
-
 from oslo_config import cfg
 from oslo_log import log as logging
 

murano/engine/system/yaql_functions.py

@@ -17,13 +17,13 @@ import base64
 import collections
 import random
 import re
-import six
-from six.moves import range
 import string
 import time
 
 import jsonpatch
 import jsonpointer
+import six
+from six.moves import range
 from yaql.language import specs
 from yaql.language import utils
 from yaql.language import yaqltypes

murano/policy/modify/actions/action_manager.py

@@ -13,12 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-import yaml
-
 from oslo_log import log as logging
 from oslo_utils import importutils
+import six
 from stevedore import extension
+import yaml
 
 LOG = logging.getLogger(__name__)
 

murano/policy/modify/actions/base.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 import abc
+
 import six
 
 

murano/tests/functional/common/utils.py

@@ -16,6 +16,7 @@ import contextlib
 import json
 import os
 import random
+import re
 import socket
 import telnetlib
 import time
@@ -27,7 +28,6 @@ import keystoneclient.v3 as keystoneclientv3
 from muranoclient import client as mclient
 import muranoclient.common.exceptions as exceptions
 from oslo_log import log as logging
-import re
 import yaml
 
 from murano.services import states