Remove unsused imports in the plugins package

Config imports are needed for correct init
quota_db is required to make sure quota database model at the proper timing

Change-Id: I885ed1f673cfc4c6331818ad68e2a505f7d69188

diff --git a/quantum/plugins/bigswitch/plugin.py b/quantum/plugins/bigswitch/plugin.py
index 67b41dff8b2ff43150dcc20aa7ea200a02f54736..511ce29343dd6bb8b1f6ebddf0ad3658f00b04e5 100644 (file)
--- a/quantum/plugins/bigswitch/plugin.py
+++ b/quantum/plugins/bigswitch/plugin.py
@@ -56,7 +56,6 @@ from quantum import context as qcontext
 from quantum.db import api as db
 from quantum.db import db_base_plugin_v2
 from quantum.db import dhcp_rpc_base
-from quantum.db import models_v2
 from quantum.openstack.common import cfg
 from quantum.openstack.common import log as logging
 from quantum.openstack.common import rpc

diff --git a/quantum/plugins/bigswitch/tests/test_server.py b/quantum/plugins/bigswitch/tests/test_server.py
index 8ae5e0b28e7f95c304a2c7c20f4fecadca9da606..43c738bc03affe22415ec38baa883d98f3268ee8 100755 (executable)
--- a/quantum/plugins/bigswitch/tests/test_server.py
+++ b/quantum/plugins/bigswitch/tests/test_server.py
@@ -26,7 +26,6 @@ import json
 import re
 
 from wsgiref.simple_server import make_server
-from wsgiref.util import request_uri, application_uri
 
 
 class TestNetworkCtrl(object):

diff --git a/quantum/plugins/cisco/db/network_db_v2.py b/quantum/plugins/cisco/db/network_db_v2.py
index 0c3bea8ef19a6331d6cc7a0164c30d0513ec4c23..d04985d87570dbe5d73eba6037b7c284a97964da 100644 (file)
--- a/quantum/plugins/cisco/db/network_db_v2.py
+++ b/quantum/plugins/cisco/db/network_db_v2.py
@@ -21,11 +21,8 @@ from sqlalchemy.orm import exc
 
 from quantum.common import exceptions as q_exc
 from quantum.db import api as db
-from quantum.db import models_v2
-from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.common import cisco_exceptions as c_exc
 from quantum.plugins.cisco.db import network_models_v2
-from quantum.plugins.cisco.db import nexus_models_v2
 from quantum.plugins.cisco.db import ucs_models_v2
 from quantum.plugins.cisco import l2network_plugin_configuration as conf
 from quantum.plugins.openvswitch import ovs_models_v2

diff --git a/quantum/plugins/cisco/db/ucs_models_v2.py b/quantum/plugins/cisco/db/ucs_models_v2.py
index a6c79192080bb2f25463626f8734890e048b14eb..d2d1ccc1a3eac7b8fe67b2e02325a88204508599 100644 (file)
--- a/quantum/plugins/cisco/db/ucs_models_v2.py
+++ b/quantum/plugins/cisco/db/ucs_models_v2.py
@@ -16,10 +16,8 @@
 # @author: Rohit Agarwalla, Cisco Systems, Inc.
 
 from sqlalchemy import Column, Integer, String
-from sqlalchemy.orm import relation
 
 from quantum.db.model_base import BASEV2 as BASE
-from quantum.db import models_v2 as models
 from quantum.plugins.cisco.db.network_models_v2 import L2NetworkBase
 
 

diff --git a/quantum/plugins/cisco/models/virt_phy_sw_v2.py b/quantum/plugins/cisco/models/virt_phy_sw_v2.py
index d77527f26558123020fcc523648ccc94f7d9bbdf..b46aa4bc174f1a8a2c609a44ccddcf16ddd69a4d 100644 (file)
--- a/quantum/plugins/cisco/models/virt_phy_sw_v2.py
+++ b/quantum/plugins/cisco/models/virt_phy_sw_v2.py
@@ -21,7 +21,6 @@ from copy import deepcopy
 import inspect
 import logging
 
-from quantum.db import l3_db
 from quantum.manager import QuantumManager
 from quantum.openstack.common import importutils
 from quantum.plugins.cisco.common import cisco_constants as const

diff --git a/quantum/plugins/cisco/network_plugin.py b/quantum/plugins/cisco/network_plugin.py
index 05edc4c53753a0ede58545e887faacf8256a2e2a..8648071b4666b3d5d49ba3c0c93347972ce8e1d6 100644 (file)
--- a/quantum/plugins/cisco/network_plugin.py
+++ b/quantum/plugins/cisco/network_plugin.py
@@ -26,7 +26,6 @@ from quantum.db import db_base_plugin_v2
 from quantum.db import models_v2
 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 cred
 from quantum.plugins.cisco.common import cisco_exceptions as cexc
 from quantum.plugins.cisco.common import cisco_utils as cutil
 from quantum.plugins.cisco.db import network_db_v2 as cdb

