summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kolodyazhny <e0ne@e0ne.info>2013-01-02 22:40:36 +0200
committerIvan Kolodyazhny <e0ne@e0ne.info>2013-01-13 02:20:35 +0200
commit924777645a189dfdd4510d578941ae408d5e1a41 (patch)
tree653461babc625ba4b6d1c26709a4b961019d6bf7
parent939200d35de50b221c0c5a986cf29dfa30db1e1f (diff)
downloadneutron-924777645a189dfdd4510d578941ae408d5e1a41.tar.gz
Remove unused imports in unit tests
Change-Id: I10401bc240b2a7aebe6317067dafe8bfe35264f8
-rw-r--r--quantum/tests/unit/_test_rootwrap_exec.py2
-rw-r--r--quantum/tests/unit/cisco/test_network_plugin.py9
-rw-r--r--quantum/tests/unit/cisco/test_nexus_plugin.py3
-rw-r--r--quantum/tests/unit/linuxbridge/test_defaults.py1
-rw-r--r--quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py1
-rw-r--r--quantum/tests/unit/metaplugin/fake_plugin.py4
-rw-r--r--quantum/tests/unit/metaplugin/test_metaplugin.py5
-rw-r--r--quantum/tests/unit/openvswitch/test_ovs_defaults.py1
-rw-r--r--quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py1
-rw-r--r--quantum/tests/unit/ryu/test_defaults.py1
-rw-r--r--quantum/tests/unit/ryu/test_ryu_db.py3
-rw-r--r--quantum/tests/unit/test_agent_ovs_cleanup.py2
-rw-r--r--quantum/tests/unit/test_debug_commands.py5
-rw-r--r--quantum/tests/unit/test_dhcp_agent.py1
-rw-r--r--quantum/tests/unit/test_extensions.py1
-rw-r--r--quantum/tests/unit/test_linux_dhcp.py1
-rw-r--r--quantum/tests/unit/test_linux_external_process.py2
-rw-r--r--quantum/tests/unit/test_linux_ip_lib.py1
-rw-r--r--quantum/tests/unit/test_policy.py2
-rw-r--r--quantum/tests/unit/test_rootwrap.py1
-rw-r--r--quantum/tests/unit/testlib_api.py1
21 files changed, 4 insertions, 44 deletions
diff --git a/quantum/tests/unit/_test_rootwrap_exec.py b/quantum/tests/unit/_test_rootwrap_exec.py
index 7a489c3814..4a906a730a 100644
--- a/quantum/tests/unit/_test_rootwrap_exec.py
+++ b/quantum/tests/unit/_test_rootwrap_exec.py
@@ -18,8 +18,6 @@
import os
import unittest
-import mock
-
from quantum.agent.linux import utils
from quantum.openstack.common import log as logging
diff --git a/quantum/tests/unit/cisco/test_network_plugin.py b/quantum/tests/unit/cisco/test_network_plugin.py
index df9e7a24bf..44416f0a3a 100644
--- a/quantum/tests/unit/cisco/test_network_plugin.py
+++ b/quantum/tests/unit/cisco/test_network_plugin.py
@@ -13,25 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import inspect
import logging
import mock
-from quantum.api.v2.router import APIRouter
-from quantum.common import config
-from quantum.common.test_lib import test_config
from quantum import context
from quantum.db import api as db
-from quantum.db import l3_db
-from quantum.db import quota_db
from quantum.manager import QuantumManager
-from quantum.openstack.common import cfg
from quantum.plugins.cisco.common import cisco_constants as const
from quantum.plugins.cisco.db import network_db_v2
from quantum.plugins.cisco.db import network_models_v2
-from quantum.plugins.openvswitch import ovs_models_v2
from quantum.tests.unit import test_db_plugin
-from quantum.wsgi import JSONDeserializer
LOG = logging.getLogger(__name__)
diff --git a/quantum/tests/unit/cisco/test_nexus_plugin.py b/quantum/tests/unit/cisco/test_nexus_plugin.py
index eef413eda8..74ab64fb93 100644
--- a/quantum/tests/unit/cisco/test_nexus_plugin.py
+++ b/quantum/tests/unit/cisco/test_nexus_plugin.py
@@ -13,15 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import logging
import mock
import unittest
-from quantum.common import exceptions as exc
from quantum.db import api as db
from quantum.openstack.common import importutils
from quantum.plugins.cisco.common import cisco_constants as const
-from quantum.plugins.cisco.common import cisco_credentials_v2 as creds
from quantum.plugins.cisco.db import network_db_v2 as cdb
from quantum.plugins.cisco.db import network_models_v2
from quantum.plugins.cisco.nexus import cisco_nexus_plugin_v2
diff --git a/quantum/tests/unit/linuxbridge/test_defaults.py b/quantum/tests/unit/linuxbridge/test_defaults.py
index d2532f8533..f23ad54183 100644
--- a/quantum/tests/unit/linuxbridge/test_defaults.py
+++ b/quantum/tests/unit/linuxbridge/test_defaults.py
@@ -16,6 +16,7 @@
import unittest2 as unittest
from quantum.openstack.common import cfg
+#NOTE this import loads tests required options
from quantum.plugins.linuxbridge.common import config
diff --git a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
index 30e37cb29b..8ebbcb6419 100644
--- a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
+++ b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
@@ -19,7 +19,6 @@ import unittest2 as unittest
from quantum.openstack.common import cfg
from quantum.plugins.linuxbridge.agent import linuxbridge_quantum_agent
-from quantum.plugins.linuxbridge.common import config
from quantum.plugins.linuxbridge.common import constants as lconst
diff --git a/quantum/tests/unit/metaplugin/fake_plugin.py b/quantum/tests/unit/metaplugin/fake_plugin.py
index 98a9884bcf..4b6f364553 100644
--- a/quantum/tests/unit/metaplugin/fake_plugin.py
+++ b/quantum/tests/unit/metaplugin/fake_plugin.py
@@ -14,12 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-from quantum.common import exceptions as q_exc
-from quantum.common.utils import find_config_file
-from quantum.db import api as db
from quantum.db import db_base_plugin_v2
from quantum.db import l3_db
-from quantum.db import models_v2
class Fake1(db_base_plugin_v2.QuantumDbPluginV2,
diff --git a/quantum/tests/unit/metaplugin/test_metaplugin.py b/quantum/tests/unit/metaplugin/test_metaplugin.py
index 6f48a531cf..1f47eaee99 100644
--- a/quantum/tests/unit/metaplugin/test_metaplugin.py
+++ b/quantum/tests/unit/metaplugin/test_metaplugin.py
@@ -22,19 +22,14 @@ import mox
import stubout
import unittest2 as unittest
-from quantum.common import config
-from quantum.common.exceptions import NotImplementedError
from quantum import context
from quantum.db import api as db
from quantum.db import models_v2
from quantum.extensions.flavor import (FLAVOR_NETWORK, FLAVOR_ROUTER)
-from quantum.extensions import l3
from quantum.openstack.common import cfg
from quantum.openstack.common import uuidutils
from quantum.plugins.metaplugin.meta_quantum_plugin import FlavorNotFound
from quantum.plugins.metaplugin.meta_quantum_plugin import MetaPluginV2
-from quantum.plugins.metaplugin.proxy_quantum_plugin import ProxyPluginV2
-from quantum.tests.unit.metaplugin import fake_plugin
CONF_FILE = ""
ROOTDIR = os.path.dirname(os.path.dirname(__file__))
diff --git a/quantum/tests/unit/openvswitch/test_ovs_defaults.py b/quantum/tests/unit/openvswitch/test_ovs_defaults.py
index 87b4f4bd7e..8363df8599 100644
--- a/quantum/tests/unit/openvswitch/test_ovs_defaults.py
+++ b/quantum/tests/unit/openvswitch/test_ovs_defaults.py
@@ -16,6 +16,7 @@
import unittest
from quantum.openstack.common import cfg
+#NOTE this import loads tests required options
from quantum.plugins.openvswitch.common import config
diff --git a/quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py b/quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py
index 0067d4d2ab..a759a0b27e 100644
--- a/quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py
+++ b/quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py
@@ -19,7 +19,6 @@ import unittest2 as unittest
from quantum.openstack.common import cfg
from quantum.plugins.openvswitch.agent import ovs_quantum_agent
-from quantum.plugins.openvswitch.common import config
class CreateAgentConfigMap(unittest.TestCase):
diff --git a/quantum/tests/unit/ryu/test_defaults.py b/quantum/tests/unit/ryu/test_defaults.py
index dae4cc4220..29a34f7152 100644
--- a/quantum/tests/unit/ryu/test_defaults.py
+++ b/quantum/tests/unit/ryu/test_defaults.py
@@ -18,6 +18,7 @@
import unittest2
from quantum.openstack.common import cfg
+#NOTE this import loads tests required options
from quantum.plugins.ryu.common import config
diff --git a/quantum/tests/unit/ryu/test_ryu_db.py b/quantum/tests/unit/ryu/test_ryu_db.py
index b7ebf3080c..6c3dad93c1 100644
--- a/quantum/tests/unit/ryu/test_ryu_db.py
+++ b/quantum/tests/unit/ryu/test_ryu_db.py
@@ -17,11 +17,10 @@
from contextlib import nested
import operator
-import unittest2
from quantum.db import api as db
-from quantum.db import models_v2
from quantum.openstack.common import cfg
+# NOTE: this import is needed for correct plugin code work
from quantum.plugins.ryu.common import config
from quantum.plugins.ryu.db import api_v2 as db_api_v2
from quantum.plugins.ryu.db import models_v2 as ryu_models_v2
diff --git a/quantum/tests/unit/test_agent_ovs_cleanup.py b/quantum/tests/unit/test_agent_ovs_cleanup.py
index 77a60cc697..e05054ca28 100644
--- a/quantum/tests/unit/test_agent_ovs_cleanup.py
+++ b/quantum/tests/unit/test_agent_ovs_cleanup.py
@@ -18,9 +18,7 @@
import mock
import unittest2 as unittest
-from quantum.agent.linux import ovs_lib
from quantum.agent import ovs_cleanup_util as util
-from quantum.openstack.common import uuidutils
class TestOVSCleanup(unittest.TestCase):
diff --git a/quantum/tests/unit/test_debug_commands.py b/quantum/tests/unit/test_debug_commands.py
index 8fa505a68e..9e7f7f7ab5 100644
--- a/quantum/tests/unit/test_debug_commands.py
+++ b/quantum/tests/unit/test_debug_commands.py
@@ -16,16 +16,11 @@
# under the License.
import socket
-import sys
-import uuid
import mock
import unittest2 as unittest
-from quantum.agent.common import config
from quantum.agent.linux import interface
-from quantum.agent.linux import utils
-from quantum.common import exceptions
from quantum.debug import commands
from quantum.debug.debug_agent import DEVICE_OWNER_PROBE, QuantumDebugAgent
from quantum.openstack.common import cfg
diff --git a/quantum/tests/unit/test_dhcp_agent.py b/quantum/tests/unit/test_dhcp_agent.py
index 8674b2ad6b..c763244f58 100644
--- a/quantum/tests/unit/test_dhcp_agent.py
+++ b/quantum/tests/unit/test_dhcp_agent.py
@@ -23,7 +23,6 @@ import uuid
import mock
import unittest2 as unittest
-from quantum.agent.common import config
from quantum.agent import dhcp_agent
from quantum.agent.linux import interface
from quantum.common import exceptions
diff --git a/quantum/tests/unit/test_extensions.py b/quantum/tests/unit/test_extensions.py
index 9feddd799b..abb3fde3cc 100644
--- a/quantum/tests/unit/test_extensions.py
+++ b/quantum/tests/unit/test_extensions.py
@@ -30,7 +30,6 @@ from quantum.api.extensions import (
PluginAwareExtensionManager,
)
from quantum.common import config
-from quantum.common import exceptions
from quantum.db.db_base_plugin_v2 import QuantumDbPluginV2
from quantum.openstack.common import jsonutils
from quantum.openstack.common import log as logging
diff --git a/quantum/tests/unit/test_linux_dhcp.py b/quantum/tests/unit/test_linux_dhcp.py
index 7b54e4604b..27020ea52c 100644
--- a/quantum/tests/unit/test_linux_dhcp.py
+++ b/quantum/tests/unit/test_linux_dhcp.py
@@ -17,7 +17,6 @@
import os
import socket
-import tempfile
import unittest2 as unittest
import mock
diff --git a/quantum/tests/unit/test_linux_external_process.py b/quantum/tests/unit/test_linux_external_process.py
index 86040adba0..819f680433 100644
--- a/quantum/tests/unit/test_linux_external_process.py
+++ b/quantum/tests/unit/test_linux_external_process.py
@@ -16,8 +16,6 @@
#
# @author: Mark McClain, DreamHost
-import os
-
import mock
import unittest2 as unittest
diff --git a/quantum/tests/unit/test_linux_ip_lib.py b/quantum/tests/unit/test_linux_ip_lib.py
index 23e37be7e5..5b6710f07d 100644
--- a/quantum/tests/unit/test_linux_ip_lib.py
+++ b/quantum/tests/unit/test_linux_ip_lib.py
@@ -19,7 +19,6 @@ import mock
import unittest2 as unittest
from quantum.agent.linux import ip_lib
-from quantum.agent.linux import utils
from quantum.common import exceptions
NETNS_SAMPLE = [
diff --git a/quantum/tests/unit/test_policy.py b/quantum/tests/unit/test_policy.py
index 7262442b52..b11459af49 100644
--- a/quantum/tests/unit/test_policy.py
+++ b/quantum/tests/unit/test_policy.py
@@ -27,9 +27,7 @@ import mock
import quantum
from quantum.common import exceptions
-from quantum.common import utils
from quantum import context
-from quantum.openstack.common import cfg
from quantum.openstack.common import importutils
from quantum.openstack.common import policy as common_policy
from quantum import policy
diff --git a/quantum/tests/unit/test_rootwrap.py b/quantum/tests/unit/test_rootwrap.py
index 1c5b696391..d6be69c0bf 100644
--- a/quantum/tests/unit/test_rootwrap.py
+++ b/quantum/tests/unit/test_rootwrap.py
@@ -15,7 +15,6 @@
# under the License.
import os
-import subprocess
import mock
import unittest2 as unittest
diff --git a/quantum/tests/unit/testlib_api.py b/quantum/tests/unit/testlib_api.py
index bff56600e9..7573be99d0 100644
--- a/quantum/tests/unit/testlib_api.py
+++ b/quantum/tests/unit/testlib_api.py
@@ -14,7 +14,6 @@
# under the License.
from quantum import wsgi
-from quantum.wsgi import Serializer
def create_request(path, body, content_type, method='GET',