Rewrite malformed imports order

Change import order to correct where it was necessary.

Change-Id: Idab368e0c2ac438c6847b36ca099ef81c607e38d
Closes-Bug: 1430472

sahara/plugins/hdp/hadoopserver.py

@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo_log import log as logging
-
 import re
 
+from oslo_log import log as logging
+
 from sahara.i18n import _
 from sahara.i18n import _LI
 from sahara.plugins import exceptions as ex

sahara/service/ops.py

@@ -14,12 +14,12 @@
 # limitations under the License.
 
 import functools
-import six
 import uuid
 
 from oslo_config import cfg
 from oslo_log import log as logging
 import oslo_messaging as messaging
+import six
 
 from sahara import conductor as c
 from sahara import context

sahara/tests/integration/tests/gating/test_mapr_gating.py

@@ -12,13 +12,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import fixtures
 import json
 import random
 import string
 import time
 import uuid
 
+import fixtures
 import six
 
 from sahara.tests.integration.tests import base as b

sahara/tests/unit/conductor/manager/test_templates.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 import copy
+
 import testtools
 
 from sahara.conductor import manager

sahara/tests/unit/plugins/spark/test_config_helper.py

@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
-
 import copy
 import xml.dom.minidom as xml
 
+import mock
+
 from sahara.plugins.spark import config_helper as c_helper
 from sahara.swift import swift_helper as swift
 from sahara.tests.unit import base as test_base

sahara/tests/unit/service/edp/spark/test_spark.py

@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import os
 
+import mock
+
 import sahara.exceptions as ex
 from sahara.service.edp.spark import engine as se
 from sahara.tests.unit import base

sahara/tests/unit/utils/test_cluster_progress_ops.py

@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import uuid
 
+import mock
+
 from sahara import conductor
 from sahara import context
 from sahara.tests.unit import base