From 3b49d2299361405e5893c8eec4b26b3c0d5b8d55 Mon Sep 17 00:00:00 2001
From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Mon, 31 Dec 2012 22:25:00 +0800
Subject: [PATCH] Fix import order nits
Change-Id: I7c95fa2db1d719f6ed34468ad12b7a9e4c9e794d
---
quantumclient/common/clientmanager.py | 5 +++--
quantumclient/quantum/v2_0/network.py | 2 +-
quantumclient/shell.py | 1 +
quantumclient/tests/unit/test_auth.py | 10 +++++-----
quantumclient/tests/unit/test_cli20.py | 2 +-
quantumclient/tests/unit/test_cli20_network.py | 13 +++++++------
quantumclient/tests/unit/test_cli20_port.py | 13 +++++++------
quantumclient/tests/unit/test_cli20_subnet.py | 8 ++++----
quantumclient/v2_0/client.py | 15 +--------------
9 files changed, 30 insertions(+), 39 deletions(-)
diff --git a/quantumclient/common/clientmanager.py b/quantumclient/common/clientmanager.py
index 1c1f1ac..7346aa5 100644
--- a/quantumclient/common/clientmanager.py
+++ b/quantumclient/common/clientmanager.py
@@ -20,10 +20,11 @@
import logging
+from quantumclient.client import HTTPClient
from quantumclient.common import exceptions as exc
-
from quantumclient.quantum import client as quantum_client
-from quantumclient.client import HTTPClient
+
+
LOG = logging.getLogger(__name__)
diff --git a/quantumclient/quantum/v2_0/network.py b/quantumclient/quantum/v2_0/network.py
index 070de54..19b9978 100644
--- a/quantumclient/quantum/v2_0/network.py
+++ b/quantumclient/quantum/v2_0/network.py
@@ -21,8 +21,8 @@ import logging
from quantumclient.quantum.v2_0 import CreateCommand
from quantumclient.quantum.v2_0 import DeleteCommand
from quantumclient.quantum.v2_0 import ListCommand
-from quantumclient.quantum.v2_0 import UpdateCommand
from quantumclient.quantum.v2_0 import ShowCommand
+from quantumclient.quantum.v2_0 import UpdateCommand
def _format_subnets(network):
diff --git a/quantumclient/shell.py b/quantumclient/shell.py
index 0beae19..36f3e0c 100644
--- a/quantumclient/shell.py
+++ b/quantumclient/shell.py
@@ -18,6 +18,7 @@
"""
Command-line interface to the Quantum APIs
"""
+
import argparse
import gettext
import logging
diff --git a/quantumclient/tests/unit/test_auth.py b/quantumclient/tests/unit/test_auth.py
index 9f270b5..477ba90 100644
--- a/quantumclient/tests/unit/test_auth.py
+++ b/quantumclient/tests/unit/test_auth.py
@@ -15,16 +15,16 @@
#
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-import mox
-from mox import ContainsKeyValue, IsA, StrContains
-import unittest
-
import httplib2
import json
+import unittest
import uuid
-from quantumclient.common import exceptions
+import mox
+from mox import ContainsKeyValue, IsA, StrContains
+
from quantumclient.client import HTTPClient
+from quantumclient.common import exceptions
USERNAME = 'testuser'
diff --git a/quantumclient/tests/unit/test_cli20.py b/quantumclient/tests/unit/test_cli20.py
index 15ca122..950c23d 100644
--- a/quantumclient/tests/unit/test_cli20.py
+++ b/quantumclient/tests/unit/test_cli20.py
@@ -19,8 +19,8 @@ import sys
import unittest
import mox
-from mox import ContainsKeyValue
from mox import Comparator
+from mox import ContainsKeyValue
from quantumclient.quantum import v2_0 as quantumv20
from quantumclient.v2_0.client import Client
diff --git a/quantumclient/tests/unit/test_cli20_network.py b/quantumclient/tests/unit/test_cli20_network.py
index 5360c08..1ef0215 100644
--- a/quantumclient/tests/unit/test_cli20_network.py
+++ b/quantumclient/tests/unit/test_cli20_network.py
@@ -16,19 +16,20 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
import sys
+
from mox import ContainsKeyValue
from quantumclient.common import exceptions
from quantumclient.common import utils
-from quantumclient.tests.unit import test_cli20
-from quantumclient.tests.unit.test_cli20 import CLITestV20Base
-from quantumclient.tests.unit.test_cli20 import MyApp
from quantumclient.quantum.v2_0.network import CreateNetwork
-from quantumclient.quantum.v2_0.network import ListNetwork
-from quantumclient.quantum.v2_0.network import UpdateNetwork
-from quantumclient.quantum.v2_0.network import ShowNetwork
from quantumclient.quantum.v2_0.network import DeleteNetwork
from quantumclient.quantum.v2_0.network import ListExternalNetwork
+from quantumclient.quantum.v2_0.network import ListNetwork
+from quantumclient.quantum.v2_0.network import ShowNetwork
+from quantumclient.quantum.v2_0.network import UpdateNetwork
+from quantumclient.tests.unit import test_cli20
+from quantumclient.tests.unit.test_cli20 import CLITestV20Base
+from quantumclient.tests.unit.test_cli20 import MyApp
class CLITestV20Network(CLITestV20Base):
diff --git a/quantumclient/tests/unit/test_cli20_port.py b/quantumclient/tests/unit/test_cli20_port.py
index 6ddbf31..bd776d4 100644
--- a/quantumclient/tests/unit/test_cli20_port.py
+++ b/quantumclient/tests/unit/test_cli20_port.py
@@ -16,17 +16,18 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
import sys
+
from mox import ContainsKeyValue
-from quantumclient.tests.unit.test_cli20 import CLITestV20Base
-from quantumclient.tests.unit.test_cli20 import MyApp
-from quantumclient.tests.unit import test_cli20
from quantumclient.quantum.v2_0.port import CreatePort
-from quantumclient.quantum.v2_0.port import ListPort
-from quantumclient.quantum.v2_0.port import UpdatePort
-from quantumclient.quantum.v2_0.port import ShowPort
from quantumclient.quantum.v2_0.port import DeletePort
+from quantumclient.quantum.v2_0.port import ListPort
from quantumclient.quantum.v2_0.port import ListRouterPort
+from quantumclient.quantum.v2_0.port import ShowPort
+from quantumclient.quantum.v2_0.port import UpdatePort
+from quantumclient.tests.unit import test_cli20
+from quantumclient.tests.unit.test_cli20 import CLITestV20Base
+from quantumclient.tests.unit.test_cli20 import MyApp
class CLITestV20Port(CLITestV20Base):
diff --git a/quantumclient/tests/unit/test_cli20_subnet.py b/quantumclient/tests/unit/test_cli20_subnet.py
index 6bcabe8..e07f6c7 100644
--- a/quantumclient/tests/unit/test_cli20_subnet.py
+++ b/quantumclient/tests/unit/test_cli20_subnet.py
@@ -17,13 +17,13 @@
import sys
-from quantumclient.tests.unit.test_cli20 import CLITestV20Base
-from quantumclient.tests.unit.test_cli20 import MyApp
from quantumclient.quantum.v2_0.subnet import CreateSubnet
+from quantumclient.quantum.v2_0.subnet import DeleteSubnet
from quantumclient.quantum.v2_0.subnet import ListSubnet
-from quantumclient.quantum.v2_0.subnet import UpdateSubnet
from quantumclient.quantum.v2_0.subnet import ShowSubnet
-from quantumclient.quantum.v2_0.subnet import DeleteSubnet
+from quantumclient.quantum.v2_0.subnet import UpdateSubnet
+from quantumclient.tests.unit.test_cli20 import CLITestV20Base
+from quantumclient.tests.unit.test_cli20 import MyApp
class CLITestV20Subnet(CLITestV20Base):
diff --git a/quantumclient/v2_0/client.py b/quantumclient/v2_0/client.py
index 6ec752d..f30f3fd 100644
--- a/quantumclient/v2_0/client.py
+++ b/quantumclient/v2_0/client.py
@@ -24,6 +24,7 @@ from quantumclient.client import HTTPClient
from quantumclient.common import exceptions
from quantumclient.common.serializer import Serializer
+
_logger = logging.getLogger(__name__)
@@ -532,17 +533,3 @@ class Client(object):
def put(self, action, body=None, headers=None, params=None):
return self.retry_request("PUT", action, body=body,
headers=headers, params=params)
-
-#if __name__ == '__main__':
-#
-# client20 = Client(username='admin',
-# password='password',
-# auth_url='http://localhost:5000/v2.0',
-# tenant_name='admin')
-# client20 = Client(token='ec796583fcad4aa690b723bc0b25270e',
-# endpoint_url='http://localhost:9696')
-#
-# client20.tenant = 'default'
-# client20.format = 'json'
-# nets = client20.list_networks()
-# print nets
