Merge "Remove unsused imports in the plugins package"

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

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):

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

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
 
 

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

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

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

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

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

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
 

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

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

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
 
 

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__)

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

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__))

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

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

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