From a9e763914d0c160ec54dfec8d0958331153daa23 Mon Sep 17 00:00:00 2001 From: Maru Newby Date: Thu, 4 Apr 2013 04:10:23 +0000 Subject: [PATCH] Switch to flake8 from pep8. * flake8 supports more checks than pep8 (e.g. detection of unused imports and variables), and has an extension mechanism. A plugin to support automatic HACKING validation is planned. * See: http://flake8.readthedocs.org/ Change-Id: I8c9314c606802109a4d01908dbc74ecb792ad0ac --- quantum/agent/dhcp_agent.py | 10 +++-- quantum/agent/linux/daemon.py | 6 +-- quantum/agent/linux/dhcp.py | 6 +-- quantum/agent/linux/external_process.py | 6 +-- quantum/agent/linux/iptables_manager.py | 2 - quantum/agent/metadata/agent.py | 2 +- quantum/agent/metadata/namespace_proxy.py | 2 +- quantum/agent/netns_cleanup_util.py | 2 +- quantum/agent/rpc.py | 5 --- quantum/api/extensions.py | 1 - quantum/common/config.py | 2 - quantum/common/exceptions.py | 2 +- quantum/db/loadbalancer/loadbalancer_db.py | 8 +--- .../versions/38335592a0dc_nvp_portmap.py | 1 - .../versions/5a875d0e5c_ryu.py | 1 - .../versions/grizzly_release.py | 5 --- quantum/db/migration/cli.py | 2 - quantum/db/routedserviceinsertion_db.py | 1 - quantum/db/routerservicetype_db.py | 1 - quantum/plugins/bigswitch/plugin.py | 10 ++--- .../plugins/bigswitch/tests/test_server.py | 6 --- quantum/plugins/brocade/QuantumPlugin.py | 1 - .../cisco/common/cisco_credentials_v2.py | 6 +-- quantum/plugins/cisco/common/cisco_utils.py | 1 - quantum/plugins/cisco/db/api.py | 6 +-- quantum/plugins/cisco/db/l2network_models.py | 5 +-- quantum/plugins/cisco/db/network_db_v2.py | 2 +- quantum/plugins/cisco/db/network_models_v2.py | 6 +-- .../plugins/cisco/models/virt_phy_sw_v2.py | 23 +++++----- quantum/plugins/cisco/network_plugin.py | 7 ++-- .../nexus/cisco_nexus_network_driver_v2.py | 1 - .../cisco/nexus/cisco_nexus_plugin_v2.py | 1 - .../cisco/tests/unit/test_cisco_extension.py | 1 - .../plugins/cisco/tests/unit/test_database.py | 9 ++-- .../plugins/hyperv/hyperv_quantum_plugin.py | 3 +- .../agent/linuxbridge_quantum_agent.py | 3 +- .../plugins/linuxbridge/db/l2network_db_v2.py | 3 +- .../plugins/linuxbridge/lb_quantum_plugin.py | 5 +-- .../plugins/metaplugin/meta_quantum_plugin.py | 3 +- quantum/plugins/midonet/midonet_lib.py | 8 ++-- quantum/plugins/midonet/plugin.py | 3 +- .../plugins/nec/agent/nec_quantum_agent.py | 2 +- quantum/plugins/nec/common/config.py | 3 +- quantum/plugins/nec/db/api.py | 5 +-- quantum/plugins/nec/drivers/pfc.py | 2 +- quantum/plugins/nec/nec_plugin.py | 8 +--- quantum/plugins/nec/ofc_manager.py | 2 +- .../nicira/nicira_nvp_plugin/QuantumPlugin.py | 3 +- .../nicira_nvp_plugin/nicira_networkgw_db.py | 1 - .../openvswitch/agent/ovs_quantum_agent.py | 2 +- quantum/plugins/openvswitch/ovs_db_v2.py | 4 +- .../plugins/openvswitch/ovs_quantum_plugin.py | 6 +-- .../plumgrid_nos_plugin/plumgrid_plugin.py | 14 ++----- .../plumgrid_nos_plugin/rest_connection.py | 2 +- .../plugins/ryu/agent/ryu_quantum_agent.py | 2 +- quantum/plugins/ryu/db/api_v2.py | 2 +- quantum/plugins/ryu/ryu_quantum_plugin.py | 3 +- .../drivers/haproxy/namespace_driver.py | 1 - quantum/scheduler/l3_agent_scheduler.py | 2 +- quantum/tests/unit/_test_rootwrap_exec.py | 2 +- .../unit/bigswitch/test_restproxy_plugin.py | 2 +- .../tests/unit/bigswitch/test_router_db.py | 4 +- .../tests/unit/cisco/test_network_plugin.py | 4 +- quantum/tests/unit/cisco/test_nexus_plugin.py | 1 - .../db/loadbalancer/test_db_loadbalancer.py | 18 ++------ .../unit/hyperv/test_hyperv_quantum_agent.py | 2 - .../tests/unit/linuxbridge/test_defaults.py | 3 +- .../unit/linuxbridge/test_lb_quantum_agent.py | 4 +- .../tests/unit/metaplugin/test_metaplugin.py | 2 - .../tests/unit/midonet/test_midonet_plugin.py | 14 +------ quantum/tests/unit/nec/test_db.py | 2 +- quantum/tests/unit/nec/test_ofc_manager.py | 2 +- quantum/tests/unit/nec/test_security_group.py | 2 +- quantum/tests/unit/nec/test_trema_driver.py | 2 +- quantum/tests/unit/nicira/test_defaults.py | 2 +- quantum/tests/unit/nicira/test_networkgw.py | 1 - .../tests/unit/nicira/test_nicira_plugin.py | 22 +++++----- .../unit/openvswitch/test_ovs_defaults.py | 3 +- .../tests/unit/openvswitch/test_ovs_lib.py | 6 +-- .../tests/unit/openvswitch/test_ovs_tunnel.py | 9 ++-- quantum/tests/unit/ryu/test_defaults.py | 3 +- quantum/tests/unit/ryu/test_ryu_db.py | 8 +--- quantum/tests/unit/ryu/test_ryu_plugin.py | 5 +-- .../tests/unit/ryu/test_ryu_security_group.py | 1 - .../agent_loadbalancer/agent/test_init.py | 1 - .../agent_loadbalancer/test_plugin.py | 4 +- quantum/tests/unit/test_agent_ovs_cleanup.py | 2 - quantum/tests/unit/test_agent_rpc.py | 3 +- quantum/tests/unit/test_api_v2.py | 3 -- quantum/tests/unit/test_config.py | 2 +- quantum/tests/unit/test_db_plugin.py | 42 ++++--------------- quantum/tests/unit/test_db_rpc_base.py | 4 +- quantum/tests/unit/test_debug_commands.py | 7 ---- quantum/tests/unit/test_dhcp_agent.py | 36 ++++------------ .../unit/test_extension_security_group.py | 1 - quantum/tests/unit/test_extensions.py | 3 +- quantum/tests/unit/test_l3_plugin.py | 1 - quantum/tests/unit/test_linux_daemon.py | 11 ++--- .../tests/unit/test_linux_external_process.py | 2 +- quantum/tests/unit/test_linux_interface.py | 13 ------ quantum/tests/unit/test_linux_ip_lib.py | 4 +- .../tests/unit/test_loadbalancer_plugin.py | 2 - quantum/tests/unit/test_metadata_agent.py | 12 +++--- .../unit/test_metadata_namespace_proxy.py | 6 +-- quantum/tests/unit/test_policy.py | 3 -- quantum/tests/unit/test_quantum_context.py | 2 +- quantum/tests/unit/test_rootwrap.py | 4 +- .../tests/unit/test_routerserviceinsertion.py | 4 +- quantum/tests/unit/test_servicetype.py | 5 --- run_tests.py | 1 - tools/test-requires | 2 +- tox.ini | 17 +++++--- 112 files changed, 180 insertions(+), 383 deletions(-) diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py index 3993b56ce..42c9f0a04 100644 --- a/quantum/agent/dhcp_agent.py +++ b/quantum/agent/dhcp_agent.py @@ -129,7 +129,7 @@ class DhcpAgent(manager.Manager): getattr(driver, action)() return True - except Exception, e: + except Exception: self.needs_resync = True LOG.exception(_('Unable to %s dhcp.'), action) @@ -718,8 +718,7 @@ class DhcpAgentWithStateReport(DhcpAgent): LOG.info(_("DHCP agent started")) -def main(): - eventlet.monkey_patch() +def register_options(): cfg.CONF.register_opts(DhcpAgent.OPTS) config.register_agent_state_opts_helper(cfg.CONF) config.register_root_helper(cfg.CONF) @@ -727,6 +726,11 @@ def main(): cfg.CONF.register_opts(DhcpLeaseRelay.OPTS) cfg.CONF.register_opts(dhcp.OPTS) cfg.CONF.register_opts(interface.OPTS) + + +def main(): + eventlet.monkey_patch() + register_options() cfg.CONF(project='quantum') config.setup_logging(cfg.CONF) server = quantum_service.Service.create( diff --git a/quantum/agent/linux/daemon.py b/quantum/agent/linux/daemon.py index f984d79a1..cdd6dc292 100644 --- a/quantum/agent/linux/daemon.py +++ b/quantum/agent/linux/daemon.py @@ -31,7 +31,7 @@ class Pidfile(object): def __init__(self, pidfile, procname, root_helper='sudo'): try: self.fd = os.open(pidfile, os.O_CREAT | os.O_RDWR) - except IOError, e: + except IOError: LOG.exception(_("Failed to open pidfile: %s"), pidfile) sys.exit(1) self.pidfile = pidfile @@ -68,7 +68,7 @@ class Pidfile(object): cmd = ['cat', '/proc/%s/cmdline' % pid] try: return self.procname in utils.execute(cmd, self.root_helper) - except RuntimeError, e: + except RuntimeError: return False @@ -91,7 +91,7 @@ class Daemon(object): pid = os.fork() if pid > 0: sys.exit(0) - except OSError, e: + except OSError: LOG.exception(_('Fork failed')) sys.exit(1) diff --git a/quantum/agent/linux/dhcp.py b/quantum/agent/linux/dhcp.py index 0d87039f1..b91de9fca 100644 --- a/quantum/agent/linux/dhcp.py +++ b/quantum/agent/linux/dhcp.py @@ -163,9 +163,9 @@ class DhcpLocalProcess(DhcpBase): with open(file_name, 'r') as f: try: return converter and converter(f.read()) or f.read() - except ValueError, e: + except ValueError: msg = _('Unable to convert value in %s') - except IOError, e: + except IOError: msg = _('Unable to access %s') LOG.debug(msg % file_name) @@ -185,7 +185,7 @@ class DhcpLocalProcess(DhcpBase): cmd = ['cat', '/proc/%s/cmdline' % pid] try: return self.network.id in utils.execute(cmd, self.root_helper) - except RuntimeError, e: + except RuntimeError: return False @property diff --git a/quantum/agent/linux/external_process.py b/quantum/agent/linux/external_process.py index 12d9a038a..5d8d3c2dd 100644 --- a/quantum/agent/linux/external_process.py +++ b/quantum/agent/linux/external_process.py @@ -86,9 +86,9 @@ class ProcessManager(object): try: with open(file_name, 'r') as f: return int(f.read()) - except IOError, e: + except IOError: msg = _('Unable to access %s') - except ValueError, e: + except ValueError: msg = _('Unable to convert value in %s') LOG.debug(msg, file_name) @@ -103,5 +103,5 @@ class ProcessManager(object): cmd = ['cat', '/proc/%s/cmdline' % pid] try: return self.uuid in utils.execute(cmd, self.root_helper) - except RuntimeError, e: + except RuntimeError: return False diff --git a/quantum/agent/linux/iptables_manager.py b/quantum/agent/linux/iptables_manager.py index 13774b5c0..b65dcba35 100644 --- a/quantum/agent/linux/iptables_manager.py +++ b/quantum/agent/linux/iptables_manager.py @@ -24,8 +24,6 @@ import inspect import os -from oslo.config import cfg - from quantum.agent.linux import utils from quantum.openstack.common import lockutils from quantum.openstack.common import log as logging diff --git a/quantum/agent/metadata/agent.py b/quantum/agent/metadata/agent.py index 4ceb4d0e4..5a7428186 100644 --- a/quantum/agent/metadata/agent.py +++ b/quantum/agent/metadata/agent.py @@ -89,7 +89,7 @@ class MetadataProxyHandler(object): else: return webob.exc.HTTPNotFound() - except Exception, e: + except Exception: LOG.exception(_("Unexpected error.")) msg = _('An unknown error has occurred. ' 'Please try your request again.') diff --git a/quantum/agent/metadata/namespace_proxy.py b/quantum/agent/metadata/namespace_proxy.py index 47f47db52..86d608410 100644 --- a/quantum/agent/metadata/namespace_proxy.py +++ b/quantum/agent/metadata/namespace_proxy.py @@ -77,7 +77,7 @@ class NetworkMetadataProxyHandler(object): return self._proxy_request(req.remote_addr, req.path_info, req.query_string) - except Exception, e: + except Exception: LOG.exception(_("Unexpected error.")) msg = _('An unknown error has occurred. ' 'Please try your request again.') diff --git a/quantum/agent/netns_cleanup_util.py b/quantum/agent/netns_cleanup_util.py index 4090f7caa..66c749186 100644 --- a/quantum/agent/netns_cleanup_util.py +++ b/quantum/agent/netns_cleanup_util.py @@ -139,7 +139,7 @@ def destroy_namespace(conf, namespace, force=False): unplug_device(conf, device) ip.garbage_collect_namespace() - except Exception, e: + except Exception: LOG.exception(_('Error unable to destroy namespace: %s'), namespace) diff --git a/quantum/agent/rpc.py b/quantum/agent/rpc.py index 0b9a62a59..960bcde62 100644 --- a/quantum/agent/rpc.py +++ b/quantum/agent/rpc.py @@ -15,17 +15,12 @@ # License for the specific language governing permissions and limitations # under the License. -import eventlet - from quantum.common import topics from quantum.openstack.common import log as logging -from quantum.openstack.common.notifier import api -from quantum.openstack.common.notifier import rpc_notifier from quantum.openstack.common import rpc from quantum.openstack.common.rpc import proxy from quantum.openstack.common import timeutils -from quantum.openstack.common import uuidutils LOG = logging.getLogger(__name__) diff --git a/quantum/api/extensions.py b/quantum/api/extensions.py index 286f00e33..e6c730cd7 100644 --- a/quantum/api/extensions.py +++ b/quantum/api/extensions.py @@ -27,7 +27,6 @@ import webob.dec import webob.exc from quantum.api.v2 import attributes -from quantum.common import constants from quantum.common import exceptions import quantum.extensions from quantum.manager import QuantumManager diff --git a/quantum/common/config.py b/quantum/common/config.py index 8c885d8c0..a1c0a7c5c 100644 --- a/quantum/common/config.py +++ b/quantum/common/config.py @@ -25,7 +25,6 @@ from oslo.config import cfg from paste import deploy from quantum.api.v2 import attributes -from quantum.common import constants from quantum.common import utils from quantum.openstack.common import log as logging from quantum.openstack.common import rpc @@ -116,7 +115,6 @@ def setup_logging(conf): """ product_name = "quantum" logging.setup(product_name) - log_root = logging.getLogger(product_name).logger LOG.info(_("Logging enabled!")) diff --git a/quantum/common/exceptions.py b/quantum/common/exceptions.py index 71d1d9da9..29173f0e2 100644 --- a/quantum/common/exceptions.py +++ b/quantum/common/exceptions.py @@ -20,7 +20,7 @@ Quantum base exception handling. """ from quantum.openstack.common.exception import Error -from quantum.openstack.common.exception import InvalidContentType +from quantum.openstack.common.exception import InvalidContentType # noqa from quantum.openstack.common.exception import OpenstackException diff --git a/quantum/db/loadbalancer/loadbalancer_db.py b/quantum/db/loadbalancer/loadbalancer_db.py index dfe5eec84..031a5a09a 100644 --- a/quantum/db/loadbalancer/loadbalancer_db.py +++ b/quantum/db/loadbalancer/loadbalancer_db.py @@ -15,17 +15,13 @@ # under the License. # -from oslo.config import cfg import sqlalchemy as sa from sqlalchemy import exc as sa_exc from sqlalchemy import orm from sqlalchemy.orm import exc -from sqlalchemy.sql import expression as expr -import webob.exc as w_exc from quantum.api.v2 import attributes from quantum.common import exceptions as q_exc -from quantum.db import db_base_plugin_v2 from quantum.db import model_base from quantum.db import models_v2 from quantum.extensions import loadbalancer @@ -34,7 +30,6 @@ from quantum import manager from quantum.openstack.common import log as logging from quantum.openstack.common import uuidutils from quantum.plugins.common import constants -from quantum import policy LOG = logging.getLogger(__name__) @@ -663,10 +658,9 @@ class LoadBalancerPluginDb(LoadBalancerPluginBase): tenant_id = self._get_tenant_id_for_create(context, v) with context.session.begin(subtransactions=True): - pool = None try: qry = context.session.query(Pool) - pool = qry.filter_by(id=v['pool_id']).one() + qry.filter_by(id=v['pool_id']).one() except exc.NoResultFound: raise loadbalancer.PoolNotFound(pool_id=v['pool_id']) diff --git a/quantum/db/migration/alembic_migrations/versions/38335592a0dc_nvp_portmap.py b/quantum/db/migration/alembic_migrations/versions/38335592a0dc_nvp_portmap.py index e327c7885..9c27decd1 100644 --- a/quantum/db/migration/alembic_migrations/versions/38335592a0dc_nvp_portmap.py +++ b/quantum/db/migration/alembic_migrations/versions/38335592a0dc_nvp_portmap.py @@ -35,7 +35,6 @@ migration_for_plugins = [ from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql from quantum.db import migration diff --git a/quantum/db/migration/alembic_migrations/versions/5a875d0e5c_ryu.py b/quantum/db/migration/alembic_migrations/versions/5a875d0e5c_ryu.py index 3d07bad31..c0668367c 100644 --- a/quantum/db/migration/alembic_migrations/versions/5a875d0e5c_ryu.py +++ b/quantum/db/migration/alembic_migrations/versions/5a875d0e5c_ryu.py @@ -40,7 +40,6 @@ migration_for_plugins = [ from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import mysql from quantum.db import migration diff --git a/quantum/db/migration/alembic_migrations/versions/grizzly_release.py b/quantum/db/migration/alembic_migrations/versions/grizzly_release.py index 0ac892f13..65368fb9f 100644 --- a/quantum/db/migration/alembic_migrations/versions/grizzly_release.py +++ b/quantum/db/migration/alembic_migrations/versions/grizzly_release.py @@ -31,11 +31,6 @@ down_revision = '1341ed32cc1e' migration_for_plugins = ['*'] -from alembic import op -import sqlalchemy as sa - -from quantum.db import migration - def upgrade(active_plugin=None, options=None): """A no-op migration for marking the Grizzly release.""" diff --git a/quantum/db/migration/cli.py b/quantum/db/migration/cli.py index 25e0ce09f..8aac59ebc 100644 --- a/quantum/db/migration/cli.py +++ b/quantum/db/migration/cli.py @@ -17,14 +17,12 @@ # @author: Mark McClain, DreamHost import os -import sys from alembic import command as alembic_command from alembic import config as alembic_config from alembic import util as alembic_util from oslo.config import cfg -from quantum import manager _core_opts = [ cfg.StrOpt('core_plugin', diff --git a/quantum/db/routedserviceinsertion_db.py b/quantum/db/routedserviceinsertion_db.py index 1d7dc517f..d1ff575f3 100644 --- a/quantum/db/routedserviceinsertion_db.py +++ b/quantum/db/routedserviceinsertion_db.py @@ -18,7 +18,6 @@ import sqlalchemy as sa from sqlalchemy import event -from sqlalchemy.orm import exc from quantum.common import exceptions as qexception from quantum.db import model_base diff --git a/quantum/db/routerservicetype_db.py b/quantum/db/routerservicetype_db.py index f667bd363..a7eb41ad6 100644 --- a/quantum/db/routerservicetype_db.py +++ b/quantum/db/routerservicetype_db.py @@ -17,7 +17,6 @@ # @author: Kaiwei Fan, VMware, Inc import sqlalchemy as sa -from sqlalchemy.orm import exc from quantum.db import model_base from quantum.extensions import routerservicetype as rst diff --git a/quantum/plugins/bigswitch/plugin.py b/quantum/plugins/bigswitch/plugin.py index 6dce904ae..9239c25ad 100644 --- a/quantum/plugins/bigswitch/plugin.py +++ b/quantum/plugins/bigswitch/plugin.py @@ -747,7 +747,7 @@ class QuantumRestProxyV2(db_base_plugin_v2.QuantumDbPluginV2, # update network on network controller try: self._send_update_network(orig_net) - except RemoteRestError as e: + except RemoteRestError: # rollback creation of subnet super(QuantumRestProxyV2, self).delete_subnet(context, subnet['id']) @@ -770,7 +770,7 @@ class QuantumRestProxyV2(db_base_plugin_v2.QuantumDbPluginV2, # update network on network controller try: self._send_update_network(orig_net) - except RemoteRestError as e: + except RemoteRestError: # rollback updation of subnet super(QuantumRestProxyV2, self).update_subnet(context, id, orig_subnet) @@ -788,7 +788,7 @@ class QuantumRestProxyV2(db_base_plugin_v2.QuantumDbPluginV2, # update network on network controller try: self._send_update_network(orig_net) - except RemoteRestError as e: + except RemoteRestError: # TODO (Sumit): rollback deletion of subnet raise @@ -1014,7 +1014,7 @@ class QuantumRestProxyV2(db_base_plugin_v2.QuantumDbPluginV2, # update network on network controller try: self._send_update_network(orig_net) - except RemoteRestError as e: + except RemoteRestError: # rollback updation of subnet super(QuantumRestProxyV2, self).update_floatingip(context, id, orig_fl_ip) @@ -1035,7 +1035,7 @@ class QuantumRestProxyV2(db_base_plugin_v2.QuantumDbPluginV2, # update network on network controller try: self._send_update_network(orig_net) - except RemoteRestError as e: + except RemoteRestError: # TODO(Sumit): rollback deletion of floating IP raise diff --git a/quantum/plugins/bigswitch/tests/test_server.py b/quantum/plugins/bigswitch/tests/test_server.py index 43c738bc0..26afa6a17 100755 --- a/quantum/plugins/bigswitch/tests/test_server.py +++ b/quantum/plugins/bigswitch/tests/test_server.py @@ -85,12 +85,6 @@ class TestNetworkCtrl(object): assert id_ <= len(self.matches), 'remove_id: id > len()' self.matches.pop(id_) - def remove_match(self, prior, method_regexp, uri_regexp): - for i in self.matches: - if (i[0], i[1], i[2]) == (method_regexp, uri_regexp, idstr): - self.remove_id(i) - break - def request_handler(self, method, uri, body): retstatus = self.default_status retbody = self.default_response diff --git a/quantum/plugins/brocade/QuantumPlugin.py b/quantum/plugins/brocade/QuantumPlugin.py index c5a13641c..895a967ef 100644 --- a/quantum/plugins/brocade/QuantumPlugin.py +++ b/quantum/plugins/brocade/QuantumPlugin.py @@ -40,7 +40,6 @@ from quantum.db import agentschedulers_db 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 l3_db from quantum.db import l3_rpc_base from quantum.db import securitygroups_rpc_base as sg_db_rpc from quantum.extensions import portbindings diff --git a/quantum/plugins/cisco/common/cisco_credentials_v2.py b/quantum/plugins/cisco/common/cisco_credentials_v2.py index 7fa1a35f3..203c2498e 100644 --- a/quantum/plugins/cisco/common/cisco_credentials_v2.py +++ b/quantum/plugins/cisco/common/cisco_credentials_v2.py @@ -18,8 +18,6 @@ import logging as LOG -from oslo.config import cfg - from quantum.plugins.cisco.common import config from quantum.plugins.cisco.common import cisco_constants as const from quantum.plugins.cisco.common import cisco_exceptions as cexc @@ -54,7 +52,7 @@ class Store(object): @staticmethod def put_credential(cred_name, username, password): """Set the username and password""" - credential = cdb.add_credential(TENANT, cred_name, username, password) + cdb.add_credential(TENANT, cred_name, username, password) @staticmethod def get_username(cred_name): @@ -71,7 +69,7 @@ class Store(object): @staticmethod def get_credential(cred_name): """Get the username and password""" - credential = cdb.get_credential_name(TENANT, cred_name) + cdb.get_credential_name(TENANT, cred_name) return {const.USERNAME: const.CREDENTIAL_USERNAME, const.PASSWORD: const.CREDENTIAL_PASSWORD} diff --git a/quantum/plugins/cisco/common/cisco_utils.py b/quantum/plugins/cisco/common/cisco_utils.py index de1d1d34f..080493250 100644 --- a/quantum/plugins/cisco/common/cisco_utils.py +++ b/quantum/plugins/cisco/common/cisco_utils.py @@ -20,7 +20,6 @@ import hashlib import logging from quantum.plugins.cisco.common import cisco_constants as const -from quantum.plugins.cisco.db import l2network_db as cdb LOG = logging.getLogger(__name__) diff --git a/quantum/plugins/cisco/db/api.py b/quantum/plugins/cisco/db/api.py index 5aab5015e..708b01661 100644 --- a/quantum/plugins/cisco/db/api.py +++ b/quantum/plugins/cisco/db/api.py @@ -102,7 +102,7 @@ def network_id(net_name): options(joinedload(models.Network.ports)). filter_by(name=net_name). all()) - except exc.NoResultFound, e: + except exc.NoResultFound: raise q_exc.NetworkNotFound(net_name=net_name) @@ -113,7 +113,7 @@ def network_get(net_id): options(joinedload(models.Network.ports)). \ filter_by(uuid=net_id).\ one() - except exc.NoResultFound, e: + except exc.NoResultFound: raise q_exc.NetworkNotFound(net_id=net_id) @@ -147,7 +147,7 @@ def validate_network_ownership(tenant_id, net_id): filter_by(uuid=net_id). filter_by(tenant_id=tenant_id). one()) - except exc.NoResultFound, e: + except exc.NoResultFound: raise q_exc.NetworkNotFound(net_id=net_id) diff --git a/quantum/plugins/cisco/db/l2network_models.py b/quantum/plugins/cisco/db/l2network_models.py index b34d61263..45ccc9f1d 100644 --- a/quantum/plugins/cisco/db/l2network_models.py +++ b/quantum/plugins/cisco/db/l2network_models.py @@ -15,11 +15,10 @@ # under the License. # @author: Rohit Agarwalla, Cisco Systems, Inc. -from sqlalchemy import Column, Integer, String, ForeignKey, Boolean -from sqlalchemy.orm import relation, object_mapper +from sqlalchemy import Column, Integer, String, Boolean +from sqlalchemy.orm import object_mapper from quantum.openstack.common import uuidutils -from quantum.plugins.cisco.db import models from quantum.plugins.cisco.db.models import BASE diff --git a/quantum/plugins/cisco/db/network_db_v2.py b/quantum/plugins/cisco/db/network_db_v2.py index 1c2b1978d..e5339d4a4 100644 --- a/quantum/plugins/cisco/db/network_db_v2.py +++ b/quantum/plugins/cisco/db/network_db_v2.py @@ -24,7 +24,7 @@ from quantum.openstack.common import log as logging from quantum.plugins.cisco.common import cisco_exceptions as c_exc from quantum.plugins.cisco.common import config from quantum.plugins.cisco.db import network_models_v2 -from quantum.plugins.cisco.db import nexus_models_v2 +from quantum.plugins.cisco.db import nexus_models_v2 # noqa from quantum.plugins.openvswitch import ovs_models_v2 diff --git a/quantum/plugins/cisco/db/network_models_v2.py b/quantum/plugins/cisco/db/network_models_v2.py index f66309da9..f9c018987 100644 --- a/quantum/plugins/cisco/db/network_models_v2.py +++ b/quantum/plugins/cisco/db/network_models_v2.py @@ -16,11 +16,11 @@ # # @author: Rohit Agarwalla, Cisco Systems, Inc. -from sqlalchemy import Column, Integer, String, ForeignKey, Boolean -from sqlalchemy.orm import relation, object_mapper +from sqlalchemy import Column, Integer, String, Boolean +from sqlalchemy.orm import object_mapper from quantum.db import model_base -from quantum.db import models_v2 as models +from quantum.db import models_v2 as models # noqa from quantum.openstack.common import uuidutils diff --git a/quantum/plugins/cisco/models/virt_phy_sw_v2.py b/quantum/plugins/cisco/models/virt_phy_sw_v2.py index 8a9cea25f..5ac8bdd2d 100644 --- a/quantum/plugins/cisco/models/virt_phy_sw_v2.py +++ b/quantum/plugins/cisco/models/virt_phy_sw_v2.py @@ -19,14 +19,12 @@ # @author: Rohit Agarwalla, Cisco Systems, Inc. # -from copy import deepcopy import inspect import logging from novaclient.v1_1 import client as nova_client from oslo.config import cfg -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 @@ -229,9 +227,9 @@ class VirtualPhysicalSwitchModelV2(quantum_plugin_base_v2.QuantumPluginBaseV2): args = [ovs_output[0]['tenant_id'], id, {'vlan_id': vlan_id}, {'net_admin_state': ovs_output[0]['admin_state_up']}, {'vlan_ids': vlanids}] - nexus_output = self._invoke_plugin_per_device(const.NEXUS_PLUGIN, - self._func_name(), - args) + self._invoke_plugin_per_device(const.NEXUS_PLUGIN, + self._func_name(), + args) return ovs_output[0] def delete_network(self, context, id): @@ -300,11 +298,10 @@ class VirtualPhysicalSwitchModelV2(quantum_plugin_base_v2.QuantumPluginBaseV2): instance_id = port['port']['device_id'] device_owner = port['port']['device_owner'] - if conf.CISCO_TEST.host is not None: - host = conf.CISCO_TEST.host - elif device_owner == 'network:dhcp': - return ovs_output[0] - elif instance_id: + create_net = (conf.CISCO_TEST.host is None and + device_owner != 'network:dhcp' and + instance_id) + if create_net: net_id = port['port']['network_id'] tenant_id = port['port']['tenant_id'] self._invoke_nexus_for_net_create( @@ -368,9 +365,9 @@ class VirtualPhysicalSwitchModelV2(quantum_plugin_base_v2.QuantumPluginBaseV2): ovs_output = self._invoke_plugin_per_device(const.VSWITCH_PLUGIN, self._func_name(), args) - nexus_output = self._invoke_plugin_per_device(const.NEXUS_PLUGIN, - self._func_name(), - n_args) + self._invoke_plugin_per_device(const.NEXUS_PLUGIN, + self._func_name(), + n_args) return ovs_output[0] except: # TODO (asomya): Check if we need to perform any rollback here diff --git a/quantum/plugins/cisco/network_plugin.py b/quantum/plugins/cisco/network_plugin.py index 2e5f64a75..a54d5951e 100644 --- a/quantum/plugins/cisco/network_plugin.py +++ b/quantum/plugins/cisco/network_plugin.py @@ -27,8 +27,7 @@ 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_exceptions as cexc -from quantum.plugins.cisco.common import cisco_utils as cutil -from quantum.plugins.cisco.common import config +from quantum.plugins.cisco.common import config # noqa from quantum.plugins.cisco.db import network_db_v2 as cdb LOG = logging.getLogger(__name__) @@ -300,7 +299,7 @@ class PluginV2(db_base_plugin_v2.QuantumDbPluginV2): """Delete a QoS level""" LOG.debug(_("delete_qos() called")) try: - qos_level = cdb.get_qos(tenant_id, qos_id) + cdb.get_qos(tenant_id, qos_id) except Exception: raise cexc.QosNotFound(tenant_id=tenant_id, qos_id=qos_id) @@ -310,7 +309,7 @@ class PluginV2(db_base_plugin_v2.QuantumDbPluginV2): """Rename QoS level""" LOG.debug(_("rename_qos() called")) try: - qos_level = cdb.get_qos(tenant_id, qos_id) + cdb.get_qos(tenant_id, qos_id) except Exception: raise cexc.QosNotFound(tenant_id=tenant_id, qos_id=qos_id) diff --git a/quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py b/quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py index ad8f61c4f..a710531f9 100644 --- a/quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py +++ b/quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py @@ -21,7 +21,6 @@ Implements a Nexus-OS NETCONF over SSHv2 API Client """ -import eventlet import logging from ncclient import manager diff --git a/quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py b/quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py index 183e385bb..6c8f7034c 100644 --- a/quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py +++ b/quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py @@ -30,7 +30,6 @@ 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_v2 as cred -from quantum.plugins.cisco.common import cisco_exceptions as excep from quantum.plugins.cisco.common import config as conf from quantum.plugins.cisco.db import network_db_v2 as cdb from quantum.plugins.cisco.db import nexus_db_v2 as nxos_db diff --git a/quantum/plugins/cisco/tests/unit/test_cisco_extension.py b/quantum/plugins/cisco/tests/unit/test_cisco_extension.py index 2749a6e3f..5776249ec 100644 --- a/quantum/plugins/cisco/tests/unit/test_cisco_extension.py +++ b/quantum/plugins/cisco/tests/unit/test_cisco_extension.py @@ -25,7 +25,6 @@ import routes import webob from webtest import TestApp -from quantum import api as server from quantum.api import extensions from quantum.api.extensions import ( ExtensionMiddleware, diff --git a/quantum/plugins/cisco/tests/unit/test_database.py b/quantum/plugins/cisco/tests/unit/test_database.py index bc183a180..ac5b4e7a2 100644 --- a/quantum/plugins/cisco/tests/unit/test_database.py +++ b/quantum/plugins/cisco/tests/unit/test_database.py @@ -20,10 +20,7 @@ test_database.py is an independent test suite that tests the database api method calls """ -import logging as LOG - from quantum.openstack.common import log as logging -from quantum.plugins.cisco.common import cisco_constants as const import quantum.plugins.cisco.db.api as db import quantum.plugins.cisco.db.l2network_db as l2network_db import quantum.plugins.cisco.db.nexus_db_v2 as nexus_db @@ -364,8 +361,8 @@ class NexusDBTest(base.BaseTestCase): def testb_getall_nexusportbindings(self): """get all nexus port binding""" - binding1 = self.dbtest.create_nexusportbinding("port1", 10) - binding2 = self.dbtest.create_nexusportbinding("port2", 10) + self.dbtest.create_nexusportbinding("port1", 10) + self.dbtest.create_nexusportbinding("port2", 10) bindings = self.dbtest.get_all_nexusportbindings() count = 0 for bind in bindings: @@ -376,7 +373,7 @@ class NexusDBTest(base.BaseTestCase): def testc_delete_nexusportbinding(self): """delete nexus port binding""" - binding1 = self.dbtest.create_nexusportbinding("port1", 10) + self.dbtest.create_nexusportbinding("port1", 10) self.dbtest.delete_nexusportbinding(10) bindings = self.dbtest.get_all_nexusportbindings() count = 0 diff --git a/quantum/plugins/hyperv/hyperv_quantum_plugin.py b/quantum/plugins/hyperv/hyperv_quantum_plugin.py index 63cce8367..887b89f8b 100644 --- a/quantum/plugins/hyperv/hyperv_quantum_plugin.py +++ b/quantum/plugins/hyperv/hyperv_quantum_plugin.py @@ -23,8 +23,7 @@ from quantum.common import exceptions as q_exc from quantum.common import topics from quantum.db import db_base_plugin_v2 from quantum.db import l3_db -# NOTE: quota_db cannot be removed, it is for db model -from quantum.db import quota_db +from quantum.db import quota_db # noqa from quantum.extensions import portbindings from quantum.extensions import providernet as provider from quantum.openstack.common import log as logging diff --git a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py index 27e3e14bf..c69aa55b6 100755 --- a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py +++ b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py @@ -42,8 +42,7 @@ from quantum import context from quantum.openstack.common import log as logging from quantum.openstack.common import loopingcall 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 config # noqa 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 b58996f73..3e48b855d 100644 --- a/quantum/plugins/linuxbridge/db/l2network_db_v2.py +++ b/quantum/plugins/linuxbridge/db/l2network_db_v2.py @@ -22,8 +22,7 @@ from quantum.db import models_v2 from quantum.db import securitygroups_db as sg_db from quantum import manager 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 config # noqa 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 8b18c51ee..6993aa24d 100644 --- a/quantum/plugins/linuxbridge/lb_quantum_plugin.py +++ b/quantum/plugins/linuxbridge/lb_quantum_plugin.py @@ -25,7 +25,6 @@ from quantum.common import constants as q_const from quantum.common import exceptions as q_exc from quantum.common import rpc as q_rpc from quantum.common import topics -from quantum.common import utils from quantum.db import agents_db from quantum.db import agentschedulers_db from quantum.db import api as db_api @@ -33,12 +32,10 @@ from quantum.db import db_base_plugin_v2 from quantum.db import dhcp_rpc_base from quantum.db import extraroute_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 quota_db # noqa from quantum.db import securitygroups_rpc_base as sg_db_rpc from quantum.extensions import portbindings from quantum.extensions import providernet as provider -from quantum.extensions import securitygroup as ext_sg from quantum.openstack.common import importutils from quantum.openstack.common import log as logging from quantum.openstack.common import rpc diff --git a/quantum/plugins/metaplugin/meta_quantum_plugin.py b/quantum/plugins/metaplugin/meta_quantum_plugin.py index 3c9cde6e6..913b36d8b 100644 --- a/quantum/plugins/metaplugin/meta_quantum_plugin.py +++ b/quantum/plugins/metaplugin/meta_quantum_plugin.py @@ -26,8 +26,7 @@ from quantum.db import models_v2 from quantum.extensions.flavor import (FLAVOR_NETWORK, FLAVOR_ROUTER) 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.common import config # noqa from quantum.plugins.metaplugin import meta_db_v2 from quantum.plugins.metaplugin.meta_models_v2 import (NetworkFlavor, RouterFlavor) diff --git a/quantum/plugins/midonet/midonet_lib.py b/quantum/plugins/midonet/midonet_lib.py index 6d7adb11c..eeb74c8b8 100644 --- a/quantum/plugins/midonet/midonet_lib.py +++ b/quantum/plugins/midonet/midonet_lib.py @@ -218,13 +218,11 @@ class RuleManager: protocol = rule['protocol'] port_range_max = rule['port_range_max'] rule_id = rule['id'] - ethertype = rule['ethertype'] security_group_id = rule['security_group_id'] remote_group_id = rule['remote_group_id'] remote_ip_prefix = rule['remote_ip_prefix'] # watch out. not validated tenant_id = rule['tenant_id'] port_range_min = rule['port_range_min'] - external_id = rule['external_id'] # construct a corresponding rule tp_src_start = tp_src_end = None @@ -246,11 +244,11 @@ class RuleManager: tp_dst_start, tp_dst_end = port_range_min, port_range_max # protocol - if rule['protocol'] == 'tcp': + if protocol == 'tcp': nw_proto = 6 - elif rule['protocol'] == 'udp': + elif protocol == 'udp': nw_proto = 17 - elif rule['protocol'] == 'icmp': + elif protocol == 'icmp': nw_proto = 1 # extract type and code from reporposed fields icmp_type = rule['from_port'] diff --git a/quantum/plugins/midonet/plugin.py b/quantum/plugins/midonet/plugin.py index ed92efad7..7ee77c7e2 100644 --- a/quantum/plugins/midonet/plugin.py +++ b/quantum/plugins/midonet/plugin.py @@ -25,7 +25,6 @@ from oslo.config import cfg from webob import exc as w_exc 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 @@ -33,7 +32,7 @@ from quantum.db import models_v2 from quantum.db import securitygroups_db from quantum.extensions import securitygroup as ext_sg from quantum.openstack.common import log as logging -from quantum.plugins.midonet import config +from quantum.plugins.midonet import config # noqa from quantum.plugins.midonet import midonet_lib diff --git a/quantum/plugins/nec/agent/nec_quantum_agent.py b/quantum/plugins/nec/agent/nec_quantum_agent.py index 0559be46a..8e121a91e 100755 --- a/quantum/plugins/nec/agent/nec_quantum_agent.py +++ b/quantum/plugins/nec/agent/nec_quantum_agent.py @@ -63,7 +63,7 @@ class NECPluginApi(agent_rpc.PluginApi): datapath_id=datapath_id, port_added=port_added, port_removed=port_removed)) - except Exception as e: + except Exception: LOG.warn(_("update_ports() failed.")) return diff --git a/quantum/plugins/nec/common/config.py b/quantum/plugins/nec/common/config.py index f6fa30c6d..8229a9f51 100644 --- a/quantum/plugins/nec/common/config.py +++ b/quantum/plugins/nec/common/config.py @@ -18,8 +18,7 @@ from oslo.config import cfg from quantum.agent.common import config -# import rpc config options -from quantum.openstack.common import rpc +from quantum.openstack.common import rpc # noqa from quantum import scheduler diff --git a/quantum/plugins/nec/db/api.py b/quantum/plugins/nec/db/api.py index a22e34d3f..32ef259bb 100644 --- a/quantum/plugins/nec/db/api.py +++ b/quantum/plugins/nec/db/api.py @@ -24,8 +24,7 @@ from quantum.db import securitygroups_db as sg_db from quantum.extensions import securitygroup as ext_sg from quantum import manager 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 config # noqa from quantum.plugins.nec.common import exceptions as nexc from quantum.plugins.nec.db import models as nmodels @@ -221,7 +220,7 @@ def get_port_from_device(port_id): plugin = manager.QuantumManager.get_plugin() port_dict = plugin._make_port_dict(port) port_dict[ext_sg.SECURITYGROUPS] = [ - sg_id for port, sg_id in port_and_sgs if sg_id] + sg_id for port_, sg_id in port_and_sgs if sg_id] port_dict['security_group_rules'] = [] port_dict['security_group_source_groups'] = [] port_dict['fixed_ips'] = [ip['ip_address'] diff --git a/quantum/plugins/nec/drivers/pfc.py b/quantum/plugins/nec/drivers/pfc.py index 1694e9891..339199c32 100644 --- a/quantum/plugins/nec/drivers/pfc.py +++ b/quantum/plugins/nec/drivers/pfc.py @@ -76,7 +76,7 @@ class PFCDriverBase(ofc_driver_base.OFCDriverBase): def create_tenant(self, description, tenant_id=None): ofc_tenant_id = self._generate_pfc_id(tenant_id) body = {'id': ofc_tenant_id} - res = self.client.post('/tenants', body=body) + self.client.post('/tenants', body=body) return '/tenants/' + ofc_tenant_id def delete_tenant(self, ofc_tenant_id): diff --git a/quantum/plugins/nec/nec_plugin.py b/quantum/plugins/nec/nec_plugin.py index f1c14df1c..c8852c0dd 100644 --- a/quantum/plugins/nec/nec_plugin.py +++ b/quantum/plugins/nec/nec_plugin.py @@ -19,21 +19,16 @@ from quantum.agent import securitygroups_rpc as sg_rpc from quantum.api.rpc.agentnotifiers import dhcp_rpc_agent_api from quantum.api.rpc.agentnotifiers import l3_rpc_agent_api -from quantum.common import constants as q_const -from quantum.common import exceptions as q_exc from quantum.common import rpc as q_rpc from quantum.common import topics -from quantum import context from quantum.db import agents_db from quantum.db import agentschedulers_db from quantum.db import dhcp_rpc_base from quantum.db import extraroute_db from quantum.db import l3_rpc_base -#NOTE(amotoki): quota_db cannot be removed, it is for db model -from quantum.db import quota_db +from quantum.db import quota_db # noqa from quantum.db import securitygroups_rpc_base as sg_db_rpc from quantum.extensions import portbindings -from quantum.extensions import securitygroup as ext_sg from quantum.openstack.common import importutils from quantum.openstack.common import log as logging from quantum.openstack.common import rpc @@ -670,7 +665,6 @@ class NECPluginV2RPCCallbacks(object): """ LOG.debug(_("NECPluginV2RPCCallbacks.update_ports() called, " "kwargs=%s ."), kwargs) - topic = kwargs['topic'] datapath_id = kwargs['datapath_id'] session = rpc_context.session for p in kwargs.get('port_added', []): diff --git a/quantum/plugins/nec/ofc_manager.py b/quantum/plugins/nec/ofc_manager.py index 3593ddb4c..91e3cff33 100644 --- a/quantum/plugins/nec/ofc_manager.py +++ b/quantum/plugins/nec/ofc_manager.py @@ -132,5 +132,5 @@ class OFCManager(object): ofc_pf_id = self._get_ofc_id(context, "ofc_packet_filter", filter_id) ofc_pf_id = self.driver.convert_ofc_filter_id(context, ofc_pf_id) - res = self.driver.delete_filter(ofc_pf_id) + self.driver.delete_filter(ofc_pf_id) self._del_ofc_item(context, "ofc_packet_filter", filter_id) diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py index 6b56c7151..9f49701f6 100644 --- a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py +++ b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py @@ -43,8 +43,7 @@ from quantum.db import dhcp_rpc_base from quantum.db import l3_db from quantum.db import models_v2 from quantum.db import portsecurity_db -# NOTE: quota_db cannot be removed, it is for db model -from quantum.db import quota_db +from quantum.db import quota_db # noqa from quantum.db import securitygroups_db from quantum.extensions import l3 from quantum.extensions import portsecurity as psec diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/nicira_networkgw_db.py b/quantum/plugins/nicira/nicira_nvp_plugin/nicira_networkgw_db.py index 172bc3f9f..10c1e9c64 100644 --- a/quantum/plugins/nicira/nicira_nvp_plugin/nicira_networkgw_db.py +++ b/quantum/plugins/nicira/nicira_nvp_plugin/nicira_networkgw_db.py @@ -32,7 +32,6 @@ from quantum.db import models_v2 from quantum.openstack.common import log as logging from quantum.openstack.common import uuidutils from quantum.plugins.nicira.nicira_nvp_plugin.extensions import nvp_networkgw -from quantum import policy LOG = logging.getLogger(__name__) diff --git a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py index 2c384ec30..a49cda34f 100644 --- a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py +++ b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py @@ -40,7 +40,7 @@ from quantum.extensions import securitygroup as ext_sg from quantum.openstack.common import log as logging from quantum.openstack.common import loopingcall from quantum.openstack.common.rpc import dispatcher -from quantum.plugins.openvswitch.common import config +from quantum.plugins.openvswitch.common import config # noqa from quantum.plugins.openvswitch.common import constants diff --git a/quantum/plugins/openvswitch/ovs_db_v2.py b/quantum/plugins/openvswitch/ovs_db_v2.py index 3708c6fdb..5c6b68b36 100644 --- a/quantum/plugins/openvswitch/ovs_db_v2.py +++ b/quantum/plugins/openvswitch/ovs_db_v2.py @@ -18,8 +18,6 @@ from sqlalchemy.orm import exc -from oslo.config import cfg - from quantum.common import exceptions as q_exc import quantum.db.api as db from quantum.db import models_v2 @@ -329,7 +327,7 @@ def get_port_from_device(port_id): plugin = manager.QuantumManager.get_plugin() port_dict = plugin._make_port_dict(port) port_dict[ext_sg.SECURITYGROUPS] = [ - sg_id for port, sg_id in port_and_sgs if sg_id] + sg_id for port_, sg_id in port_and_sgs if sg_id] port_dict['security_group_rules'] = [] port_dict['security_group_source_groups'] = [] port_dict['fixed_ips'] = [ip['ip_address'] diff --git a/quantum/plugins/openvswitch/ovs_quantum_plugin.py b/quantum/plugins/openvswitch/ovs_quantum_plugin.py index 7fe93644c..520723259 100644 --- a/quantum/plugins/openvswitch/ovs_quantum_plugin.py +++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.py @@ -38,17 +38,15 @@ from quantum.db import db_base_plugin_v2 from quantum.db import dhcp_rpc_base from quantum.db import extraroute_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 quota_db # noqa from quantum.db import securitygroups_rpc_base as sg_db_rpc from quantum.extensions import portbindings from quantum.extensions import providernet as provider -from quantum.extensions import securitygroup as ext_sg from quantum.openstack.common import importutils from quantum.openstack.common import log as logging from quantum.openstack.common import rpc from quantum.openstack.common.rpc import proxy -from quantum.plugins.openvswitch.common import config +from quantum.plugins.openvswitch.common import config # noqa from quantum.plugins.openvswitch.common import constants from quantum.plugins.openvswitch import ovs_db_v2 from quantum import policy diff --git a/quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py b/quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py index 67771d738..ac026d0f4 100644 --- a/quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py +++ b/quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py @@ -21,8 +21,6 @@ This plugin will forward authenticated REST API calls to the Network Operating System by PLUMgrid called NOS """ -import sys - from oslo.config import cfg from quantum.db import api as db @@ -68,8 +66,8 @@ class QuantumPluginPLUMgridV2(db_base_plugin_v2.QuantumDbPluginV2): self.snippets = plumgrid_nos_snippets.DataNOSPLUMgrid() # TODO: (Edgar) These are placeholders for next PLUMgrid release - nos_username = cfg.CONF.PLUMgridNOS.username - nos_password = cfg.CONF.PLUMgridNOS.password + cfg.CONF.PLUMgridNOS.username + cfg.CONF.PLUMgridNOS.password self.rest_conn = rest_connection.RestConnection(nos_plumgrid, nos_port, timeout) if self.rest_conn is None: @@ -131,10 +129,6 @@ class QuantumPluginPLUMgridV2(db_base_plugin_v2.QuantumDbPluginV2): self._network_admin_state(network) tenant_id = self._get_tenant_id_for_create(context, network["network"]) - # Get initial network details - original_net = super(QuantumPluginPLUMgridV2, self).get_network( - context, net_id) - with context.session.begin(subtransactions=True): # Plugin DB - Network Update new_network = super( @@ -169,8 +163,8 @@ class QuantumPluginPLUMgridV2(db_base_plugin_v2.QuantumDbPluginV2): with context.session.begin(subtransactions=True): # Plugin DB - Network Delete - net_deleted = super(QuantumPluginPLUMgridV2, - self).delete_network(context, net_id) + super(QuantumPluginPLUMgridV2, self).delete_network(context, + net_id) try: nos_url = self.snippets.BASE_NOS_URL + net_id diff --git a/quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py b/quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py index 9916958ff..f38b55df4 100644 --- a/quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py +++ b/quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py @@ -82,7 +82,7 @@ class RestConnection(object): raise plum_excep.PLUMgridException(err_message) ret = (resp.status, resp.reason, resp_str) - except urllib2.HTTPError, e: + except urllib2.HTTPError: LOG.error(_('PLUMgrid_NOS_Server: %(action)s failure, %(e)r')) ret = 0, None, None, None conn.close() diff --git a/quantum/plugins/ryu/agent/ryu_quantum_agent.py b/quantum/plugins/ryu/agent/ryu_quantum_agent.py index ff292e8e9..14243fa16 100755 --- a/quantum/plugins/ryu/agent/ryu_quantum_agent.py +++ b/quantum/plugins/ryu/agent/ryu_quantum_agent.py @@ -43,7 +43,7 @@ from quantum import context as q_context from quantum.extensions import securitygroup as ext_sg from quantum.openstack.common import log from quantum.openstack.common.rpc import dispatcher -from quantum.plugins.ryu.common import config +from quantum.plugins.ryu.common import config # noqa LOG = log.getLogger(__name__) diff --git a/quantum/plugins/ryu/db/api_v2.py b/quantum/plugins/ryu/db/api_v2.py index 8d172504a..fd6f0ce73 100644 --- a/quantum/plugins/ryu/db/api_v2.py +++ b/quantum/plugins/ryu/db/api_v2.py @@ -53,7 +53,7 @@ def get_port_from_device(port_id): plugin = manager.QuantumManager.get_plugin() port_dict = plugin._make_port_dict(port) port_dict[ext_sg.SECURITYGROUPS] = [ - sg_id for port, sg_id in port_and_sgs if sg_id] + sg_id for port_, sg_id in port_and_sgs if sg_id] port_dict['security_group_rules'] = [] port_dict['security_group_source_groups'] = [] port_dict['fixed_ips'] = [ip['ip_address'] for ip in port['fixed_ips']] diff --git a/quantum/plugins/ryu/ryu_quantum_plugin.py b/quantum/plugins/ryu/ryu_quantum_plugin.py index 2bedf3eb3..34ab0b9d9 100644 --- a/quantum/plugins/ryu/ryu_quantum_plugin.py +++ b/quantum/plugins/ryu/ryu_quantum_plugin.py @@ -32,11 +32,10 @@ from quantum.db import extraroute_db from quantum.db import l3_rpc_base from quantum.db import models_v2 from quantum.db import securitygroups_rpc_base as sg_db_rpc -from quantum.extensions import securitygroup as ext_sg from quantum.openstack.common import log as logging from quantum.openstack.common import rpc from quantum.openstack.common.rpc import proxy -from quantum.plugins.ryu.common import config +from quantum.plugins.ryu.common import config # noqa from quantum.plugins.ryu.db import api_v2 as db_api_v2 diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/namespace_driver.py b/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/namespace_driver.py index ac89505a4..1b3b14590 100644 --- a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/namespace_driver.py +++ b/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/namespace_driver.py @@ -77,7 +77,6 @@ class HaproxyNSDriver(object): namespace = get_ns_name(pool_id) ns = ip_lib.IPWrapper(self.root_helper, namespace) pid_path = self._get_state_file_path(pool_id, 'pid') - sock_path = self._get_state_file_path(pool_id, 'sock') # kill the process kill_pids_in_file(self.root_helper, pid_path) diff --git a/quantum/scheduler/l3_agent_scheduler.py b/quantum/scheduler/l3_agent_scheduler.py index 49a8e0f04..73f5d224e 100644 --- a/quantum/scheduler/l3_agent_scheduler.py +++ b/quantum/scheduler/l3_agent_scheduler.py @@ -86,7 +86,7 @@ class ChanceScheduler(object): # check if the configuration of l3 agent is compatible # with the router - router_ids = [router_id[0] for router_id in router_ids] + router_ids = [router_id_[0] for router_id_ in router_ids] routers = plugin.get_routers(context, filters={'id': router_ids}) to_removed_ids = [] for router in routers: diff --git a/quantum/tests/unit/_test_rootwrap_exec.py b/quantum/tests/unit/_test_rootwrap_exec.py index 740afa0f9..165bb1f5e 100644 --- a/quantum/tests/unit/_test_rootwrap_exec.py +++ b/quantum/tests/unit/_test_rootwrap_exec.py @@ -76,7 +76,7 @@ to the aid of their party.\"\n") self.assertEqual(result, "0 arg Now is the time for all good men to \ come to the aid of their party.") - except Exception, ex: + except Exception: LOG.exception("Losing in rootwrap test") def tearDown(self): diff --git a/quantum/tests/unit/bigswitch/test_restproxy_plugin.py b/quantum/tests/unit/bigswitch/test_restproxy_plugin.py index 25c8aa990..006a98378 100644 --- a/quantum/tests/unit/bigswitch/test_restproxy_plugin.py +++ b/quantum/tests/unit/bigswitch/test_restproxy_plugin.py @@ -68,7 +68,7 @@ class BigSwitchProxyPluginV2TestCase(test_plugin.QuantumDbPluginV2TestCase): self.httpPatch = patch('httplib.HTTPConnection', create=True, new=HTTPConnectionMock) self.addCleanup(self.httpPatch.stop) - MockHTTPConnection = self.httpPatch.start() + self.httpPatch.start() super(BigSwitchProxyPluginV2TestCase, self).setUp(self._plugin_name) diff --git a/quantum/tests/unit/bigswitch/test_router_db.py b/quantum/tests/unit/bigswitch/test_router_db.py index 752bedc30..7a050e4ad 100644 --- a/quantum/tests/unit/bigswitch/test_router_db.py +++ b/quantum/tests/unit/bigswitch/test_router_db.py @@ -156,7 +156,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBTestCase): with self.subnet(cidr='10.0.10.0/24') as public_sub: self._set_net_external(public_sub['subnet']['network_id']) with self.port() as private_port: - with self.router() as r: + with self.router(): res = self._create_floatingip( 'json', public_sub['subnet']['network_id'], @@ -226,7 +226,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBTestCase): def test_router_remove_interface_wrong_port_returns_404(self): with self.router() as r: - with self.subnet(cidr='10.0.10.0/24') as s: + with self.subnet(cidr='10.0.10.0/24'): with self.port(no_delete=True) as p: self._router_interface_action('add', r['router']['id'], diff --git a/quantum/tests/unit/cisco/test_network_plugin.py b/quantum/tests/unit/cisco/test_network_plugin.py index 78954e45d..2491ea7bc 100644 --- a/quantum/tests/unit/cisco/test_network_plugin.py +++ b/quantum/tests/unit/cisco/test_network_plugin.py @@ -17,11 +17,9 @@ import logging import mock from quantum import context -from quantum.db import api as db from quantum.manager import QuantumManager 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.cisco.db import network_db_v2 # noqa from quantum.tests.unit import test_db_plugin 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 67c6d6d28..9299c8776 100644 --- a/quantum/tests/unit/cisco/test_nexus_plugin.py +++ b/quantum/tests/unit/cisco/test_nexus_plugin.py @@ -18,7 +18,6 @@ import mock 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.db import network_models_v2 from quantum.plugins.cisco.nexus import cisco_nexus_plugin_v2 from quantum.tests import base diff --git a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py index 3ce24362d..08e251259 100644 --- a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py +++ b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py @@ -15,35 +15,23 @@ import contextlib import logging -import mock import os import testtools -from oslo.config import cfg import webob.exc from quantum import context from quantum.api.extensions import ExtensionMiddleware from quantum.api.extensions import PluginAwareExtensionManager -from quantum.api.v2 import attributes -from quantum.api.v2.router import APIRouter from quantum.common import config -from quantum.common import exceptions as q_exc -from quantum.common.test_lib import test_config -from quantum.db import api as db from quantum.db.loadbalancer import loadbalancer_db as ldb import quantum.extensions from quantum.extensions import loadbalancer -from quantum.manager import QuantumManager from quantum.plugins.common import constants from quantum.plugins.services.agent_loadbalancer import ( plugin as loadbalancer_plugin ) from quantum.tests.unit import test_db_plugin -from quantum.tests.unit import test_extensions -from quantum.tests.unit import testlib_api -from quantum.tests.unit.testlib_api import create_request -from quantum import wsgi LOG = logging.getLogger(__name__) @@ -306,7 +294,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): """ Test loadbalancer db plugin via extension and directly """ with self.subnet() as subnet: with self.pool(name="pool1") as pool: - with self.vip(name='vip1', subnet=subnet, pool=pool) as vip: + with self.vip(name='vip1', subnet=subnet, pool=pool): vip_data = { 'name': 'vip1', 'pool_id': pool['pool']['id'], @@ -468,7 +456,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): self.assertEqual(res['vip'][k], v) def test_delete_vip(self): - with self.pool() as pool: + with self.pool(): with self.vip(no_delete=True) as vip: req = self.new_delete_request('vips', vip['vip']['id']) @@ -600,7 +588,7 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase): def test_delete_pool(self): with self.pool(no_delete=True) as pool: with self.member(no_delete=True, - pool_id=pool['pool']['id']) as member: + pool_id=pool['pool']['id']): req = self.new_delete_request('pools', pool['pool']['id']) res = req.get_response(self.ext_api) diff --git a/quantum/tests/unit/hyperv/test_hyperv_quantum_agent.py b/quantum/tests/unit/hyperv/test_hyperv_quantum_agent.py index 5b89a27d2..0b0241382 100644 --- a/quantum/tests/unit/hyperv/test_hyperv_quantum_agent.py +++ b/quantum/tests/unit/hyperv/test_hyperv_quantum_agent.py @@ -20,8 +20,6 @@ Unit tests for Windows Hyper-V virtual switch quantum driver """ -import sys - import mock from oslo.config import cfg diff --git a/quantum/tests/unit/linuxbridge/test_defaults.py b/quantum/tests/unit/linuxbridge/test_defaults.py index 9e32f5e10..d58bfbceb 100644 --- a/quantum/tests/unit/linuxbridge/test_defaults.py +++ b/quantum/tests/unit/linuxbridge/test_defaults.py @@ -15,8 +15,7 @@ from oslo.config import cfg -#NOTE this import loads tests required options -from quantum.plugins.linuxbridge.common import config +from quantum.plugins.linuxbridge.common import config # noqa from quantum.tests import base diff --git a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py index 489efcd74..2ca1d1339 100644 --- a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py +++ b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py @@ -46,14 +46,14 @@ class TestLinuxBridge(base.BaseTestCase): def test_ensure_physical_in_bridge_flat(self): with mock.patch.object(self.linux_bridge, 'ensure_flat_bridge') as flat_bridge_func: - result = self.linux_bridge.ensure_physical_in_bridge( + self.linux_bridge.ensure_physical_in_bridge( 'network_id', 'physnet1', lconst.FLAT_VLAN_ID) self.assertTrue(flat_bridge_func.called) def test_ensure_physical_in_bridge_vlan(self): with mock.patch.object(self.linux_bridge, 'ensure_vlan_bridge') as vlan_bridge_func: - result = self.linux_bridge.ensure_physical_in_bridge( + self.linux_bridge.ensure_physical_in_bridge( 'network_id', 'physnet1', 7) self.assertTrue(vlan_bridge_func.called) diff --git a/quantum/tests/unit/metaplugin/test_metaplugin.py b/quantum/tests/unit/metaplugin/test_metaplugin.py index 16926c742..e1d5cf540 100644 --- a/quantum/tests/unit/metaplugin/test_metaplugin.py +++ b/quantum/tests/unit/metaplugin/test_metaplugin.py @@ -25,7 +25,6 @@ import testtools 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.openstack.common import uuidutils from quantum.plugins.metaplugin.meta_quantum_plugin import FlavorNotFound @@ -84,7 +83,6 @@ class MetaQuantumPluginV2Test(base.BaseTestCase): self.mox = mox.Mox() self.stubs = stubout.StubOutForTesting() - args = ['--config-file', etcdir('quantum.conf.test')] self.client_cls_p = mock.patch('quantumclient.v2_0.client.Client') client_cls = self.client_cls_p.start() self.client_inst = mock.Mock() diff --git a/quantum/tests/unit/midonet/test_midonet_plugin.py b/quantum/tests/unit/midonet/test_midonet_plugin.py index 3b26f2030..fad116e33 100644 --- a/quantum/tests/unit/midonet/test_midonet_plugin.py +++ b/quantum/tests/unit/midonet/test_midonet_plugin.py @@ -24,10 +24,7 @@ import sys import uuid import mock -from webob import exc as w_exc -import quantum.common.test_lib as test_lib -import quantum.tests.unit.midonet as midonet import quantum.tests.unit.test_db_plugin as test_plugin @@ -116,7 +113,7 @@ class TestMidonetNetworksV2(test_plugin.TestNetworksV2, super(TestMidonetNetworksV2, self).test_update_network() def test_list_networks(self): - bridge = self._setup_bridge_mock() + self._setup_bridge_mock() with self.network(name='net1') as net1: req = self.new_list_request('networks') res = self.deserialize('json', req.get_response(self.api)) @@ -195,12 +192,6 @@ class TestMidonetNetworksV2(test_plugin.TestNetworksV2, def test_list_networks_with_pagination_reverse_emulated(self): pass - def test_list_networks_with_parameters(self): - pass - - def test_list_networks_with_parameters_invalid_values(self): - pass - def test_list_networks_with_sort_emulated(self): pass @@ -221,9 +212,6 @@ class TestMidonetSubnetsV2(test_plugin.TestSubnetsV2, def test_create_two_subnets_same_cidr_returns_400(self): pass - def test_create_two_subnets_same_cidr_returns_400(self): - pass - def test_create_subnet_bad_V4_cidr(self): self._setup_subnet_mocks() super(TestMidonetSubnetsV2, self).test_create_subnet_bad_V4_cidr() diff --git a/quantum/tests/unit/nec/test_db.py b/quantum/tests/unit/nec/test_db.py index 1d8a43908..296caffe5 100644 --- a/quantum/tests/unit/nec/test_db.py +++ b/quantum/tests/unit/nec/test_db.py @@ -21,7 +21,7 @@ from quantum.db import api as db_api from quantum.openstack.common import uuidutils from quantum.plugins.nec.common import exceptions as nexc from quantum.plugins.nec.db import api as ndb -from quantum.plugins.nec.db import models as nmodels +from quantum.plugins.nec.db import models as nmodels # noqa from quantum.tests import base diff --git a/quantum/tests/unit/nec/test_ofc_manager.py b/quantum/tests/unit/nec/test_ofc_manager.py index 899be61ce..78c082d21 100644 --- a/quantum/tests/unit/nec/test_ofc_manager.py +++ b/quantum/tests/unit/nec/test_ofc_manager.py @@ -19,7 +19,7 @@ from quantum import context from quantum.openstack.common import uuidutils from quantum.plugins.nec.common import config from quantum.plugins.nec.db import api as ndb -from quantum.plugins.nec.db import models as nmodels +from quantum.plugins.nec.db import models as nmodels # noqa from quantum.plugins.nec import ofc_manager from quantum.tests import base diff --git a/quantum/tests/unit/nec/test_security_group.py b/quantum/tests/unit/nec/test_security_group.py index e1c98a409..59985efe7 100644 --- a/quantum/tests/unit/nec/test_security_group.py +++ b/quantum/tests/unit/nec/test_security_group.py @@ -22,7 +22,7 @@ import mock from quantum.api.v2 import attributes from quantum.extensions import securitygroup as ext_sg from quantum import manager -from quantum.plugins.nec.db import api as ndb +from quantum.plugins.nec.db import api as ndb # noqa from quantum.tests.unit import test_extension_security_group as test_sg from quantum.tests.unit import test_security_groups_rpc as test_sg_rpc diff --git a/quantum/tests/unit/nec/test_trema_driver.py b/quantum/tests/unit/nec/test_trema_driver.py index dd369196b..68420cb33 100644 --- a/quantum/tests/unit/nec/test_trema_driver.py +++ b/quantum/tests/unit/nec/test_trema_driver.py @@ -275,7 +275,7 @@ class TremaIdConvertTest(base.BaseTestCase): t_id = 'dummy' ofc_t_id, ofc_n_id = generate_random_ids(2) ofc_n_id = '/networks/%s' % ofc_n_id - ret = self.driver.convert_ofc_network_id(self.ctx, ofc_n_id, t_id) + self.driver.convert_ofc_network_id(self.ctx, ofc_n_id, t_id) def test_convert_filter_id(self): ofc_f_id = generate_random_ids(1) diff --git a/quantum/tests/unit/nicira/test_defaults.py b/quantum/tests/unit/nicira/test_defaults.py index 0fee41b73..10b27e803 100644 --- a/quantum/tests/unit/nicira/test_defaults.py +++ b/quantum/tests/unit/nicira/test_defaults.py @@ -15,7 +15,7 @@ from oslo.config import cfg -from quantum.plugins.nicira.nicira_nvp_plugin.common import config +from quantum.plugins.nicira.nicira_nvp_plugin.common import config # noqa from quantum.tests import base diff --git a/quantum/tests/unit/nicira/test_networkgw.py b/quantum/tests/unit/nicira/test_networkgw.py index 7f7c8f787..b3b68e074 100644 --- a/quantum/tests/unit/nicira/test_networkgw.py +++ b/quantum/tests/unit/nicira/test_networkgw.py @@ -17,7 +17,6 @@ import contextlib import mock from oslo.config import cfg -import testtools from webob import exc import webtest diff --git a/quantum/tests/unit/nicira/test_nicira_plugin.py b/quantum/tests/unit/nicira/test_nicira_plugin.py index 861748adc..3e8a50c8a 100644 --- a/quantum/tests/unit/nicira/test_nicira_plugin.py +++ b/quantum/tests/unit/nicira/test_nicira_plugin.py @@ -222,8 +222,8 @@ class TestNiciraNetworksV2(test_plugin.TestNetworksV2, self.assertEqual(net_del_res.status_int, 204) def test_list_networks_with_shared(self): - with self.network(name='net1') as net1: - with self.network(name='net2', shared=True) as net2: + with self.network(name='net1'): + with self.network(name='net2', shared=True): req = self.new_list_request('networks') res = self.deserialize('json', req.get_response(self.api)) self.assertEqual(len(res['networks']), 2) @@ -478,10 +478,10 @@ class TestNiciraL3NatTestCase(test_l3_plugin.L3NatDBTestCase, self._nvp_metadata_setup() with self.router() as r: with self.subnet() as s: - body = self._router_interface_action('add', - r['router']['id'], - s['subnet']['id'], - None) + self._router_interface_action('add', + r['router']['id'], + s['subnet']['id'], + None) r_ports = self._list('ports')['ports'] self.assertEqual(len(r_ports), 2) ips = [] @@ -491,10 +491,10 @@ class TestNiciraL3NatTestCase(test_l3_plugin.L3NatDBTestCase, meta_cidr = netaddr.IPNetwork('169.254.0.0/16') self.assertTrue(any([ip in meta_cidr for ip in ips])) # Needed to avoid 409 - body = self._router_interface_action('remove', - r['router']['id'], - s['subnet']['id'], - None) + self._router_interface_action('remove', + r['router']['id'], + s['subnet']['id'], + None) self._nvp_metadata_teardown() def test_metadatata_network_removed_with_router_interface_remove(self): @@ -531,7 +531,7 @@ class TestNiciraL3NatTestCase(test_l3_plugin.L3NatDBTestCase, subnets = self._list('subnets')['subnets'] with self.subnet() as s: with self.port(subnet=s, device_id='1234', - device_owner='network:dhcp') as p: + device_owner='network:dhcp'): subnets = self._list('subnets')['subnets'] self.assertEqual(len(subnets), 1) self.assertEquals(subnets[0]['host_routes'][0]['nexthop'], diff --git a/quantum/tests/unit/openvswitch/test_ovs_defaults.py b/quantum/tests/unit/openvswitch/test_ovs_defaults.py index df6efa8d3..27d996cf5 100644 --- a/quantum/tests/unit/openvswitch/test_ovs_defaults.py +++ b/quantum/tests/unit/openvswitch/test_ovs_defaults.py @@ -15,8 +15,7 @@ from oslo.config import cfg -#NOTE this import loads tests required options -from quantum.plugins.openvswitch.common import config +from quantum.plugins.openvswitch.common import config # noqa from quantum.tests import base diff --git a/quantum/tests/unit/openvswitch/test_ovs_lib.py b/quantum/tests/unit/openvswitch/test_ovs_lib.py index 790c756cf..9b8ebdd94 100644 --- a/quantum/tests/unit/openvswitch/test_ovs_lib.py +++ b/quantum/tests/unit/openvswitch/test_ovs_lib.py @@ -58,7 +58,7 @@ class OVS_Lib_Test(base.BaseTestCase): self.assertEqual(port.switch.br_name, self.BR_NAME) # test __str__ - foo = str(port) + str(port) self.mox.VerifyAll() @@ -302,9 +302,8 @@ class OVS_Lib_Test(base.BaseTestCase): self.assertEqual(ovs_lib.get_bridge_for_iface(root_helper, iface), br) self.mox.VerifyAll() - def test_iface_to_br(self): + def test_iface_to_br_handles_ovs_vsctl_exception(self): iface = 'tap0' - br = 'br-int' root_helper = 'sudo' utils.execute(["ovs-vsctl", self.TO, "iface-to-br", iface], root_helper=root_helper).AndRaise(Exception) @@ -327,7 +326,6 @@ class OVS_Lib_Test(base.BaseTestCase): 'ca:fe:de:ad:be:ef', 'br') port2 = ovs_lib.VifPort('tap5678', 2, uuidutils.generate_uuid(), 'ca:ee:de:ad:be:ef', 'br') - ports = [port1, port2] self.mox.StubOutWithMock(self.br, 'get_vif_ports') self.br.get_vif_ports().AndReturn([port1, port2]) self.mox.StubOutWithMock(self.br, 'delete_port') diff --git a/quantum/tests/unit/openvswitch/test_ovs_tunnel.py b/quantum/tests/unit/openvswitch/test_ovs_tunnel.py index aaf918f05..e547b24e0 100644 --- a/quantum/tests/unit/openvswitch/test_ovs_tunnel.py +++ b/quantum/tests/unit/openvswitch/test_ovs_tunnel.py @@ -22,7 +22,6 @@ from oslo.config import cfg from quantum.agent.linux import ip_lib from quantum.agent.linux import ovs_lib from quantum.agent.linux import utils -from quantum.agent import rpc from quantum.openstack.common import log from quantum.plugins.openvswitch.agent import ovs_quantum_agent from quantum.plugins.openvswitch.common import constants @@ -129,10 +128,10 @@ class TunnelTest(base.BaseTestCase): def testConstruct(self): self.mox.ReplayAll() - b = ovs_quantum_agent.OVSQuantumAgent(self.INT_BRIDGE, - self.TUN_BRIDGE, - '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, True) + ovs_quantum_agent.OVSQuantumAgent(self.INT_BRIDGE, + self.TUN_BRIDGE, + '10.0.0.1', self.NET_MAPPING, + 'sudo', 2, True) self.mox.VerifyAll() def testProvisionLocalVlan(self): diff --git a/quantum/tests/unit/ryu/test_defaults.py b/quantum/tests/unit/ryu/test_defaults.py index 8356d07d0..095b25131 100644 --- a/quantum/tests/unit/ryu/test_defaults.py +++ b/quantum/tests/unit/ryu/test_defaults.py @@ -17,8 +17,7 @@ from oslo.config import cfg -#NOTE this import loads tests required options -from quantum.plugins.ryu.common import config +from quantum.plugins.ryu.common import config # noqa from quantum.tests import base diff --git a/quantum/tests/unit/ryu/test_ryu_db.py b/quantum/tests/unit/ryu/test_ryu_db.py index 099e4c690..481265a72 100644 --- a/quantum/tests/unit/ryu/test_ryu_db.py +++ b/quantum/tests/unit/ryu/test_ryu_db.py @@ -18,14 +18,10 @@ from contextlib import nested import operator -from oslo.config import cfg - from quantum.db import api as db -# NOTE: this import is needed for correct plugin code work -from quantum.plugins.ryu.common import config +from quantum.plugins.ryu.common import config # noqa from quantum.plugins.ryu.db import api_v2 as db_api_v2 -# NOTE: this import is needed for correct plugin code work -from quantum.plugins.ryu.db import models_v2 as ryu_models_v2 +from quantum.plugins.ryu.db import models_v2 as ryu_models_v2 # noqa from quantum.tests.unit import test_db_plugin as test_plugin diff --git a/quantum/tests/unit/ryu/test_ryu_plugin.py b/quantum/tests/unit/ryu/test_ryu_plugin.py index e01568009..f93f0966e 100644 --- a/quantum/tests/unit/ryu/test_ryu_plugin.py +++ b/quantum/tests/unit/ryu/test_ryu_plugin.py @@ -13,10 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock - -# NOTE: this import is needed for correct plugin code work -from quantum.plugins.ryu.db import models_v2 as ryu_models_v2 +from quantum.plugins.ryu.db import models_v2 as ryu_models_v2 # noqa from quantum.tests.unit.ryu import fake_ryu from quantum.tests.unit import test_db_plugin as test_plugin diff --git a/quantum/tests/unit/ryu/test_ryu_security_group.py b/quantum/tests/unit/ryu/test_ryu_security_group.py index 622c9ceeb..8bfbdf67c 100644 --- a/quantum/tests/unit/ryu/test_ryu_security_group.py +++ b/quantum/tests/unit/ryu/test_ryu_security_group.py @@ -22,7 +22,6 @@ import mock from quantum.api.v2 import attributes from quantum.extensions import securitygroup as ext_sg from quantum import manager -from quantum.plugins.ryu.db import api_v2 as api_db_v2 from quantum.tests.unit.ryu import fake_ryu from quantum.tests.unit import test_extension_security_group as test_sg from quantum.tests.unit import test_security_groups_rpc as test_sg_rpc diff --git a/quantum/tests/unit/services/agent_loadbalancer/agent/test_init.py b/quantum/tests/unit/services/agent_loadbalancer/agent/test_init.py index 52342604c..e09f0278f 100644 --- a/quantum/tests/unit/services/agent_loadbalancer/agent/test_init.py +++ b/quantum/tests/unit/services/agent_loadbalancer/agent/test_init.py @@ -19,7 +19,6 @@ import contextlib import mock from oslo.config import cfg -import testtools from quantum.plugins.services.agent_loadbalancer import agent from quantum.tests import base diff --git a/quantum/tests/unit/services/agent_loadbalancer/test_plugin.py b/quantum/tests/unit/services/agent_loadbalancer/test_plugin.py index 56bfbfd8c..1c583562c 100644 --- a/quantum/tests/unit/services/agent_loadbalancer/test_plugin.py +++ b/quantum/tests/unit/services/agent_loadbalancer/test_plugin.py @@ -135,7 +135,7 @@ class TestLoadBalancerCallbacks(TestLoadBalancerPluginBase): def test_get_logical_device_inactive(self): with self.pool() as pool: with self.vip(pool=pool) as vip: - with self.member(pool_id=vip['vip']['pool_id']) as member: + with self.member(pool_id=vip['vip']['pool_id']): self.assertRaises( Exception, self.callbacks.get_logical_device, @@ -187,7 +187,7 @@ class TestLoadBalancerCallbacks(TestLoadBalancerPluginBase): with self.pool() as pool: with self.vip(pool=pool) as vip: - with self.member(pool_id=vip['vip']['pool_id']) as member: + with self.member(pool_id=vip['vip']['pool_id']): ctx = context.get_admin_context() func(ctx, port_id=vip['vip']['port_id'], **kwargs) diff --git a/quantum/tests/unit/test_agent_ovs_cleanup.py b/quantum/tests/unit/test_agent_ovs_cleanup.py index c13cc371f..98a94eae4 100644 --- a/quantum/tests/unit/test_agent_ovs_cleanup.py +++ b/quantum/tests/unit/test_agent_ovs_cleanup.py @@ -83,8 +83,6 @@ class TestOVSCleanup(base.BaseTestCase): def test_delete_quantum_ports(self): ports = ['tap1234', 'tap5678', 'tap09ab'] port_found = [True, False, True] - delete_ports = [p for p, found - in itertools.izip(ports, port_found) if found] with contextlib.nested( mock.patch.object(ip_lib, 'device_exists', side_effect=port_found), diff --git a/quantum/tests/unit/test_agent_rpc.py b/quantum/tests/unit/test_agent_rpc.py index ca5b714e5..fb2924fee 100644 --- a/quantum/tests/unit/test_agent_rpc.py +++ b/quantum/tests/unit/test_agent_rpc.py @@ -16,7 +16,6 @@ # under the License. import mock -from oslo.config import cfg from quantum.agent import rpc from quantum.openstack.common import context @@ -77,5 +76,5 @@ class AgentRPCMethods(base.BaseTestCase): call_to_patch = 'quantum.openstack.common.rpc.create_connection' with mock.patch(call_to_patch) as create_connection: - conn = rpc.create_consumers(dispatcher, 'foo', [('topic', 'op')]) + rpc.create_consumers(dispatcher, 'foo', [('topic', 'op')]) create_connection.assert_has_calls(expected) diff --git a/quantum/tests/unit/test_api_v2.py b/quantum/tests/unit/test_api_v2.py index eb4725162..99fa378a2 100644 --- a/quantum/tests/unit/test_api_v2.py +++ b/quantum/tests/unit/test_api_v2.py @@ -20,7 +20,6 @@ import urlparse import mock from oslo.config import cfg -from testtools import matchers import webob from webob import exc import webtest @@ -31,7 +30,6 @@ from quantum.api.v2 import attributes from quantum.api.v2 import base as v2_base from quantum.api.v2 import router from quantum.common import config -from quantum.common import constants from quantum.common import exceptions as q_exc from quantum import context from quantum.manager import QuantumManager @@ -39,7 +37,6 @@ from quantum.openstack.common.notifier import api as notifer_api from quantum.openstack.common import uuidutils from quantum.tests import base from quantum.tests.unit import testlib_api -from quantum import wsgi ROOTDIR = os.path.dirname(os.path.dirname(__file__)) diff --git a/quantum/tests/unit/test_config.py b/quantum/tests/unit/test_config.py index d4e84bf4f..3c1694875 100644 --- a/quantum/tests/unit/test_config.py +++ b/quantum/tests/unit/test_config.py @@ -17,7 +17,7 @@ import os from oslo.config import cfg -from quantum.common import config +from quantum.common import config # noqa from quantum.tests import base diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py index edf85d3c2..6d18227dc 100644 --- a/quantum/tests/unit/test_db_plugin.py +++ b/quantum/tests/unit/test_db_plugin.py @@ -23,7 +23,6 @@ import random import mock from oslo.config import cfg -import sqlalchemy as sa import testtools from testtools import matchers import webob.exc @@ -355,7 +354,6 @@ class QuantumDbPluginV2TestCase(testlib_api.WebTestCase): def _create_port(self, fmt, net_id, expected_res_status=None, arg_list=None, **kwargs): - content_type = 'application/' + fmt data = {'port': {'network_id': net_id, 'tenant_id': self._tenant_id}} @@ -1058,12 +1056,10 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s self.assertEqual(port['port']['id'], sport['port']['id']) def test_delete_port(self): - port_id = None with self.port() as port: - port_id = port['port']['id'] - req = self.new_show_request('port', self.fmt, port['port']['id']) - res = req.get_response(self.api) - self.assertEqual(res.status_int, 404) + req = self.new_show_request('port', self.fmt, port['port']['id']) + res = req.get_response(self.api) + self.assertEqual(res.status_int, 404) def test_delete_port_public_network(self): with self.network(shared=True) as network: @@ -1074,7 +1070,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s set_context=True) port = self.deserialize(self.fmt, port_res) - port_id = port['port']['id'] # delete the port self._delete('ports', port['port']['id']) # Todo: verify!!! @@ -1241,23 +1236,18 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s kwargs = {"mac_address": mac} net_id = port['port']['network_id'] res = self._create_port(self.fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_mac_generation(self): cfg.CONF.set_override('base_mac', "12:34:56:00:00:00") with self.port() as port: mac = port['port']['mac_address'] - # check that MAC address matches base MAC - base_mac = cfg.CONF.base_mac self.assertTrue(mac.startswith("12:34:56")) def test_mac_generation_4octet(self): cfg.CONF.set_override('base_mac', "12:34:56:78:00:00") with self.port() as port: mac = port['port']['mac_address'] - # check that MAC address matches base MAC - base_mac = cfg.CONF.base_mac self.assertTrue(mac.startswith("12:34:56:78")) def test_bad_mac_format(self): @@ -1296,7 +1286,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s 'ip_address': ips[0]['ip_address']}]} net_id = port['port']['network_id'] res = self._create_port(self.fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 409) def test_requested_subnet_delete(self): @@ -1492,7 +1481,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s 'ip_address': '1011.0.0.5'}]} net_id = subnet['subnet']['network_id'] res = self._create_port(self.fmt, net_id=net_id, **kwargs) - port = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_requested_split(self): @@ -1539,7 +1527,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s 'ip_address': '10.0.0.5'}]} net_id = subnet['subnet']['network_id'] res = self._create_port(self.fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_fixed_ip_invalid_subnet_id(self): @@ -1549,7 +1536,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s 'ip_address': '10.0.0.5'}]} net_id = subnet['subnet']['network_id'] res = self._create_port(self.fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_fixed_ip_invalid_ip(self): @@ -1559,7 +1545,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s 'ip_address': '10.0.0.55555'}]} net_id = subnet['subnet']['network_id'] res = self._create_port(self.fmt, net_id=net_id, **kwargs) - port2 = self.deserialize(self.fmt, res) self.assertEqual(res.status_int, 400) def test_requested_ips_only(self): @@ -1676,7 +1661,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s matchers.GreaterThan(datetime.timedelta(seconds=10))) def test_port_delete_holds_ip(self): - plugin = QuantumManager.get_plugin() base_class = db_base_plugin_v2.QuantumDbPluginV2 with mock.patch.object(base_class, '_hold_ip') as hold_ip: with self.subnet() as subnet: @@ -1822,8 +1806,6 @@ class TestNetworksV2(QuantumDbPluginV2TestCase): def test_create_public_network_no_admin_tenant(self): name = 'public_net' - keys = [('subnets', []), ('name', name), ('admin_state_up', True), - ('status', 'ACTIVE'), ('shared', True)] with testtools.ExpectedException( webob.exc.HTTPClientError) as ctx_manager: with self.network(name=name, @@ -2489,7 +2471,6 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): res = self._create_network(fmt=self.fmt, name='net', admin_state_up=True) network = self.deserialize(self.fmt, res) - network_id = network['network']['id'] subnet = self._make_subnet(self.fmt, network, gateway_ip, cidr, ip_version=4) self._create_port(self.fmt, @@ -2501,7 +2482,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): def test_delete_subnet_port_exists_owned_by_other(self): with self.subnet() as subnet: - with self.port(subnet=subnet) as port: + with self.port(subnet=subnet): id = subnet['subnet']['id'] req = self.new_delete_request('subnets', id) res = req.get_response(self.api) @@ -2517,8 +2498,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): res = self._create_network(fmt=self.fmt, name='net', admin_state_up=True) network = self.deserialize(self.fmt, res) - subnet = self._make_subnet(self.fmt, network, gateway_ip, - cidr, ip_version=4) + self._make_subnet(self.fmt, network, gateway_ip, cidr, ip_version=4) req = self.new_delete_request('networks', network['network']['id']) res = req.get_response(self.api) self.assertEqual(res.status_int, 204) @@ -2669,8 +2649,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): expected = {'gateway_ip': gateway, 'cidr': cidr, 'allocation_pools': allocation_pools} - subnet = self._test_create_subnet(expected=expected, - gateway_ip=gateway) + self._test_create_subnet(expected=expected, gateway_ip=gateway) # Gateway is last IP in range gateway = '10.0.0.254' allocation_pools = [{'start': '10.0.0.1', @@ -2678,8 +2657,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): expected = {'gateway_ip': gateway, 'cidr': cidr, 'allocation_pools': allocation_pools} - subnet = self._test_create_subnet(expected=expected, - gateway_ip=gateway) + self._test_create_subnet(expected=expected, gateway_ip=gateway) # Gateway is first in subnet gateway = '10.0.0.1' allocation_pools = [{'start': '10.0.0.2', @@ -2687,8 +2665,8 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): expected = {'gateway_ip': gateway, 'cidr': cidr, 'allocation_pools': allocation_pools} - subnet = self._test_create_subnet(expected=expected, - gateway_ip=gateway) + self._test_create_subnet(expected=expected, + gateway_ip=gateway) def test_create_force_subnet_gw_values(self): cfg.CONF.set_override('force_gateway_on_subnet', True) @@ -2741,7 +2719,6 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): res = self._create_port(self.fmt, net_id=net_id, **kwargs) self.assertEqual(res.status_int, 201) port = self.deserialize(self.fmt, res) - port_id = port['port']['id'] # delete the port self._delete('ports', port['port']['id']) @@ -2751,7 +2728,6 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): res = self._create_port(self.fmt, net_id=net_id, **kwargs) self.assertEqual(res.status_int, 201) port = self.deserialize(self.fmt, res) - port_id = port['port']['id'] # delete the port self._delete('ports', port['port']['id']) cfg.CONF.set_override('dhcp_lease_duration', 120) diff --git a/quantum/tests/unit/test_db_rpc_base.py b/quantum/tests/unit/test_db_rpc_base.py index bb35f22d5..79ddc0fde 100644 --- a/quantum/tests/unit/test_db_rpc_base.py +++ b/quantum/tests/unit/test_db_rpc_base.py @@ -97,8 +97,8 @@ class TestDhcpRpcCallackMixin(base.BaseTestCase): expectations = [ mock.call.update_port(mock.ANY, 'port_id', dict(port=port_retval))] - retval = self._test_get_dhcp_port_helper(port_retval, expectations, - update_port=port_retval) + self._test_get_dhcp_port_helper(port_retval, expectations, + update_port=port_retval) self.assertEqual(len(self.log.mock_calls), 1) def test_get_dhcp_port_create_new(self): diff --git a/quantum/tests/unit/test_debug_commands.py b/quantum/tests/unit/test_debug_commands.py index 9eeb351a6..d6328afcb 100644 --- a/quantum/tests/unit/test_debug_commands.py +++ b/quantum/tests/unit/test_debug_commands.py @@ -333,13 +333,6 @@ class TestDebugCommands(base.BaseTestCase): with mock.patch('quantum.agent.linux.ip_lib.IpNetnsCommand') as ns: cmd.run(parsed_args) ns.assert_has_calls([mock.call.execute(mock.ANY)]) - fake_port = {'port': - {'device_owner': DEVICE_OWNER_NETWORK_PROBE, - 'admin_state_up': True, - 'network_id': 'fake_net', - 'tenant_id': 'fake_tenant', - 'fixed_ips': [{'subnet_id': 'fake_subnet'}], - 'device_id': socket.gethostname()}} expected = [mock.call.list_ports(), mock.call.list_ports( network_id='fake_net', diff --git a/quantum/tests/unit/test_dhcp_agent.py b/quantum/tests/unit/test_dhcp_agent.py index 7dd2123af..803958dd7 100644 --- a/quantum/tests/unit/test_dhcp_agent.py +++ b/quantum/tests/unit/test_dhcp_agent.py @@ -113,9 +113,7 @@ fake_down_network = FakeModel('12345678-dddd-dddd-1234567890ab', class TestDhcpAgent(base.BaseTestCase): def setUp(self): super(TestDhcpAgent, self).setUp() - cfg.CONF.register_opts(dhcp_agent.DeviceManager.OPTS) - cfg.CONF.register_opts(dhcp_agent.DhcpAgent.OPTS) - cfg.CONF.register_opts(dhcp_agent.DhcpLeaseRelay.OPTS) + dhcp_agent.register_options() cfg.CONF.set_override('interface_driver', 'quantum.agent.linux.interface.NullDriver') self.driver_cls_p = mock.patch( @@ -182,7 +180,7 @@ class TestDhcpAgent(base.BaseTestCase): mock.call().wait()]) def test_run_completes_single_pass(self): - with mock.patch('quantum.agent.dhcp_agent.DeviceManager') as dev_mgr: + with mock.patch('quantum.agent.dhcp_agent.DeviceManager'): dhcp = dhcp_agent.DhcpAgent(HOSTNAME) attrs_to_mock = dict( [(a, mock.DEFAULT) for a in @@ -195,13 +193,13 @@ class TestDhcpAgent(base.BaseTestCase): [mock.call.start()]) def test_ns_name(self): - with mock.patch('quantum.agent.dhcp_agent.DeviceManager') as dev_mgr: + with mock.patch('quantum.agent.dhcp_agent.DeviceManager'): mock_net = mock.Mock(id='foo') dhcp = dhcp_agent.DhcpAgent(HOSTNAME) self.assertEqual(dhcp._ns_name(mock_net), 'qdhcp-foo') def test_ns_name_disabled_namespace(self): - with mock.patch('quantum.agent.dhcp_agent.DeviceManager') as dev_mgr: + with mock.patch('quantum.agent.dhcp_agent.DeviceManager'): cfg.CONF.set_override('use_namespaces', False) mock_net = mock.Mock(id='foo') dhcp = dhcp_agent.DhcpAgent(HOSTNAME) @@ -986,10 +984,6 @@ class TestDeviceManager(base.BaseTestCase): fake_port = FakeModel('12345678-1234-aaaa-1234567890ab', mac_address='aa:bb:cc:dd:ee:ff') - expected_driver_calls = [mock.call(cfg.CONF), - mock.call().get_device_name(fake_network), - mock.call().unplug('tap12345678-12')] - with mock.patch('quantum.agent.linux.interface.NullDriver') as dvr_cls: mock_driver = mock.MagicMock() #mock_driver.DEV_NAME_LEN = ( @@ -1018,10 +1012,6 @@ class TestDeviceManager(base.BaseTestCase): fake_port = FakeModel('12345678-1234-aaaa-1234567890ab', mac_address='aa:bb:cc:dd:ee:ff') - expected_driver_calls = [mock.call(cfg.CONF), - mock.call().get_device_name(fake_network), - mock.call().unplug('tap12345678-12')] - with mock.patch('quantum.agent.linux.interface.NullDriver') as dvr_cls: mock_driver = mock.MagicMock() mock_driver.get_device_name.return_value = 'tap12345678-12' @@ -1046,10 +1036,6 @@ class TestDeviceManager(base.BaseTestCase): fake_port = FakeModel('12345678-1234-aaaa-1234567890ab', mac_address='aa:bb:cc:dd:ee:ff') - expected_driver_calls = [mock.call(cfg.CONF), - mock.call().get_device_name(fake_network), - mock.call().unplug('tap12345678-12')] - with mock.patch('quantum.agent.linux.interface.NullDriver') as dvr_cls: mock_driver = mock.MagicMock() mock_driver.get_device_name.return_value = 'tap12345678-12' @@ -1100,7 +1086,7 @@ class TestDhcpLeaseRelay(base.BaseTestCase): exists.return_value = False self.unlink.side_effect = OSError - relay = dhcp_agent.DhcpLeaseRelay(None) + dhcp_agent.DhcpLeaseRelay(None) self.unlink.assert_called_once_with( cfg.CONF.dhcp_lease_relay_socket) @@ -1110,7 +1096,7 @@ class TestDhcpLeaseRelay(base.BaseTestCase): with mock.patch('os.path.exists') as exists: exists.return_value = False - relay = dhcp_agent.DhcpLeaseRelay(None) + dhcp_agent.DhcpLeaseRelay(None) self.unlink.assert_called_once_with( cfg.CONF.dhcp_lease_relay_socket) @@ -1121,7 +1107,7 @@ class TestDhcpLeaseRelay(base.BaseTestCase): with mock.patch('os.path.exists') as exists: exists.return_value = True with testtools.ExpectedException(OSError): - relay = dhcp_agent.DhcpLeaseRelay(None) + dhcp_agent.DhcpLeaseRelay(None) self.unlink.assert_called_once_with( cfg.CONF.dhcp_lease_relay_socket) @@ -1175,14 +1161,6 @@ class TestDhcpLeaseRelay(base.BaseTestCase): self.assertTrue(log.called) def test_handler_other_exception(self): - network_id = 'cccccccc-cccc-cccc-cccc-cccccccccccc' - ip_address = '192.168.x.x' - lease_remaining = 120 - - json_rep = jsonutils.dumps( - dict(network_id=network_id, - lease_remaining=lease_remaining, - ip_address=ip_address)) handler = mock.Mock() mock_sock = mock.Mock() mock_sock.recv.side_effect = Exception diff --git a/quantum/tests/unit/test_extension_security_group.py b/quantum/tests/unit/test_extension_security_group.py index f3aa3e7a3..461907884 100644 --- a/quantum/tests/unit/test_extension_security_group.py +++ b/quantum/tests/unit/test_extension_security_group.py @@ -17,7 +17,6 @@ import contextlib import os import mock -from oslo.config import cfg import webob.exc from quantum.api.v2 import attributes as attr diff --git a/quantum/tests/unit/test_extensions.py b/quantum/tests/unit/test_extensions.py index 7bead49fe..55c3ec93b 100644 --- a/quantum/tests/unit/test_extensions.py +++ b/quantum/tests/unit/test_extensions.py @@ -111,8 +111,7 @@ class ResourceExtensionTest(base.BaseTestCase): # anything that is below 200 or above 400 so we can't actually check # it. It throws webtest.AppError instead. try: - response = ( - test_app.get("/tweedles/some_id/notimplemented_function")) + test_app.get("/tweedles/some_id/notimplemented_function") # Shouldn't be reached self.assertTrue(False) except webtest.AppError: diff --git a/quantum/tests/unit/test_l3_plugin.py b/quantum/tests/unit/test_l3_plugin.py index 703686b24..7a485a4e4 100644 --- a/quantum/tests/unit/test_l3_plugin.py +++ b/quantum/tests/unit/test_l3_plugin.py @@ -45,7 +45,6 @@ from quantum.openstack.common import log as logging from quantum.openstack.common.notifier import api as notifier_api from quantum.openstack.common.notifier import test_notifier from quantum.openstack.common import uuidutils -from quantum.tests import base from quantum.tests.unit import test_api_v2 from quantum.tests.unit import test_db_plugin from quantum.tests.unit import test_extensions diff --git a/quantum/tests/unit/test_linux_daemon.py b/quantum/tests/unit/test_linux_daemon.py index 57aeaac6c..d2c7be16f 100644 --- a/quantum/tests/unit/test_linux_daemon.py +++ b/quantum/tests/unit/test_linux_daemon.py @@ -17,6 +17,7 @@ # @author: Mark McClain, DreamHost import os +import sys import mock import testtools @@ -44,16 +45,16 @@ class TestPidfile(base.BaseTestCase): self.os.O_CREAT = os.O_CREAT self.os.O_RDWR = os.O_RDWR - p = daemon.Pidfile('thefile', 'python') + daemon.Pidfile('thefile', 'python') self.os.open.assert_called_once_with('thefile', os.O_CREAT | os.O_RDWR) self.fcntl.flock.assert_called_once_with(FAKE_FD, self.fcntl.LOCK_EX) def test_init_open_fail(self): self.os.open.side_effect = IOError - with mock.patch.object(daemon.sys, 'stderr') as stderr: + with mock.patch.object(daemon.sys, 'stderr'): with testtools.ExpectedException(SystemExit): - p = daemon.Pidfile('thefile', 'python') + daemon.Pidfile('thefile', 'python') sys.assert_has_calls([ mock.call.stderr.write(mock.ANY), mock.call.exit(1)] @@ -126,7 +127,7 @@ class TestDaemon(base.BaseTestCase): def test_fork_error(self): self.os.fork.side_effect = lambda: OSError(1) - with mock.patch.object(daemon.sys, 'stderr') as stderr: + with mock.patch.object(daemon.sys, 'stderr'): with testtools.ExpectedException(SystemExit): d = daemon.Daemon('pidfile', 'stdin') d._fork() @@ -174,7 +175,7 @@ class TestDaemon(base.BaseTestCase): self.pidfile.return_value.is_running.return_value = True d = daemon.Daemon('pidfile') - with mock.patch.object(daemon.sys, 'stderr') as stderr: + with mock.patch.object(daemon.sys, 'stderr'): with mock.patch.object(d, 'daemonize') as daemonize: with testtools.ExpectedException(SystemExit): d.start() diff --git a/quantum/tests/unit/test_linux_external_process.py b/quantum/tests/unit/test_linux_external_process.py index 4d9420268..d0496f29d 100644 --- a/quantum/tests/unit/test_linux_external_process.py +++ b/quantum/tests/unit/test_linux_external_process.py @@ -73,7 +73,7 @@ class TestProcessManager(base.BaseTestCase): active.__get__ = mock.Mock(return_value=True) manager = ep.ProcessManager(self.conf, 'uuid', namespace='ns') - with mock.patch.object(ep, 'ip_lib') as ip_lib: + with mock.patch.object(ep, 'ip_lib'): manager.enable(callback) self.assertFalse(callback.called) diff --git a/quantum/tests/unit/test_linux_interface.py b/quantum/tests/unit/test_linux_interface.py index a386f9324..9f7a5c90e 100644 --- a/quantum/tests/unit/test_linux_interface.py +++ b/quantum/tests/unit/test_linux_interface.py @@ -16,7 +16,6 @@ # under the License. import mock -from oslo.config import cfg from quantum.agent.common import config from quantum.agent.dhcp_agent import DeviceManager @@ -60,9 +59,6 @@ class FakePort: class TestBase(base.BaseTestCase): def setUp(self): super(TestBase, self).setUp() - root_helper_opt = [ - cfg.StrOpt('root_helper', default='sudo'), - ] self.conf = config.setup_conf() self.conf.register_opts(interface.OPTS) config.register_root_helper(self.conf) @@ -316,15 +312,6 @@ class TestBridgeInterfaceDriver(TestBase): self.conf.set_override('network_device_mtu', 9000) self._test_plug(mtu=9000) - def test_unplug(self): - self.device_exists.return_value = True - with mock.patch('quantum.agent.linux.interface.LOG.debug') as log: - br = interface.BridgeInterfaceDriver(self.conf) - br.unplug('tap0') - log.assert_called_once() - self.execute.assert_has_calls( - [mock.call(['ip', 'link', 'delete', 'tap0'], 'sudo')]) - def test_unplug_no_device(self): self.device_exists.return_value = False self.ip_dev().link.delete.side_effect = RuntimeError diff --git a/quantum/tests/unit/test_linux_ip_lib.py b/quantum/tests/unit/test_linux_ip_lib.py index 47b40631d..7ac394cd9 100644 --- a/quantum/tests/unit/test_linux_ip_lib.py +++ b/quantum/tests/unit/test_linux_ip_lib.py @@ -216,7 +216,7 @@ class TestIpWrapper(base.BaseTestCase): ip = ip_lib.IPWrapper('sudo') with mock.patch.object(ip.netns, 'exists') as ns_exists: ns_exists.return_value = False - ns = ip.ensure_namespace('ns') + ip.ensure_namespace('ns') self.execute.assert_has_calls( [mock.call([], 'netns', ('add', 'ns'), 'sudo', None)]) ip_dev.assert_has_calls([mock.call('lo', 'sudo', 'ns'), @@ -626,7 +626,7 @@ class TestIpNetnsCommand(TestIPCmdBase): self.assertEqual(ns.namespace, 'ns') def test_delete_namespace(self): - with mock.patch('quantum.agent.linux.utils.execute') as execute: + with mock.patch('quantum.agent.linux.utils.execute'): self.netns_cmd.delete('ns') self._assert_sudo([], ('delete', 'ns'), force_root_namespace=True) diff --git a/quantum/tests/unit/test_loadbalancer_plugin.py b/quantum/tests/unit/test_loadbalancer_plugin.py index 4a5376825..36e1f2d11 100644 --- a/quantum/tests/unit/test_loadbalancer_plugin.py +++ b/quantum/tests/unit/test_loadbalancer_plugin.py @@ -22,13 +22,11 @@ from webob import exc import webtest from quantum.api import extensions -from quantum.api.v2 import attributes from quantum.common import config from quantum.extensions import loadbalancer from quantum import manager from quantum.openstack.common import uuidutils from quantum.plugins.common import constants -from quantum.tests import base from quantum.tests.unit import test_api_v2 from quantum.tests.unit import test_extensions from quantum.tests.unit import testlib_api diff --git a/quantum/tests/unit/test_metadata_agent.py b/quantum/tests/unit/test_metadata_agent.py index 8a0b02d39..791871ce9 100644 --- a/quantum/tests/unit/test_metadata_agent.py +++ b/quantum/tests/unit/test_metadata_agent.py @@ -217,7 +217,7 @@ class TestMetadataProxyHandler(base.BaseTestCase): webob.exc.HTTPInternalServerError) def test_proxy_request_other_code(self): - with testtools.ExpectedException(Exception) as e: + with testtools.ExpectedException(Exception): self._proxy_request_test_helper(302) def test_sign_instance_id(self): @@ -288,7 +288,7 @@ class TestUnixDomainMetadataProxy(base.BaseTestCase): with mock.patch('os.path.isdir') as isdir: with mock.patch('os.makedirs') as makedirs: isdir.return_value = False - p = agent.UnixDomainMetadataProxy(mock.Mock()) + agent.UnixDomainMetadataProxy(mock.Mock()) isdir.assert_called_once_with('/the') makedirs.assert_called_once_with('/the', 0755) @@ -297,7 +297,7 @@ class TestUnixDomainMetadataProxy(base.BaseTestCase): with mock.patch('os.path.isdir') as isdir: with mock.patch('os.unlink') as unlink: isdir.return_value = True - p = agent.UnixDomainMetadataProxy(mock.Mock()) + agent.UnixDomainMetadataProxy(mock.Mock()) isdir.assert_called_once_with('/the') unlink.assert_called_once_with('/the/path') @@ -310,7 +310,7 @@ class TestUnixDomainMetadataProxy(base.BaseTestCase): exists.return_value = False unlink.side_effect = OSError - p = agent.UnixDomainMetadataProxy(mock.Mock()) + agent.UnixDomainMetadataProxy(mock.Mock()) isdir.assert_called_once_with('/the') unlink.assert_called_once_with('/the/path') @@ -325,7 +325,7 @@ class TestUnixDomainMetadataProxy(base.BaseTestCase): unlink.side_effect = OSError with testtools.ExpectedException(OSError): - p = agent.UnixDomainMetadataProxy(mock.Mock()) + agent.UnixDomainMetadataProxy(mock.Mock()) isdir.assert_called_once_with('/the') unlink.assert_called_once_with('/the/path') @@ -355,7 +355,7 @@ class TestUnixDomainMetadataProxy(base.BaseTestCase): with mock.patch('eventlet.monkey_patch') as eventlet: with mock.patch.object(agent, 'config') as config: with mock.patch.object(agent, 'cfg') as cfg: - with mock.patch.object(utils, 'cfg') as utils_cfg: + with mock.patch.object(utils, 'cfg'): agent.main() self.assertTrue(eventlet.called) diff --git a/quantum/tests/unit/test_metadata_namespace_proxy.py b/quantum/tests/unit/test_metadata_namespace_proxy.py index 4ad29645c..d0b9a7b5b 100644 --- a/quantum/tests/unit/test_metadata_namespace_proxy.py +++ b/quantum/tests/unit/test_metadata_namespace_proxy.py @@ -212,7 +212,7 @@ class TestNetworkMetadataProxyHandler(base.BaseTestCase): def test_proxy_request_network_exception(self): self.handler.network_id = 'network_id' - resp = mock.Mock(status=500) + mock.Mock(status=500) with mock.patch('httplib2.Http') as mock_http: mock_http.return_value.request.side_effect = Exception @@ -235,13 +235,13 @@ class TestNetworkMetadataProxyHandler(base.BaseTestCase): class TestProxyDaemon(base.BaseTestCase): def test_init(self): - with mock.patch('quantum.agent.linux.daemon.Pidfile') as pf: + with mock.patch('quantum.agent.linux.daemon.Pidfile'): pd = ns_proxy.ProxyDaemon('pidfile', 9697, 'net_id', 'router_id') self.assertEqual(pd.router_id, 'router_id') self.assertEqual(pd.network_id, 'net_id') def test_run(self): - with mock.patch('quantum.agent.linux.daemon.Pidfile') as pf: + with mock.patch('quantum.agent.linux.daemon.Pidfile'): with mock.patch('quantum.wsgi.Server') as Server: pd = ns_proxy.ProxyDaemon('pidfile', 9697, 'net_id', 'router_id') diff --git a/quantum/tests/unit/test_policy.py b/quantum/tests/unit/test_policy.py index 8498a07aa..7e7938f9c 100644 --- a/quantum/tests/unit/test_policy.py +++ b/quantum/tests/unit/test_policy.py @@ -15,9 +15,6 @@ """Test of Policy Engine For Quantum""" -import contextlib -import os -import shutil import StringIO import urllib2 diff --git a/quantum/tests/unit/test_quantum_context.py b/quantum/tests/unit/test_quantum_context.py index c2bc58564..5e1a54ade 100644 --- a/quantum/tests/unit/test_quantum_context.py +++ b/quantum/tests/unit/test_quantum_context.py @@ -56,7 +56,7 @@ class TestQuantumContext(base.BaseTestCase): self.assertIsNone(cxt_dict['user_id']) self.assertIsNone(cxt_dict['tenant_id']) try: - session = cxt.session + cxt.session except Exception: pass else: diff --git a/quantum/tests/unit/test_rootwrap.py b/quantum/tests/unit/test_rootwrap.py index 7aeb66eb0..6f23b4955 100644 --- a/quantum/tests/unit/test_rootwrap.py +++ b/quantum/tests/unit/test_rootwrap.py @@ -160,14 +160,14 @@ class RootwrapTestCase(base.BaseTestCase): f = filters.IpNetnsExecFilter('/sbin/ip', 'root') self.assertFalse(f.match(['ip', 'link', 'list'])) - def test_match_filter_recurses_exec_command_filter(self): + def test_match_filter_recurses_exec_command_filter_matches(self): filter_list = [filters.IpNetnsExecFilter('/sbin/ip', 'root'), filters.IpFilter('/sbin/ip', 'root')] args = ['ip', 'netns', 'exec', 'foo', 'ip', 'link', 'list'] self.assertIsNotNone(wrapper.match_filter(filter_list, args)) - def test_match_filter_recurses_exec_command_filter(self): + def test_match_filter_recurses_exec_command_filter_does_not_match(self): filter_list = [filters.IpNetnsExecFilter('/sbin/ip', 'root'), filters.IpFilter('/sbin/ip', 'root')] args = ['ip', 'netns', 'exec', 'foo', 'ip', 'netns', 'exec', 'bar', diff --git a/quantum/tests/unit/test_routerserviceinsertion.py b/quantum/tests/unit/test_routerserviceinsertion.py index d99930195..60491af1a 100644 --- a/quantum/tests/unit/test_routerserviceinsertion.py +++ b/quantum/tests/unit/test_routerserviceinsertion.py @@ -424,12 +424,12 @@ class RouterServiceInsertionTestCase(base.BaseTestCase): uattrs['router_id'] = self._router_id with testtools.ExpectedException( webexc.HTTPClientError) as ctx_manager: - newobj = self._do_request( + self._do_request( 'PUT', _get_path('lb/{0}s/{1}'.format(res, obj['id'])), data) self.assertEqual(ctx_manager.exception.code, 400) else: - newobj = self._do_request( + self._do_request( 'PUT', _get_path('lb/{0}s/{1}'.format(res, obj['id'])), data) updated = self._do_request( diff --git a/quantum/tests/unit/test_servicetype.py b/quantum/tests/unit/test_servicetype.py index 2e2eccc34..1e2a9ce87 100644 --- a/quantum/tests/unit/test_servicetype.py +++ b/quantum/tests/unit/test_servicetype.py @@ -26,14 +26,12 @@ import webob.exc as webexc import webtest from quantum.api import extensions -from quantum.api.v2 import attributes from quantum import context from quantum.db import api as db_api from quantum.db import servicetype_db from quantum.extensions import servicetype from quantum import manager from quantum.plugins.common import constants -from quantum.tests import base from quantum.tests.unit import dummy_plugin as dp from quantum.tests.unit import test_api_v2 from quantum.tests.unit import test_db_plugin @@ -137,9 +135,6 @@ class ServiceTypeExtensionTestCase(ServiceTypeTestCaseBase): def _test_service_type_update(self, env=None, expected_status=webexc.HTTPOk.code): svc_type_name = 'updated' - tenant_id = 'fake' - if env and 'quantum.context' in env: - tenant_id = env['quantum.context'].tenant_id data = {self.resource_name: {'name': svc_type_name}} svc_type_id = _uuid() diff --git a/run_tests.py b/run_tests.py index c93699b39..e49002126 100755 --- a/run_tests.py +++ b/run_tests.py @@ -41,7 +41,6 @@ To run a single functional test module:: python run_tests.py functional.test_stores """ -import gettext import os import sys diff --git a/tools/test-requires b/tools/test-requires index f7e962b25..a92a6d26f 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -4,13 +4,13 @@ coverage>=3.6 discover distribute>=0.6.24 fixtures>=0.3.12 +flake8 mock>=1.0b1 mox==0.5.3 nose nosehtmloutput nosexcover openstack.nose_plugin -pep8==1.3.3 python-subunit sphinx>=1.1.2 testrepository>=0.0.13 diff --git a/tox.ini b/tox.ini index 32639098f..99cd84376 100644 --- a/tox.ini +++ b/tox.ini @@ -21,13 +21,8 @@ sitepackages = True downloadcache = ~/cache/pip [testenv:pep8] -# E711/E712 comparison to False should be 'if cond is False:' or 'if not cond:' -# query = query.filter(Component.disabled == False) -# E125 continuation line does not distinguish itself from next logical line - commands = - pep8 --repeat --show-source --ignore=E125,E711,E712 --exclude=.venv,.tox,dist,doc,openstack,*egg . - pep8 --repeat --show-source --ignore=E125 --filename=quantum* bin + flake8 [testenv:i18n] commands = python ./tools/check_i18n.py ./quantum ./tools/i18n_cfg.py @@ -38,3 +33,13 @@ setenv = VIRTUAL_ENV={envdir} [testenv:venv] commands = {posargs} + +[flake8] +# E711/E712 comparison to False should be 'if cond is False:' or 'if not cond:' +# query = query.filter(Component.disabled == False) +# E125 continuation line does not distinguish itself from next logical line +# H hacking.py - automatic checks of rules in HACKING.rst +ignore = E711,E712,E125,H +show-source = true +builtins = _ +exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools