Update imoprt order

This patch updates import order.

Co-Authored-By: Qiming Teng (tengqim@cn.ibm.com)
Change-Id: Ie3c33dddb32f70d7a9663e8125a9a073cbd7810c
This commit is contained in:
jonnary 2016-12-24 22:38:08 +08:00 committed by tengqm
parent 9e53229b64
commit 4273feb35b
15 changed files with 21 additions and 26 deletions

@ -13,7 +13,6 @@
from keystoneauth1.exceptions import base as kae_base from keystoneauth1.exceptions import base as kae_base
from keystoneauth1.exceptions import http as kae_http from keystoneauth1.exceptions import http as kae_http
from openstack import exceptions as sdkexc from openstack import exceptions as sdkexc
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from requests import exceptions as reqexc from requests import exceptions as reqexc
import six import six

@ -11,10 +11,9 @@
# under the License. # under the License.
import mock import mock
import testtools
from openstack import connection as sdk_connection from openstack import connection as sdk_connection
from openstack import profile as sdk_profile from openstack import profile as sdk_profile
import testtools
from senlinclient.common import sdk from senlinclient.common import sdk

@ -11,12 +11,13 @@
# under the License. # under the License.
import collections import collections
import mock
import six
import sys import sys
import testtools
from heatclient.common import template_utils from heatclient.common import template_utils
import mock
import six
import testtools
from senlinclient.common import exc from senlinclient.common import exc
from senlinclient.common.i18n import _ from senlinclient.common.i18n import _
from senlinclient.common import utils from senlinclient.common import utils

@ -10,13 +10,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import json
import mock
import requests
import six
import sys import sys
import json
import mock
from osc_lib.tests import utils from osc_lib.tests import utils
import requests
import six
AUTH_TOKEN = "foobar" AUTH_TOKEN = "foobar"

@ -11,8 +11,8 @@
# under the License. # under the License.
import copy import copy
import mock
import mock
from openstack.cluster.v1 import action as sdk_action from openstack.cluster.v1 import action as sdk_action
from openstack import exceptions as sdk_exc from openstack import exceptions as sdk_exc
from osc_lib import exceptions as exc from osc_lib import exceptions as exc

@ -11,7 +11,6 @@
# under the License. # under the License.
import mock import mock
from openstack.cluster.v1 import build_info as sbi from openstack.cluster.v1 import build_info as sbi
from senlinclient.tests.unit.v1 import fakes from senlinclient.tests.unit.v1 import fakes

@ -11,7 +11,6 @@
# under the License. # under the License.
import mock import mock
from openstack.cluster.v1 import cluster_policy as scp from openstack.cluster.v1 import cluster_policy as scp
from senlinclient.tests.unit.v1 import fakes from senlinclient.tests.unit.v1 import fakes

@ -11,8 +11,8 @@
# under the License. # under the License.
import copy import copy
import mock
import mock
from openstack.cluster.v1 import event as sdk_event from openstack.cluster.v1 import event as sdk_event
from openstack import exceptions as sdk_exc from openstack import exceptions as sdk_exc
from osc_lib import exceptions as exc from osc_lib import exceptions as exc

@ -11,12 +11,12 @@
# under the License. # under the License.
import copy import copy
import mock
import six
import mock
from openstack.cluster.v1 import node as sdk_node from openstack.cluster.v1 import node as sdk_node
from openstack import exceptions as sdk_exc from openstack import exceptions as sdk_exc
from osc_lib import exceptions as exc from osc_lib import exceptions as exc
import six
from senlinclient.tests.unit.v1 import fakes from senlinclient.tests.unit.v1 import fakes
from senlinclient.v1 import node as osc_node from senlinclient.v1 import node as osc_node

@ -11,12 +11,12 @@
# under the License. # under the License.
import copy import copy
import mock
import six
import mock
from openstack.cluster.v1 import policy as sdk_policy from openstack.cluster.v1 import policy as sdk_policy
from openstack import exceptions as sdk_exc from openstack import exceptions as sdk_exc
from osc_lib import exceptions as exc from osc_lib import exceptions as exc
import six
from senlinclient.tests.unit.v1 import fakes from senlinclient.tests.unit.v1 import fakes
from senlinclient.v1 import policy as osc_policy from senlinclient.v1 import policy as osc_policy

@ -11,7 +11,6 @@
# under the License. # under the License.
import mock import mock
from openstack.cluster.v1 import policy_type as sdk_policy_type from openstack.cluster.v1 import policy_type as sdk_policy_type
from openstack import exceptions as sdk_exc from openstack import exceptions as sdk_exc
from osc_lib import exceptions as exc from osc_lib import exceptions as exc

@ -11,13 +11,13 @@
# under the License. # under the License.
import copy import copy
import mock
import six
import mock
from openstack.cluster.v1 import profile as sdk_profile from openstack.cluster.v1 import profile as sdk_profile
from openstack import exceptions as sdk_exc from openstack import exceptions as sdk_exc
from osc_lib import exceptions as exc from osc_lib import exceptions as exc
from osc_lib import utils from osc_lib import utils
import six
from senlinclient.tests.unit.v1 import fakes from senlinclient.tests.unit.v1 import fakes
from senlinclient.v1 import profile as osc_profile from senlinclient.v1 import profile as osc_profile

@ -11,7 +11,6 @@
# under the License. # under the License.
import mock import mock
from openstack.cluster.v1 import profile_type as sdk_profile_type from openstack.cluster.v1 import profile_type as sdk_profile_type
from openstack import exceptions as sdk_exc from openstack import exceptions as sdk_exc
from osc_lib import exceptions as exc from osc_lib import exceptions as exc

@ -11,12 +11,12 @@
# under the License. # under the License.
import copy import copy
import mock
import six
import mock
from openstack.cluster.v1 import receiver as sdk_receiver from openstack.cluster.v1 import receiver as sdk_receiver
from openstack import exceptions as sdk_exc from openstack import exceptions as sdk_exc
from osc_lib import exceptions as exc from osc_lib import exceptions as exc
import six
from senlinclient.common.i18n import _ from senlinclient.common.i18n import _
from senlinclient.tests.unit.v1 import fakes from senlinclient.tests.unit.v1 import fakes

@ -14,11 +14,11 @@ import copy
import subprocess import subprocess
import mock import mock
from openstack import exceptions as oexc
from oslotest import mockpatch
import six import six
import testtools import testtools
from openstack import exceptions as oexc
from oslotest import mockpatch
from senlinclient.common import exc from senlinclient.common import exc
from senlinclient.common.i18n import _ from senlinclient.common.i18n import _
from senlinclient.common import utils from senlinclient.common import utils