diff --git a/senlinclient/common/exc.py b/senlinclient/common/exc.py
index 77122832..3be64224 100644
--- a/senlinclient/common/exc.py
+++ b/senlinclient/common/exc.py
@@ -13,7 +13,6 @@
 from keystoneauth1.exceptions import base as kae_base
 from keystoneauth1.exceptions import http as kae_http
 from openstack import exceptions as sdkexc
-
 from oslo_serialization import jsonutils
 from requests import exceptions as reqexc
 import six
diff --git a/senlinclient/tests/unit/test_sdk.py b/senlinclient/tests/unit/test_sdk.py
index 57cbcc33..535ddfc3 100644
--- a/senlinclient/tests/unit/test_sdk.py
+++ b/senlinclient/tests/unit/test_sdk.py
@@ -11,10 +11,9 @@
 # under the License.
 
 import mock
-import testtools
-
 from openstack import connection as sdk_connection
 from openstack import profile as sdk_profile
+import testtools
 
 from senlinclient.common import sdk
 
diff --git a/senlinclient/tests/unit/test_utils.py b/senlinclient/tests/unit/test_utils.py
index 1efecafa..f961c733 100644
--- a/senlinclient/tests/unit/test_utils.py
+++ b/senlinclient/tests/unit/test_utils.py
@@ -11,12 +11,13 @@
 # under the License.
 
 import collections
-import mock
-import six
 import sys
-import testtools
 
 from heatclient.common import template_utils
+import mock
+import six
+import testtools
+
 from senlinclient.common import exc
 from senlinclient.common.i18n import _
 from senlinclient.common import utils
diff --git a/senlinclient/tests/unit/v1/fakes.py b/senlinclient/tests/unit/v1/fakes.py
index 46198974..8acadedd 100644
--- a/senlinclient/tests/unit/v1/fakes.py
+++ b/senlinclient/tests/unit/v1/fakes.py
@@ -10,13 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import json
-import mock
-import requests
-import six
 import sys
 
+import json
+import mock
 from osc_lib.tests import utils
+import requests
+import six
 
 
 AUTH_TOKEN = "foobar"
diff --git a/senlinclient/tests/unit/v1/test_action.py b/senlinclient/tests/unit/v1/test_action.py
index 60ee62d2..12255f7f 100644
--- a/senlinclient/tests/unit/v1/test_action.py
+++ b/senlinclient/tests/unit/v1/test_action.py
@@ -11,8 +11,8 @@
 # under the License.
 
 import copy
-import mock
 
+import mock
 from openstack.cluster.v1 import action as sdk_action
 from openstack import exceptions as sdk_exc
 from osc_lib import exceptions as exc
diff --git a/senlinclient/tests/unit/v1/test_build_info.py b/senlinclient/tests/unit/v1/test_build_info.py
index d49344c8..77b8d6e3 100644
--- a/senlinclient/tests/unit/v1/test_build_info.py
+++ b/senlinclient/tests/unit/v1/test_build_info.py
@@ -11,7 +11,6 @@
 # under the License.
 
 import mock
-
 from openstack.cluster.v1 import build_info as sbi
 
 from senlinclient.tests.unit.v1 import fakes
diff --git a/senlinclient/tests/unit/v1/test_cluster_policy.py b/senlinclient/tests/unit/v1/test_cluster_policy.py
index 69158b0b..d6ac18d2 100644
--- a/senlinclient/tests/unit/v1/test_cluster_policy.py
+++ b/senlinclient/tests/unit/v1/test_cluster_policy.py
@@ -11,7 +11,6 @@
 # under the License.
 
 import mock
-
 from openstack.cluster.v1 import cluster_policy as scp
 
 from senlinclient.tests.unit.v1 import fakes
diff --git a/senlinclient/tests/unit/v1/test_event.py b/senlinclient/tests/unit/v1/test_event.py
index 30821ec8..662ab22c 100644
--- a/senlinclient/tests/unit/v1/test_event.py
+++ b/senlinclient/tests/unit/v1/test_event.py
@@ -11,8 +11,8 @@
 # under the License.
 
 import copy
-import mock
 
+import mock
 from openstack.cluster.v1 import event as sdk_event
 from openstack import exceptions as sdk_exc
 from osc_lib import exceptions as exc
diff --git a/senlinclient/tests/unit/v1/test_node.py b/senlinclient/tests/unit/v1/test_node.py
index 516ee635..7f34a60d 100644
--- a/senlinclient/tests/unit/v1/test_node.py
+++ b/senlinclient/tests/unit/v1/test_node.py
@@ -11,12 +11,12 @@
 # under the License.
 
 import copy
-import mock
-import six
 
+import mock
 from openstack.cluster.v1 import node as sdk_node
 from openstack import exceptions as sdk_exc
 from osc_lib import exceptions as exc
+import six
 
 from senlinclient.tests.unit.v1 import fakes
 from senlinclient.v1 import node as osc_node
diff --git a/senlinclient/tests/unit/v1/test_policy.py b/senlinclient/tests/unit/v1/test_policy.py
index 168f6039..62b42a68 100644
--- a/senlinclient/tests/unit/v1/test_policy.py
+++ b/senlinclient/tests/unit/v1/test_policy.py
@@ -11,12 +11,12 @@
 # under the License.
 
 import copy
-import mock
-import six
 
+import mock
 from openstack.cluster.v1 import policy as sdk_policy
 from openstack import exceptions as sdk_exc
 from osc_lib import exceptions as exc
+import six
 
 from senlinclient.tests.unit.v1 import fakes
 from senlinclient.v1 import policy as osc_policy
diff --git a/senlinclient/tests/unit/v1/test_policy_type.py b/senlinclient/tests/unit/v1/test_policy_type.py
index 378c59e4..f0dbafc3 100644
--- a/senlinclient/tests/unit/v1/test_policy_type.py
+++ b/senlinclient/tests/unit/v1/test_policy_type.py
@@ -11,7 +11,6 @@
 # under the License.
 
 import mock
-
 from openstack.cluster.v1 import policy_type as sdk_policy_type
 from openstack import exceptions as sdk_exc
 from osc_lib import exceptions as exc
diff --git a/senlinclient/tests/unit/v1/test_profile.py b/senlinclient/tests/unit/v1/test_profile.py
index 34213012..1091b2d4 100644
--- a/senlinclient/tests/unit/v1/test_profile.py
+++ b/senlinclient/tests/unit/v1/test_profile.py
@@ -11,13 +11,13 @@
 # under the License.
 
 import copy
-import mock
-import six
 
+import mock
 from openstack.cluster.v1 import profile as sdk_profile
 from openstack import exceptions as sdk_exc
 from osc_lib import exceptions as exc
 from osc_lib import utils
+import six
 
 from senlinclient.tests.unit.v1 import fakes
 from senlinclient.v1 import profile as osc_profile
diff --git a/senlinclient/tests/unit/v1/test_profile_type.py b/senlinclient/tests/unit/v1/test_profile_type.py
index 36adcd76..21633285 100644
--- a/senlinclient/tests/unit/v1/test_profile_type.py
+++ b/senlinclient/tests/unit/v1/test_profile_type.py
@@ -11,7 +11,6 @@
 # under the License.
 
 import mock
-
 from openstack.cluster.v1 import profile_type as sdk_profile_type
 from openstack import exceptions as sdk_exc
 from osc_lib import exceptions as exc
diff --git a/senlinclient/tests/unit/v1/test_receiver.py b/senlinclient/tests/unit/v1/test_receiver.py
index 751f69e0..f9312778 100644
--- a/senlinclient/tests/unit/v1/test_receiver.py
+++ b/senlinclient/tests/unit/v1/test_receiver.py
@@ -11,12 +11,12 @@
 # under the License.
 
 import copy
-import mock
-import six
 
+import mock
 from openstack.cluster.v1 import receiver as sdk_receiver
 from openstack import exceptions as sdk_exc
 from osc_lib import exceptions as exc
+import six
 
 from senlinclient.common.i18n import _
 from senlinclient.tests.unit.v1 import fakes
diff --git a/senlinclient/tests/unit/v1/test_shell.py b/senlinclient/tests/unit/v1/test_shell.py
index af0c0572..1273bff2 100644
--- a/senlinclient/tests/unit/v1/test_shell.py
+++ b/senlinclient/tests/unit/v1/test_shell.py
@@ -14,11 +14,11 @@ import copy
 import subprocess
 
 import mock
+from openstack import exceptions as oexc
+from oslotest import mockpatch
 import six
 import testtools
 
-from openstack import exceptions as oexc
-from oslotest import mockpatch
 from senlinclient.common import exc
 from senlinclient.common.i18n import _
 from senlinclient.common import utils