diff --git a/quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py b/quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py
index d73a70c11192b8f4d8cfb586417393ce32120ce3..447faf466b8684f10d7095f8b9b154ddb48153fc 100644 (file)
--- a/quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py
+++ b/quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py
@@ -23,7 +23,6 @@ PlugIn for Nexus OS driver
 import logging
 
 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 cred

diff --git a/quantum/plugins/cisco/tests/unit/v2/ucs/cisco_ucs_inventory_fake.py b/quantum/plugins/cisco/tests/unit/v2/ucs/cisco_ucs_inventory_fake.py
index fd436bdc7cbbdddee91f3f35370c7d91b77a0da6..9fa2dfc0c21bfed22a0ae6f98eba46d3a474d03b 100644 (file)
--- a/quantum/plugins/cisco/tests/unit/v2/ucs/cisco_ucs_inventory_fake.py
+++ b/quantum/plugins/cisco/tests/unit/v2/ucs/cisco_ucs_inventory_fake.py
@@ -20,7 +20,6 @@
 import logging
 import os
 
-from quantum.common.utils import find_config_file
 from quantum.openstack.common import importutils
 from quantum.plugins.cisco.common import cisco_configparser as confp
 from quantum.plugins.cisco.common import cisco_constants as const

diff --git a/quantum/plugins/cisco/tests/unit/v2/ucs/test_ucs_inventory_v2.py b/quantum/plugins/cisco/tests/unit/v2/ucs/test_ucs_inventory_v2.py
index 1d16a190b23a30d625059027810c5b498b97fc8f..22f2073e2e363c30b6121e9cb60135bcd1801476 100644 (file)
--- a/quantum/plugins/cisco/tests/unit/v2/ucs/test_ucs_inventory_v2.py
+++ b/quantum/plugins/cisco/tests/unit/v2/ucs/test_ucs_inventory_v2.py
@@ -20,7 +20,6 @@
 import logging
 import unittest
 
-from quantum.common import exceptions as exc
 from quantum.openstack.common import uuidutils
 from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.common import cisco_credentials_v2 as creds

diff --git a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
index 8f855b2eb6696faaabc49661b3abbf7d6b3ac293..94346c2d4e0a96b3b8e059b901edba7a02e416e3 100755 (executable)
--- a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
+++ b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
@@ -40,6 +40,7 @@ from quantum import context
 from quantum.openstack.common import cfg
 from quantum.openstack.common import log as logging
 from quantum.openstack.common.rpc import dispatcher
+# NOTE (e0ne): this import is needed for config init
 from quantum.plugins.linuxbridge.common import config
 from quantum.plugins.linuxbridge.common import constants as lconst
 

diff --git a/quantum/plugins/linuxbridge/db/l2network_db_v2.py b/quantum/plugins/linuxbridge/db/l2network_db_v2.py
index ebe27a45bdb3d8eae7eb7c874f430ad73ebf5a1b..133f2a3cdd28ef1867db70b1d4e3b3c884e85f88 100644 (file)
--- a/quantum/plugins/linuxbridge/db/l2network_db_v2.py
+++ b/quantum/plugins/linuxbridge/db/l2network_db_v2.py
@@ -21,8 +21,8 @@ import quantum.db.api as db
 from quantum import manager
 from quantum.db import models_v2
 from quantum.db import securitygroups_db as sg_db
-from quantum.openstack.common import cfg
 from quantum.openstack.common import log as logging
+# NOTE (e0ne): this import is needed for config init
 from quantum.plugins.linuxbridge.common import config
 from quantum.plugins.linuxbridge.common import constants
 from quantum.plugins.linuxbridge.db import l2network_models_v2

diff --git a/quantum/plugins/linuxbridge/lb_quantum_plugin.py b/quantum/plugins/linuxbridge/lb_quantum_plugin.py
index 4267d9ac019347ed15bfbd9821e715f03f5ce075..9b87398bd62dec491a5ceee630cca8dbf1d06dde 100644 (file)
--- a/quantum/plugins/linuxbridge/lb_quantum_plugin.py
+++ b/quantum/plugins/linuxbridge/lb_quantum_plugin.py
@@ -27,6 +27,7 @@ from quantum.db import db_base_plugin_v2
 from quantum.db import dhcp_rpc_base
 from quantum.db import l3_db
 from quantum.db import l3_rpc_base
+# NOTE: quota_db cannot be removed, it is for db model
 from quantum.db import quota_db
 from quantum.db import securitygroups_rpc_base as sg_db_rpc
 from quantum.extensions import portbindings

