diff --git a/quantum/common/test_lib.py b/quantum/common/test_lib.py index 4e4fab730..8e8fc67f4 100644 --- a/quantum/common/test_lib.py +++ b/quantum/common/test_lib.py @@ -38,11 +38,9 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import logging -import os import sys import unittest -from nose import config from nose import core from nose import result diff --git a/quantum/extensions/multiport.py b/quantum/extensions/multiport.py index 039d5465b..6cffc04f5 100644 --- a/quantum/extensions/multiport.py +++ b/quantum/extensions/multiport.py @@ -24,7 +24,6 @@ from quantum.api import api_common as common from quantum.api.views import ports as port_view from quantum.extensions import extensions from quantum.manager import QuantumManager -from quantum.plugins.cisco.common import cisco_exceptions as exception from quantum.plugins.cisco.common import cisco_faults as faults from quantum import wsgi diff --git a/quantum/plugins/cisco/client/cli.py b/quantum/plugins/cisco/client/cli.py index cd6f7842b..35cc22279 100644 --- a/quantum/plugins/cisco/client/cli.py +++ b/quantum/plugins/cisco/client/cli.py @@ -29,9 +29,7 @@ import logging.handlers from optparse import OptionParser import os import sys -import subprocess -from quantum.plugins.cisco.common import cisco_constants as const from quantumclient import Client import quantumclient.cli as qcli diff --git a/quantum/plugins/cisco/common/cisco_configparser.py b/quantum/plugins/cisco/common/cisco_configparser.py index 2d8de9ce5..bfbc2bd6c 100644 --- a/quantum/plugins/cisco/common/cisco_configparser.py +++ b/quantum/plugins/cisco/common/cisco_configparser.py @@ -18,8 +18,6 @@ from configobj import ConfigObj -from quantum.plugins.cisco.common import cisco_constants as const - class CiscoConfigParser(ConfigObj): """Config Parser based on the ConfigObj module""" diff --git a/quantum/plugins/cisco/common/cisco_credentials.py b/quantum/plugins/cisco/common/cisco_credentials.py index 71c09ce0e..7c6302ae6 100644 --- a/quantum/plugins/cisco/common/cisco_credentials.py +++ b/quantum/plugins/cisco/common/cisco_credentials.py @@ -16,7 +16,6 @@ # # @author: Sumit Naiksatam, Cisco Systems, Inc. -import os import logging as LOG from quantum.common.config import find_config_file diff --git a/quantum/plugins/cisco/common/cisco_utils.py b/quantum/plugins/cisco/common/cisco_utils.py index 32a73a91a..1a28be885 100644 --- a/quantum/plugins/cisco/common/cisco_utils.py +++ b/quantum/plugins/cisco/common/cisco_utils.py @@ -18,12 +18,8 @@ import hashlib import logging -import traceback - -import MySQLdb from quantum.plugins.cisco.common import cisco_constants as const -from quantum.plugins.cisco.db import api as db from quantum.plugins.cisco.db import l2network_db as cdb diff --git a/quantum/plugins/cisco/db/l2network_db.py b/quantum/plugins/cisco/db/l2network_db.py index f04896462..5e7a85c8f 100644 --- a/quantum/plugins/cisco/db/l2network_db.py +++ b/quantum/plugins/cisco/db/l2network_db.py @@ -24,9 +24,6 @@ from quantum.plugins.cisco.db import l2network_models import logging as LOG import quantum.plugins.cisco.db.api as db -import quantum.plugins.cisco.db.nexus_db as ndb -import quantum.plugins.cisco.db.ucs_db as udb -import quantum.plugins.cisco.db.services_db as sdb def initialize(): diff --git a/quantum/plugins/cisco/db/services_db.py b/quantum/plugins/cisco/db/services_db.py index 7c5a92247..ca9eef625 100644 --- a/quantum/plugins/cisco/db/services_db.py +++ b/quantum/plugins/cisco/db/services_db.py @@ -22,7 +22,6 @@ from sqlalchemy.orm import exc import quantum.plugins.cisco.db.api as db -from quantum.plugins.cisco.common import cisco_exceptions as c_exc from quantum.plugins.cisco.db import services_models diff --git a/quantum/plugins/cisco/l2network_plugin.py b/quantum/plugins/cisco/l2network_plugin.py index deb58ee0f..1edecab81 100644 --- a/quantum/plugins/cisco/l2network_plugin.py +++ b/quantum/plugins/cisco/l2network_plugin.py @@ -18,7 +18,6 @@ import inspect import logging -import re from quantum.common import exceptions as exc from quantum.openstack.common import importutils diff --git a/quantum/plugins/cisco/l2network_plugin_configuration.py b/quantum/plugins/cisco/l2network_plugin_configuration.py index f6a107f8e..59196156c 100644 --- a/quantum/plugins/cisco/l2network_plugin_configuration.py +++ b/quantum/plugins/cisco/l2network_plugin_configuration.py @@ -17,8 +17,6 @@ # @author: Sumit Naiksatam, Cisco Systems, Inc. # @author: Rohit Agarwalla, Cisco Systems, Inc. -import os - from quantum.common.config import find_config_file from quantum.plugins.cisco.common import cisco_configparser as confp diff --git a/quantum/plugins/cisco/models/l2network_multi_blade.py b/quantum/plugins/cisco/models/l2network_multi_blade.py index f55888fcc..a19583b2a 100644 --- a/quantum/plugins/cisco/models/l2network_multi_blade.py +++ b/quantum/plugins/cisco/models/l2network_multi_blade.py @@ -19,14 +19,11 @@ from copy import deepcopy import inspect import logging -import platform -from quantum.common import exceptions as exc from quantum.openstack.common import importutils from quantum.plugins.cisco.l2network_model_base import L2NetworkModelBase from quantum.plugins.cisco import l2network_plugin_configuration as conf from quantum.plugins.cisco.common import cisco_constants as const -from quantum.plugins.cisco.common import cisco_exceptions as cexc LOG = logging.getLogger(__name__) diff --git a/quantum/plugins/cisco/models/l2network_single_blade.py b/quantum/plugins/cisco/models/l2network_single_blade.py index 61395d889..304f411ed 100644 --- a/quantum/plugins/cisco/models/l2network_single_blade.py +++ b/quantum/plugins/cisco/models/l2network_single_blade.py @@ -19,14 +19,11 @@ from copy import deepcopy import inspect import logging -import platform -from quantum.common import exceptions as exc from quantum.openstack.common import importutils from quantum.plugins.cisco.l2network_model_base import L2NetworkModelBase from quantum.plugins.cisco import l2network_plugin_configuration as conf from quantum.plugins.cisco.common import cisco_constants as const -from quantum.plugins.cisco.common import cisco_exceptions as cexc LOG = logging.getLogger(__name__) diff --git a/quantum/plugins/cisco/nexus/cisco_nexus_configuration.py b/quantum/plugins/cisco/nexus/cisco_nexus_configuration.py index 58b183ae8..449924ed2 100644 --- a/quantum/plugins/cisco/nexus/cisco_nexus_configuration.py +++ b/quantum/plugins/cisco/nexus/cisco_nexus_configuration.py @@ -22,7 +22,6 @@ Configuration consolidation for the Nexus Driver This module will export the configuration parameters from the nexus.ini file """ -import os from quantum.common.config import find_config_file from quantum.plugins.cisco.common import cisco_configparser as confp diff --git a/quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py b/quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py index a90441e3d..34e599d73 100644 --- a/quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py +++ b/quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py @@ -25,7 +25,6 @@ import logging from ncclient import manager -from quantum.plugins.cisco.common import cisco_constants as const from quantum.plugins.cisco.db import l2network_db as cdb from quantum.plugins.cisco.nexus import cisco_nexus_snippets as snipp diff --git a/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py b/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py index 3606f8631..ad8217803 100644 --- a/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py +++ b/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py @@ -22,8 +22,6 @@ Nexus-OS XML-based configuration snippets import logging -from quantum.plugins.cisco.common import cisco_constants as const - LOG = logging.getLogger(__name__) diff --git a/quantum/plugins/cisco/nova/quantum_port_aware_scheduler.py b/quantum/plugins/cisco/nova/quantum_port_aware_scheduler.py index 7362ef38d..351191c61 100644 --- a/quantum/plugins/cisco/nova/quantum_port_aware_scheduler.py +++ b/quantum/plugins/cisco/nova/quantum_port_aware_scheduler.py @@ -27,7 +27,6 @@ from nova import flags from nova import log as logging from nova.openstack.common import cfg from nova.scheduler import chance -from nova.scheduler import driver from quantumclient import Client diff --git a/quantum/plugins/cisco/run_tests.py b/quantum/plugins/cisco/run_tests.py index 84e1313a6..fa8c892db 100644 --- a/quantum/plugins/cisco/run_tests.py +++ b/quantum/plugins/cisco/run_tests.py @@ -33,7 +33,6 @@ sys.path.append(os.getcwd()) sys.path.append(os.path.dirname(__file__)) from quantum.common.test_lib import run_tests, test_config -import quantum.tests.unit def main(): diff --git a/quantum/plugins/cisco/ucs/cisco_ucs_configuration.py b/quantum/plugins/cisco/ucs/cisco_ucs_configuration.py index a1a9d16a3..b065ddfc2 100644 --- a/quantum/plugins/cisco/ucs/cisco_ucs_configuration.py +++ b/quantum/plugins/cisco/ucs/cisco_ucs_configuration.py @@ -17,8 +17,6 @@ # @author: Sumit Naiksatam, Cisco Systems, Inc. # -import os - from quantum.common.config import find_config_file from quantum.plugins.cisco.common import cisco_configparser as confp diff --git a/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py b/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py index a2d1694a0..90b5983b1 100644 --- a/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py +++ b/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py @@ -70,7 +70,6 @@ from quantum.plugins.cisco.l2device_inventory_base import ( from quantum.plugins.cisco.common import cisco_constants as const from quantum.plugins.cisco.common import cisco_credentials 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 api as db from quantum.plugins.cisco.db import ucs_db as udb from quantum.plugins.cisco.ucs import ( diff --git a/quantum/plugins/cisco/ucs/cisco_ucs_inventory_configuration.py b/quantum/plugins/cisco/ucs/cisco_ucs_inventory_configuration.py index 5b4298f9c..e8474f672 100644 --- a/quantum/plugins/cisco/ucs/cisco_ucs_inventory_configuration.py +++ b/quantum/plugins/cisco/ucs/cisco_ucs_inventory_configuration.py @@ -17,8 +17,6 @@ # @author: Sumit Naiksatam, Cisco Systems, Inc. # -import os - from quantum.common.config import find_config_file from quantum.plugins.cisco.common import cisco_configparser as confp diff --git a/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py b/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py index e1bfdbb0c..522ae6e59 100644 --- a/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py +++ b/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py @@ -26,8 +26,6 @@ import logging from xml.etree import ElementTree as et from quantum.plugins.cisco.common import cisco_constants as const -from quantum.plugins.cisco.common import cisco_exceptions as cexc -from quantum.plugins.cisco.ucs import cisco_getvif as gvif LOG = logging.getLogger(__name__) diff --git a/quantum/plugins/cisco/ucs/cisco_ucs_plugin.py b/quantum/plugins/cisco/ucs/cisco_ucs_plugin.py index e2dcd6715..5c9887f8b 100644 --- a/quantum/plugins/cisco/ucs/cisco_ucs_plugin.py +++ b/quantum/plugins/cisco/ucs/cisco_ucs_plugin.py @@ -19,7 +19,6 @@ import logging -from quantum.common import exceptions as exc from quantum.openstack.common import importutils from quantum.plugins.cisco.common import cisco_constants as const from quantum.plugins.cisco.common import cisco_credentials as cred diff --git a/quantum/plugins/linuxbridge/db/l2network_models.py b/quantum/plugins/linuxbridge/db/l2network_models.py index 7a280a587..7eb0091d0 100644 --- a/quantum/plugins/linuxbridge/db/l2network_models.py +++ b/quantum/plugins/linuxbridge/db/l2network_models.py @@ -15,12 +15,8 @@ # under the License. # @author: Rohit Agarwalla, Cisco Systems, Inc. -import uuid - from sqlalchemy import Column, Integer, String, Boolean -from sqlalchemy.orm import relation, object_mapper -from quantum.db import models from quantum.db.models import BASE from quantum.db.models import QuantumBase diff --git a/quantum/plugins/linuxbridge/run_tests.py b/quantum/plugins/linuxbridge/run_tests.py index 9d8a263a6..8e5b38ed9 100644 --- a/quantum/plugins/linuxbridge/run_tests.py +++ b/quantum/plugins/linuxbridge/run_tests.py @@ -25,10 +25,8 @@ To run all tests:: PLUGIN_DIR=quantum/plugins/linuxbridge ./run_tests.sh """ -import logging import os import sys -import unittest from nose import config from nose import core @@ -39,9 +37,7 @@ sys.path.append(os.path.dirname(__file__)) from quantum.api.api_common import OperationalStatus from quantum.common.test_lib import run_tests, test_config -from quantum.plugins.linuxbridge.LinuxBridgePlugin import LinuxBridgePlugin import quantum.tests.unit -from tests.unit.test_database import L2networkDBTest if __name__ == '__main__': diff --git a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py index 21488f5bf..ee9a16480 100755 --- a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py +++ b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py @@ -21,11 +21,9 @@ import logging from optparse import OptionParser -import signal import sys import time -import sqlalchemy from sqlalchemy.ext import sqlsoup from quantum.agent.linux import ovs_lib diff --git a/quantum/plugins/openvswitch/ovs_db.py b/quantum/plugins/openvswitch/ovs_db.py index b3b294cf4..49adade44 100644 --- a/quantum/plugins/openvswitch/ovs_db.py +++ b/quantum/plugins/openvswitch/ovs_db.py @@ -20,7 +20,6 @@ from sqlalchemy.orm import exc import quantum.db.api as db -import quantum.db.models as models from quantum.plugins.openvswitch import ovs_models diff --git a/quantum/plugins/openvswitch/ovs_models.py b/quantum/plugins/openvswitch/ovs_models.py index 580402436..3bb7ede2a 100644 --- a/quantum/plugins/openvswitch/ovs_models.py +++ b/quantum/plugins/openvswitch/ovs_models.py @@ -17,11 +17,7 @@ # @author: Brad Hall, Nicira Networks, Inc. # @author: Dan Wendlandt, Nicira Networks, Inc. -import uuid - -from sqlalchemy import Column, Integer, String, ForeignKey -from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.orm import relation +from sqlalchemy import Column, Integer, String from quantum.db.models import BASE diff --git a/quantum/plugins/openvswitch/ovs_quantum_plugin.py b/quantum/plugins/openvswitch/ovs_quantum_plugin.py index 35eb92d27..aae2f2992 100644 --- a/quantum/plugins/openvswitch/ovs_quantum_plugin.py +++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.py @@ -19,9 +19,7 @@ # @author: Dave Lapsley, Nicira Networks, Inc. import logging -from optparse import OptionParser import os -import sys from quantum.api.api_common import OperationalStatus from quantum.common import exceptions as q_exc diff --git a/quantum/plugins/openvswitch/run_tests.py b/quantum/plugins/openvswitch/run_tests.py index e65bf6624..b55432f83 100755 --- a/quantum/plugins/openvswitch/run_tests.py +++ b/quantum/plugins/openvswitch/run_tests.py @@ -25,10 +25,8 @@ To run all tests:: PLUGIN_DIR=quantum/plugins/openvswitch ./run_tests.sh """ -import logging import os import sys -import unittest from nose import config from nose import core @@ -38,7 +36,6 @@ sys.path.append(os.path.dirname(__file__)) from quantum.api.api_common import OperationalStatus from quantum.common.test_lib import run_tests, test_config -from quantum.plugins.openvswitch.tests.unit.test_vlan_map import VlanMapTest import quantum.tests.unit diff --git a/quantum/plugins/openvswitch/tests/unit/test_tunnel.py b/quantum/plugins/openvswitch/tests/unit/test_tunnel.py index b06a8fcdf..48a31db47 100644 --- a/quantum/plugins/openvswitch/tests/unit/test_tunnel.py +++ b/quantum/plugins/openvswitch/tests/unit/test_tunnel.py @@ -16,7 +16,6 @@ # # @author: Dave Lapsley, Nicira Networks, Inc. -import os import unittest import mox diff --git a/quantum/plugins/ryu/db/models.py b/quantum/plugins/ryu/db/models.py index e31f2051c..e40f9cac5 100644 --- a/quantum/plugins/ryu/db/models.py +++ b/quantum/plugins/ryu/db/models.py @@ -15,7 +15,6 @@ # under the License. from sqlalchemy import Column, Integer, String -from sqlalchemy.ext.declarative import declarative_base from quantum.db.models import BASE diff --git a/quantum/plugins/ryu/run_tests.py b/quantum/plugins/ryu/run_tests.py index 4b66c23e2..2911d2345 100644 --- a/quantum/plugins/ryu/run_tests.py +++ b/quantum/plugins/ryu/run_tests.py @@ -55,9 +55,6 @@ if __name__ == '__main__': # patch modules for ryu.app.client and ryu.app.rest_nw_id # With those, plugin can be tested without ryu installed with patch_fake_ryu_client(): - # to find quantum/etc/plugin/ryu/ryu.ini before chdir() - import ryu_quantum_plugin - c = config.Config(stream=sys.stdout, env=os.environ, verbosity=3, diff --git a/quantum/plugins/ryu/tests/unit/basetest.py b/quantum/plugins/ryu/tests/unit/basetest.py index 0d2e007c2..5dbd39a1c 100644 --- a/quantum/plugins/ryu/tests/unit/basetest.py +++ b/quantum/plugins/ryu/tests/unit/basetest.py @@ -20,7 +20,6 @@ import stubout import unittest import quantum.db.api as db -import quantum.plugins.ryu.db.models # for ryu specific tables from quantum.plugins.ryu.tests.unit import utils diff --git a/quantum/tests/unit/test_api.py b/quantum/tests/unit/test_api.py index eb1ac748a..67fc622fc 100644 --- a/quantum/tests/unit/test_api.py +++ b/quantum/tests/unit/test_api.py @@ -19,7 +19,7 @@ import unittest from lxml import etree -from webob import exc, request +from webob import exc import quantum.api.attachments as atts import quantum.api.networks as nets