diff --git a/quantum/plugins/metaplugin/meta_db_v2.py b/quantum/plugins/metaplugin/meta_db_v2.py
index fd32b43c68e164a397ff7f15a4ced2e5499799b7..7f03fd259a9421178cdf085d976e43389014ff56 100644 (file)
--- a/quantum/plugins/metaplugin/meta_db_v2.py
+++ b/quantum/plugins/metaplugin/meta_db_v2.py
@@ -17,7 +17,6 @@
 
 from sqlalchemy.orm import exc
 
-import quantum.db.api as db
 from quantum.plugins.metaplugin import meta_models_v2
 
 

diff --git a/quantum/plugins/metaplugin/meta_quantum_plugin.py b/quantum/plugins/metaplugin/meta_quantum_plugin.py
index 0af8ab7b7cf6eafdff9e97a98351d623d7f715ce..6312f72ed8feb33ee086675d97270ce878c9bf53 100644 (file)
--- a/quantum/plugins/metaplugin/meta_quantum_plugin.py
+++ b/quantum/plugins/metaplugin/meta_quantum_plugin.py
@@ -15,9 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from quantum.api.v2 import attributes
 from quantum.common import exceptions as 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
@@ -26,11 +24,11 @@ from quantum.extensions.flavor import (FLAVOR_NETWORK, FLAVOR_ROUTER)
 from quantum.openstack.common import cfg
 from quantum.openstack.common import importutils
 from quantum.openstack.common import log as logging
+# NOTE (e0ne): this import is needed for config init
 from quantum.plugins.metaplugin.common import config
 from quantum.plugins.metaplugin import meta_db_v2
 from quantum.plugins.metaplugin.meta_models_v2 import (NetworkFlavor,
                                                        RouterFlavor)
-from quantum import policy
 
 
 LOG = logging.getLogger(__name__)

diff --git a/quantum/plugins/metaplugin/proxy_quantum_plugin.py b/quantum/plugins/metaplugin/proxy_quantum_plugin.py
index b9c3c991eff700236593a289fdb88019d968dc45..9217b764683285f5f880badcb9d088b4d6452f91 100644 (file)
--- a/quantum/plugins/metaplugin/proxy_quantum_plugin.py
+++ b/quantum/plugins/metaplugin/proxy_quantum_plugin.py
@@ -18,7 +18,6 @@
 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
 from quantum.openstack.common import cfg
 from quantum.openstack.common import log as logging
 from quantumclient.common import exceptions

diff --git a/quantum/plugins/metaplugin/run_tests.py b/quantum/plugins/metaplugin/run_tests.py
index 0576f1186a4cf1cea53083c5442ebafe766b7255..50e36da30ac30a0415b859ddd212b2a819bd2d6b 100755 (executable)
--- a/quantum/plugins/metaplugin/run_tests.py
+++ b/quantum/plugins/metaplugin/run_tests.py
@@ -29,7 +29,6 @@ import os
 import sys
 
 from nose import config
-from nose import core
 
 sys.path.append(os.getcwd())
 sys.path.append(os.path.dirname(__file__))

diff --git a/quantum/plugins/nec/db/api.py b/quantum/plugins/nec/db/api.py
index 466bf6fd14e690d2876a4b74a88af3029a1f54e3..7eb822da56e1a0ac090048ba7f5febacebcfebc6 100644 (file)
--- a/quantum/plugins/nec/db/api.py
+++ b/quantum/plugins/nec/db/api.py
@@ -20,6 +20,7 @@ import sqlalchemy as sa
 from quantum.db import api as db
 from quantum.db import model_base
 from quantum.openstack.common import log as logging
+# NOTE (e0ne): this import is needed for config init
 from quantum.plugins.nec.common import config
 from quantum.plugins.nec.common import exceptions as nexc
 from quantum.plugins.nec.db import models as nmodels

diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
index 65fcf8c97993f7eafc72b410aa8ef6d2c3303c83..62a01596f729a113545bf4c5fa084a5e655fe748 100644 (file)
--- a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
@@ -34,7 +34,7 @@ from quantum.common import topics
 from quantum.db import api as db
 from quantum.db import db_base_plugin_v2
 from quantum.db import dhcp_rpc_base
-from quantum.db import models_v2
+# NOTE: quota_db cannot be removed, it is for db model
 from quantum.db import quota_db
 from quantum.extensions import providernet as pnet
 from quantum.openstack.common import cfg

diff --git a/quantum/plugins/openvswitch/ovs_quantum_plugin.py b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
index 6722f4676aa7d86250fd41c86ae54082d2632257..642b861d18e031738746125088f0ea566bfe5ee8 100644 (file)
--- a/quantum/plugins/openvswitch/ovs_quantum_plugin.py
+++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
@@ -31,6 +31,7 @@ from quantum.db import db_base_plugin_v2
 from quantum.db import dhcp_rpc_base
 from quantum.db import l3_db
 from quantum.db import l3_rpc_base
+# NOTE: quota_db cannot be removed, it is for db model
 from quantum.db import quota_db
 from quantum.extensions import portbindings
 from quantum.extensions import providernet as provider