From 5b14d3b9ef3d3f844af45b0cac7406134ff5aa34 Mon Sep 17 00:00:00 2001 From: Insequent Date: Wed, 11 Jun 2014 20:27:33 +0000 Subject: [PATCH] Many additional flake8 syntax fixes More were found in the py26 env --- quark/api/auth.py | 1 - quark/api/extensions/ip_addresses.py | 3 +- quark/api/extensions/mac_address_ranges.py | 3 +- quark/api/extensions/ports_quark.py | 1 - quark/api/extensions/routes.py | 3 +- quark/db/api.py | 12 ++-- quark/db/models.py | 7 +-- quark/drivers/nvp_driver.py | 7 +-- quark/drivers/optimized_nvp_driver.py | 56 +++++++++---------- quark/gunicorn_server.py | 2 +- quark/ipam.py | 6 +- quark/plugin.py | 3 +- quark/plugin_modules/ip_addresses.py | 1 + quark/plugin_modules/mac_address_ranges.py | 1 + quark/plugin_modules/networks.py | 4 +- quark/plugin_modules/ports.py | 1 - quark/plugin_modules/subnets.py | 17 +++--- quark/plugin_views.py | 1 + quark/quota_driver.py | 1 - quark/tests/__init__.py | 14 ----- .../plugin_modules/test_ip_addresses.py | 3 +- .../plugin_modules/test_networks.py | 10 ++-- .../functional/plugin_modules/test_subnets.py | 5 +- quark/tests/functional/test_ipam.py | 6 +- .../tests/plugin_modules/test_ip_addresses.py | 4 +- .../tests/plugin_modules/test_ip_policies.py | 1 + quark/tests/plugin_modules/test_ports.py | 9 +-- quark/tests/plugin_modules/test_subnets.py | 5 +- quark/tests/test_base.py | 1 - quark/tests/test_db_api.py | 4 +- quark/tests/test_db_custom_types.py | 7 +-- quark/tests/test_ipam.py | 3 +- quark/tests/test_network_strategies.py | 1 + quark/tests/test_nvp_driver.py | 48 ++++++++-------- quark/tests/test_optimized_nvp_driver.py | 12 ++-- quark/tests/test_quark_plugin.py | 1 - quark/tests/test_unmanaged_driver.py | 3 +- 37 files changed, 121 insertions(+), 146 deletions(-) diff --git a/quark/api/auth.py b/quark/api/auth.py index be7e35d..2085799 100644 --- a/quark/api/auth.py +++ b/quark/api/auth.py @@ -15,7 +15,6 @@ import webob.dec import webob.exc - from neutron import context from neutron.openstack.common import log as logging from neutron import wsgi diff --git a/quark/api/extensions/ip_addresses.py b/quark/api/extensions/ip_addresses.py index 7f25a8d..e3f7e4f 100644 --- a/quark/api/extensions/ip_addresses.py +++ b/quark/api/extensions/ip_addresses.py @@ -14,11 +14,10 @@ # limitations under the License. import webob - from neutron.api import extensions from neutron.common import exceptions -from neutron import manager from neutron.openstack.common import log as logging +from neutron import manager from neutron import wsgi RESOURCE_NAME = 'ip_address' diff --git a/quark/api/extensions/mac_address_ranges.py b/quark/api/extensions/mac_address_ranges.py index c46c43c..2973669 100644 --- a/quark/api/extensions/mac_address_ranges.py +++ b/quark/api/extensions/mac_address_ranges.py @@ -14,10 +14,9 @@ # limitations under the License. import webob - from neutron.api import extensions -from neutron import manager from neutron.openstack.common import log as logging +from neutron import manager from neutron import wsgi RESOURCE_NAME = 'mac_address_range' diff --git a/quark/api/extensions/ports_quark.py b/quark/api/extensions/ports_quark.py index 79e0b58..5b0d534 100644 --- a/quark/api/extensions/ports_quark.py +++ b/quark/api/extensions/ports_quark.py @@ -14,7 +14,6 @@ # limitations under the License. import webob - from neutron.api import extensions from neutron.api.v2 import attributes from neutron.api.v2 import base diff --git a/quark/api/extensions/routes.py b/quark/api/extensions/routes.py index 05e944d..03690a6 100644 --- a/quark/api/extensions/routes.py +++ b/quark/api/extensions/routes.py @@ -14,11 +14,10 @@ # limitations under the License. import webob - from neutron.api import extensions from neutron.common import exceptions -from neutron import manager from neutron.openstack.common import log as logging +from neutron import manager from neutron import wsgi RESOURCE_NAME = 'route' diff --git a/quark/db/api.py b/quark/db/api.py index f3b5b98..65a279b 100644 --- a/quark/db/api.py +++ b/quark/db/api.py @@ -164,8 +164,8 @@ def scoped(f): @scoped def port_find(context, fields=None, **filters): - query = context.session.query(models.Port).\ - options(orm.joinedload(models.Port.ip_addresses)) + query = context.session.query(models.Port).options( + orm.joinedload(models.Port.ip_addresses)) model_filters = _model_query(context, models.Port, filters) if filters.get("ip_address_id"): model_filters.append(models.Port.ip_addresses.any( @@ -189,8 +189,8 @@ def port_find(context, fields=None, **filters): @scoped def port_find_by_ip_address(context, **filters): - query = context.session.query(models.IPAddress).\ - options(orm.joinedload(models.IPAddress.ports)) + query = context.session.query(models.IPAddress).options( + orm.joinedload(models.IPAddress.ports)) model_filters = _model_query(context, models.IPAddress, filters) return query.filter(*model_filters) @@ -402,8 +402,8 @@ def network_update(context, network, **kwargs): def network_count_all(context): query = context.session.query(sql_func.count(models.Network.id)) - return query.filter(models.Network.tenant_id == context.tenant_id).\ - scalar() + return query.filter(models.Network.tenant_id == + context.tenant_id).scalar() def network_delete(context, network): diff --git a/quark/db/models.py b/quark/db/models.py index ed8da4e..06b5750 100644 --- a/quark/db/models.py +++ b/quark/db/models.py @@ -14,15 +14,12 @@ # under the License. import netaddr - +import neutron.db.model_base import sqlalchemy as sa from sqlalchemy import orm - from sqlalchemy.ext import associationproxy from sqlalchemy.ext import declarative from sqlalchemy.ext import hybrid - -import neutron.db.model_base from neutron.db import models_v2 as models from neutron.openstack.common import log as logging from neutron.openstack.common import timeutils @@ -32,7 +29,7 @@ from quark.db import custom_types # regardless if we need it. This is how it's done upstream. # NOTE(jhammond): If it isn't obvious quota_driver is unused and that's ok. # DO NOT DELETE IT!!! -from quark import quota_driver # noqa +from quark import quota_driver HasId = models.HasId diff --git a/quark/drivers/nvp_driver.py b/quark/drivers/nvp_driver.py index df96fff..4209832 100644 --- a/quark/drivers/nvp_driver.py +++ b/quark/drivers/nvp_driver.py @@ -17,9 +17,8 @@ NVP client driver for Quark """ -from oslo.config import cfg - import aiclib +from oslo.config import cfg from neutron.extensions import securitygroup as sg_ext from neutron.openstack.common import log as logging @@ -413,8 +412,8 @@ class NVPDriver(base.BaseDriver): if switches is not None: for res in switches["results"]: count = res["_relations"]["LogicalSwitchStatus"]["lport_count"] - if self.limits['max_ports_per_switch'] == 0 or \ - count < self.limits['max_ports_per_switch']: + if (self.limits['max_ports_per_switch'] == 0 or + count < self.limits['max_ports_per_switch']): return res["uuid"] return None diff --git a/quark/drivers/optimized_nvp_driver.py b/quark/drivers/optimized_nvp_driver.py index c9d803c..7f056df 100644 --- a/quark/drivers/optimized_nvp_driver.py +++ b/quark/drivers/optimized_nvp_driver.py @@ -17,11 +17,12 @@ Optimized NVP client for Quark """ -from neutron.openstack.common import log as logging -from quark.db import models -from quark.drivers.nvp_driver import NVPDriver import sqlalchemy as sa from sqlalchemy import orm +from neutron.openstack.common import log as logging + +from quark.db import models +from quark.drivers.nvp_driver import NVPDriver LOG = logging.getLogger(__name__) @@ -43,11 +44,9 @@ class OptimizedNVPDriver(NVPDriver): status=True, security_groups=None, device_id=""): security_groups = security_groups or [] - nvp_port = super(OptimizedNVPDriver, self).\ - create_port(context, network_id, - port_id, status=status, - security_groups=security_groups, - device_id=device_id) + nvp_port = super(OptimizedNVPDriver, self).create_port( + context, network_id, port_id, status=status, + security_groups=security_groups, device_id=device_id) switch_nvp_id = nvp_port["lswitch"] # slightly inefficient for the sake of brevity. Lets the @@ -66,17 +65,17 @@ class OptimizedNVPDriver(NVPDriver): def update_port(self, context, port_id, status=True, security_groups=None): security_groups = security_groups or [] - nvp_port = super(OptimizedNVPDriver, self).\ - update_port(context, port_id, status=status, - security_groups=security_groups) + nvp_port = super(OptimizedNVPDriver, self).update_port( + context, port_id, status=status, + security_groups=security_groups) port = self._lport_select_by_id(context, port_id) port.update(nvp_port) def delete_port(self, context, port_id, lswitch_uuid=None): port = self._lport_select_by_id(context, port_id) switch = port.switch - super(OptimizedNVPDriver, self).\ - delete_port(context, port_id, lswitch_uuid=switch.nvp_id) + super(OptimizedNVPDriver, self).delete_port( + context, port_id, lswitch_uuid=switch.nvp_id) context.session.delete(port) switch.port_count = switch.port_count - 1 if switch.port_count == 0: @@ -92,8 +91,8 @@ class OptimizedNVPDriver(NVPDriver): context.session.add(profile) def delete_security_group(self, context, group_id): - super(OptimizedNVPDriver, self).\ - delete_security_group(context, group_id) + super(OptimizedNVPDriver, self).delete_security_group( + context, group_id) group = self._query_security_group(context, group_id) context.session.delete(group) @@ -104,14 +103,13 @@ class OptimizedNVPDriver(NVPDriver): def _lswitch_delete(self, context, lswitch_uuid): switch = self._lswitch_select_by_nvp_id(context, lswitch_uuid) - super(OptimizedNVPDriver, self).\ - _lswitch_delete(context, lswitch_uuid) + super(OptimizedNVPDriver, self)._lswitch_delete( + context, lswitch_uuid) context.session.delete(switch) def _lswitch_select_by_nvp_id(self, context, nvp_id): - switch = context.session.query(LSwitch).\ - filter(LSwitch.nvp_id == nvp_id).\ - first() + switch = context.session.query(LSwitch).filter( + LSwitch.nvp_id == nvp_id).first() return switch def _lswitch_select_first(self, context, network_id): @@ -157,9 +155,8 @@ class OptimizedNVPDriver(NVPDriver): def _lswitch_create(self, context, network_name=None, tags=None, network_id=None, **kwargs): - nvp_id = super(OptimizedNVPDriver, self).\ - _lswitch_create(context, network_name, tags, - network_id, **kwargs) + nvp_id = super(OptimizedNVPDriver, self)._lswitch_create( + context, network_name, tags, network_id, **kwargs) return self._lswitch_create_optimized(context, network_name, nvp_id, network_id, **kwargs).nvp_id @@ -175,9 +172,8 @@ class OptimizedNVPDriver(NVPDriver): return new_switch def _lswitches_for_network(self, context, network_id): - switches = context.session.query(LSwitch).\ - filter(LSwitch.network_id == network_id).\ - all() + switches = context.session.query(LSwitch).filter( + LSwitch.network_id == network_id).all() return switches def _lswitch_from_port(self, context, port_id): @@ -185,8 +181,8 @@ class OptimizedNVPDriver(NVPDriver): return port.switch.nvp_id def _query_security_group(self, context, group_id): - return context.session.query(SecurityProfile).\ - filter(SecurityProfile.id == group_id).first() + return context.session.query(SecurityProfile).filter( + SecurityProfile.id == group_id).first() def _make_security_rule_dict(self, rule): res = {"port_range_min": rule.get("port_range_min"), @@ -201,8 +197,8 @@ class OptimizedNVPDriver(NVPDriver): return res def _get_security_group(self, context, group_id): - group = context.session.query(models.SecurityGroup).\ - filter(models.SecurityGroup.id == group_id).first() + group = context.session.query(models.SecurityGroup).filter( + models.SecurityGroup.id == group_id).first() rulelist = {'ingress': [], 'egress': []} for rule in group.rules: rulelist[rule.direction].append( diff --git a/quark/gunicorn_server.py b/quark/gunicorn_server.py index 134c434..6c78287 100644 --- a/quark/gunicorn_server.py +++ b/quark/gunicorn_server.py @@ -3,13 +3,13 @@ import sys from gunicorn.app import base from gunicorn import config as gconfig -from oslo.config import cfg from neutron.common import config from neutron.common import legacy from neutron.common import utils from neutron.openstack.common import gettextutils from neutron.openstack.common import log as logging from neutron import service # noqa For api_workers config value +from oslo.config import cfg options = [ diff --git a/quark/ipam.py b/quark/ipam.py index 1db87ef..b3bf73d 100644 --- a/quark/ipam.py +++ b/quark/ipam.py @@ -17,14 +17,15 @@ Quark Pluggable IPAM """ +import netaddr import random import uuid -import netaddr from neutron.common import exceptions from neutron.openstack.common import log as logging from neutron.openstack.common.notifier import api as notifier_api from neutron.openstack.common import timeutils from oslo.config import cfg + from quark.db import api as db_api from quark.db import models from quark import exceptions as q_exc @@ -292,7 +293,8 @@ class QuarkIpam(object): This should provide a performance boost over attempting to check each and every subnet in the existing reallocate logic, as we'd - have to iterate over each and every subnet returned """ + have to iterate over each and every subnet returned + """ if not (ip_address is None and "mac_address" in kwargs and kwargs["mac_address"]): return self._allocate_from_subnet(context, net_id, subnet, diff --git a/quark/plugin.py b/quark/plugin.py index f4d80aa..17d46dc 100644 --- a/quark/plugin.py +++ b/quark/plugin.py @@ -16,12 +16,13 @@ """ v2 Neutron Plug-in API Quark Implementation """ -from oslo.config import cfg from neutron.db import api as neutron_db_api from neutron.extensions import securitygroup as sg_ext from neutron import neutron_plugin_base_v2 from neutron.openstack.common import log as logging from neutron import quota +from oslo.config import cfg + from quark.api import extensions from quark.db import models from quark.plugin_modules import ip_addresses diff --git a/quark/plugin_modules/ip_addresses.py b/quark/plugin_modules/ip_addresses.py index 6e44e0a..d2765ba 100644 --- a/quark/plugin_modules/ip_addresses.py +++ b/quark/plugin_modules/ip_addresses.py @@ -18,6 +18,7 @@ from neutron.common import exceptions from neutron.openstack.common import importutils from neutron.openstack.common import log as logging from oslo.config import cfg + from quark.db import api as db_api from quark import exceptions as quark_exceptions from quark import plugin_views as v diff --git a/quark/plugin_modules/mac_address_ranges.py b/quark/plugin_modules/mac_address_ranges.py index a390ad4..074ad3c 100644 --- a/quark/plugin_modules/mac_address_ranges.py +++ b/quark/plugin_modules/mac_address_ranges.py @@ -15,6 +15,7 @@ import netaddr from neutron.openstack.common import log as logging + from quark.db import api as db_api from quark import exceptions as quark_exceptions from quark import plugin_views as v diff --git a/quark/plugin_modules/networks.py b/quark/plugin_modules/networks.py index ec74add..21f0953 100644 --- a/quark/plugin_modules/networks.py +++ b/quark/plugin_modules/networks.py @@ -22,11 +22,11 @@ from oslo.config import cfg from quark.db import api as db_api from quark.drivers import registry +from quark.plugin_modules import ports +from quark.plugin_modules import subnets from quark import exceptions as q_exc from quark import ipam from quark import network_strategy -from quark.plugin_modules import ports -from quark.plugin_modules import subnets from quark import plugin_views as v from quark import utils diff --git a/quark/plugin_modules/ports.py b/quark/plugin_modules/ports.py index 5368957..d69f398 100644 --- a/quark/plugin_modules/ports.py +++ b/quark/plugin_modules/ports.py @@ -14,7 +14,6 @@ # under the License. import netaddr - from neutron.common import exceptions from neutron.openstack.common import log as logging from neutron.openstack.common import uuidutils diff --git a/quark/plugin_modules/subnets.py b/quark/plugin_modules/subnets.py index b1d6b9b..a7b9604 100644 --- a/quark/plugin_modules/subnets.py +++ b/quark/plugin_modules/subnets.py @@ -14,21 +14,19 @@ # under the License. import netaddr - from neutron.common import config as neutron_cfg from neutron.common import exceptions from neutron.openstack.common import importutils from neutron.openstack.common import log as logging -from neutron.openstack.common.notifier import api as notifier_api from neutron.openstack.common import timeutils - +from neutron.openstack.common.notifier import api as notifier_api from oslo.config import cfg from quark.db import api as db_api from quark.db import models as models +from quark.plugin_modules import routes from quark import exceptions as q_exc from quark import network_strategy -from quark.plugin_modules import routes from quark import plugin_views as v from quark import utils @@ -146,17 +144,16 @@ def create_subnet(context, subnet): if isinstance(allocation_pools, list) and allocation_pools: subnet_net = netaddr.IPNetwork(new_subnet["cidr"]) - cidrset = \ - netaddr.IPSet(netaddr.IPRange( + cidrset = netaddr.IPSet( + netaddr.IPRange( netaddr.IPAddress(subnet_net.first), netaddr.IPAddress(subnet_net.last)).cidrs()) for p in allocation_pools: start = netaddr.IPAddress(p["start"]) end = netaddr.IPAddress(p["end"]) - cidrset -= \ - netaddr.IPSet(netaddr.IPRange( - netaddr.IPAddress(start), - netaddr.IPAddress(end)).cidrs()) + cidrset -= netaddr.IPSet(netaddr.IPRange( + netaddr.IPAddress(start), + netaddr.IPAddress(end)).cidrs()) default_cidrset = models.IPPolicy.get_ip_policy_cidrs(new_subnet) cidrset.update(default_cidrset) cidrs = [str(x.cidr) for x in cidrset.iter_cidrs()] diff --git a/quark/plugin_views.py b/quark/plugin_views.py index f8d3f64..181a4d8 100644 --- a/quark/plugin_views.py +++ b/quark/plugin_views.py @@ -21,6 +21,7 @@ import netaddr from neutron.extensions import securitygroup as sg_ext from neutron.openstack.common import log as logging from oslo.config import cfg + from quark.db import api as db_api from quark.db import models from quark import network_strategy diff --git a/quark/quota_driver.py b/quark/quota_driver.py index 9476c6f..1ec4cbb 100644 --- a/quark/quota_driver.py +++ b/quark/quota_driver.py @@ -24,7 +24,6 @@ class QuarkQuotaDriver(quota_db.DbQuotaDriver): The default driver utilizes the local database. """ - @staticmethod def delete_tenant_quota(context, tenant_id): """Delete the quota entries for a given tenant_id. diff --git a/quark/tests/__init__.py b/quark/tests/__init__.py index 096b33c..e69de29 100644 --- a/quark/tests/__init__.py +++ b/quark/tests/__init__.py @@ -1,14 +0,0 @@ -# Copyright (c) 2013 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. diff --git a/quark/tests/functional/plugin_modules/test_ip_addresses.py b/quark/tests/functional/plugin_modules/test_ip_addresses.py index 6811a5a..0d9a37b 100644 --- a/quark/tests/functional/plugin_modules/test_ip_addresses.py +++ b/quark/tests/functional/plugin_modules/test_ip_addresses.py @@ -14,11 +14,12 @@ # under the License. import contextlib + import netaddr +import unittest2 from neutron import context from neutron.db import api as neutron_db_api from oslo.config import cfg -import unittest2 from quark.db import api as db_api from quark.db import models diff --git a/quark/tests/functional/plugin_modules/test_networks.py b/quark/tests/functional/plugin_modules/test_networks.py index e27f5cc..d26cfe2 100644 --- a/quark/tests/functional/plugin_modules/test_networks.py +++ b/quark/tests/functional/plugin_modules/test_networks.py @@ -13,19 +13,19 @@ # License for# the specific language governing permissions and limitations # under the License. -import netaddr - import contextlib + +import netaddr +import unittest2 from neutron.common import exceptions from neutron import context from neutron.db import api as neutron_db_api from oslo.config import cfg -import unittest2 -from quark.db import api as db_api -from quark.db import models import quark.ipam import quark.plugin +from quark.db import api as db_api +from quark.db import models class QuarkNetworkFunctionalTest(unittest2.TestCase): diff --git a/quark/tests/functional/plugin_modules/test_subnets.py b/quark/tests/functional/plugin_modules/test_subnets.py index baf2f42..3204bda 100644 --- a/quark/tests/functional/plugin_modules/test_subnets.py +++ b/quark/tests/functional/plugin_modules/test_subnets.py @@ -14,14 +14,15 @@ # under the License. import contextlib + +import unittest2 from neutron import context from neutron.db import api as neutron_db_api from oslo.config import cfg -import unittest2 +import quark.ipam from quark.db import api as db_api from quark.db import models -import quark.ipam class QuarkSubnetFunctionalTest(unittest2.TestCase): diff --git a/quark/tests/functional/test_ipam.py b/quark/tests/functional/test_ipam.py index 3a1a58c..689b42c 100644 --- a/quark/tests/functional/test_ipam.py +++ b/quark/tests/functional/test_ipam.py @@ -15,14 +15,14 @@ import contextlib import datetime -import netaddr +import netaddr +import unittest2 from neutron.common import exceptions -from neutron import context from neutron.db import api as neutron_db_api from neutron.openstack.common import timeutils +from neutron import context from oslo.config import cfg -import unittest2 from quark.db import api as db_api from quark.db import models diff --git a/quark/tests/plugin_modules/test_ip_addresses.py b/quark/tests/plugin_modules/test_ip_addresses.py index 3846895..a30adb7 100644 --- a/quark/tests/plugin_modules/test_ip_addresses.py +++ b/quark/tests/plugin_modules/test_ip_addresses.py @@ -14,14 +14,14 @@ # under the License. import contextlib -import webob import mock +import webob from mock import patch from neutron.common import exceptions -from quark.db import models from quark import exceptions as quark_exceptions +from quark.db import models from quark.tests import test_quark_plugin diff --git a/quark/tests/plugin_modules/test_ip_policies.py b/quark/tests/plugin_modules/test_ip_policies.py index 8f13eae..e6396fa 100644 --- a/quark/tests/plugin_modules/test_ip_policies.py +++ b/quark/tests/plugin_modules/test_ip_policies.py @@ -14,6 +14,7 @@ # under the License. import contextlib + import mock from neutron.common import exceptions diff --git a/quark/tests/plugin_modules/test_ports.py b/quark/tests/plugin_modules/test_ports.py index 4a0cb21..d98a259 100644 --- a/quark/tests/plugin_modules/test_ports.py +++ b/quark/tests/plugin_modules/test_ports.py @@ -23,10 +23,10 @@ from neutron.extensions import securitygroup as sg_ext from quark.db import api as quark_db_api from quark.db import models -from quark import exceptions as q_exc -from quark import network_strategy from quark.plugin_modules import ports as quark_ports from quark.tests import test_quark_plugin +from quark import exceptions as q_exc +from quark import network_strategy class TestQuarkGetPorts(test_quark_plugin.TestQuarkPlugin): @@ -653,8 +653,9 @@ class TestQuarkPostUpdatePort(test_quark_plugin.TestQuarkPlugin): device_id=2)) ip = dict(id=1, address=3232235876, address_readable="192.168.1.101", subnet_id=1, network_id=2, version=4, deallocated=True) - with self._stubs(port=port, addr=None, addr2=ip) as \ - (port_find, alloc_ip, ip_find): + with self._stubs(port=port, addr=None, addr2=ip) as (port_find, + alloc_ip, + ip_find): response = self.plugin.post_update_port(self.context, 1, new_port_ip) self.assertEqual(port_find.call_count, 1) diff --git a/quark/tests/plugin_modules/test_subnets.py b/quark/tests/plugin_modules/test_subnets.py index e0df41a..ff3fba1 100644 --- a/quark/tests/plugin_modules/test_subnets.py +++ b/quark/tests/plugin_modules/test_subnets.py @@ -742,8 +742,9 @@ class TestQuarkUpdateSubnet(test_quark_plugin.TestQuarkPlugin): dns_create, route_find, route_update, route_create): subnet_find.return_value = subnet_mod - route_find.return_value = subnet_mod["routes"][0] \ - if subnet_mod["routes"] and find_routes else None + route_find.return_value = (subnet_mod["routes"][0] if + subnet_mod["routes"] and + find_routes else None) new_subnet_mod = models.Subnet(network=models.Network()) new_subnet_mod.update(subnet_mod) if new_routes: diff --git a/quark/tests/test_base.py b/quark/tests/test_base.py index 584da69..00f4ff0 100644 --- a/quark/tests/test_base.py +++ b/quark/tests/test_base.py @@ -14,7 +14,6 @@ # limitations under the License. import unittest2 - from neutron import context diff --git a/quark/tests/test_db_api.py b/quark/tests/test_db_api.py index 63cfcb1..c870dbf 100644 --- a/quark/tests/test_db_api.py +++ b/quark/tests/test_db_api.py @@ -17,14 +17,12 @@ import mock import netaddr from neutron.db import api as neutron_db_api from oslo.config import cfg +from sqlalchemy.orm import configure_mappers from quark.db import api as db_api from quark.db import models - from quark.tests import test_base -from sqlalchemy.orm import configure_mappers - class TestDBAPI(test_base.TestBase): def setUp(self): diff --git a/quark/tests/test_db_custom_types.py b/quark/tests/test_db_custom_types.py index 6f537eb..b8358ad 100644 --- a/quark/tests/test_db_custom_types.py +++ b/quark/tests/test_db_custom_types.py @@ -13,12 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from quark.db import custom_types - -from quark.tests import test_base - from sqlalchemy.dialects import mysql, sqlite +from quark.db import custom_types +from quark.tests import test_base + class TestDBCustomTypesINET(test_base.TestBase): """Adding for coverage of the custom types.""" diff --git a/quark/tests/test_ipam.py b/quark/tests/test_ipam.py index ca4e63b..630e57c 100644 --- a/quark/tests/test_ipam.py +++ b/quark/tests/test_ipam.py @@ -14,6 +14,7 @@ # limitations under the License. import contextlib + import mock import netaddr from neutron.common import exceptions @@ -21,9 +22,9 @@ from neutron.db import api as neutron_db_api from neutron.openstack.common.notifier import api as notifier_api from oslo.config import cfg +import quark.ipam from quark.db import models from quark import exceptions as q_exc -import quark.ipam from quark.tests import test_base diff --git a/quark/tests/test_network_strategies.py b/quark/tests/test_network_strategies.py index 0af6b3d..6323fa3 100644 --- a/quark/tests/test_network_strategies.py +++ b/quark/tests/test_network_strategies.py @@ -14,6 +14,7 @@ # under the License. import json + from neutron.common import exceptions from oslo.config import cfg diff --git a/quark/tests/test_nvp_driver.py b/quark/tests/test_nvp_driver.py index b8b5eb4..1a4ae29 100644 --- a/quark/tests/test_nvp_driver.py +++ b/quark/tests/test_nvp_driver.py @@ -14,16 +14,16 @@ # under the License. import contextlib -import mock -from neutron.db import api as db_api +import mock import neutron.extensions.securitygroup as sg_ext +from neutron.db import api as db_api from oslo.config import cfg -from quark.db import models import quark.drivers.nvp_driver -from quark import exceptions as q_exc +from quark.db import models from quark.tests import test_base +from quark import exceptions as q_exc class TestNVPDriver(test_base.TestBase): @@ -331,8 +331,8 @@ class TestNVPDriverCreatePort(TestNVPDriver): self.assertFalse(connection.lswitch().create.called) self.assertTrue(connection.lswitch_port().create.called) self.assertTrue(connection.lswitch().query.called) - status_args, kwargs = connection.lswitch_port().\ - admin_status_enabled.call_args + status_args, kwargs = ( + connection.lswitch_port().admin_status_enabled.call_args) self.assertTrue(True in status_args) def test_create_port_switch_exists_tags(self): @@ -345,8 +345,8 @@ class TestNVPDriverCreatePort(TestNVPDriver): self.assertFalse(connection.lswitch().create.called) self.assertTrue(connection.lswitch_port().create.called) self.assertTrue(connection.lswitch().query.called) - status_args, kwargs = connection.lswitch_port().\ - admin_status_enabled.call_args + status_args, kwargs = ( + connection.lswitch_port().admin_status_enabled.call_args) self.assertTrue(True in status_args) connection.lswitch_port().assert_has_calls([mock.call.tags([ dict(scope="neutron_net_id", tag=self.net_id), @@ -364,8 +364,8 @@ class TestNVPDriverCreatePort(TestNVPDriver): self.assertTrue(connection.lswitch().create.called) self.assertTrue(connection.lswitch_port().create.called) self.assertTrue(connection.lswitch().query.called) - status_args, kwargs = connection.lswitch_port().\ - admin_status_enabled.call_args + status_args, kwargs = ( + connection.lswitch_port().admin_status_enabled.call_args) self.assertTrue(True in status_args) def test_create_port_no_existing_switches_fails(self): @@ -382,8 +382,8 @@ class TestNVPDriverCreatePort(TestNVPDriver): self.assertTrue(connection.lswitch().create.called) self.assertTrue(connection.lswitch_port().create.called) self.assertTrue(connection.lswitch().query.called) - status_args, kwargs = connection.lswitch_port().\ - admin_status_enabled.call_args + status_args, kwargs = ( + connection.lswitch_port().admin_status_enabled.call_args) self.assertTrue(False in status_args) def test_create_port_switch_exists_spanning(self): @@ -396,8 +396,8 @@ class TestNVPDriverCreatePort(TestNVPDriver): self.assertTrue(connection.lswitch().create.called) self.assertTrue(connection.lswitch_port().create.called) self.assertTrue(connection.lswitch().query.called) - status_args, kwargs = connection.lswitch_port().\ - admin_status_enabled.call_args + status_args, kwargs = ( + connection.lswitch_port().admin_status_enabled.call_args) self.assertTrue(True in status_args) def test_create_port_switch_not_exists_spanning(self): @@ -410,8 +410,8 @@ class TestNVPDriverCreatePort(TestNVPDriver): self.assertTrue(connection.lswitch().create.called) self.assertTrue(connection.lswitch_port().create.called) self.assertTrue(connection.lswitch().query.called) - status_args, kwargs = connection.lswitch_port().\ - admin_status_enabled.call_args + status_args, kwargs = ( + connection.lswitch_port().admin_status_enabled.call_args) self.assertTrue(True in status_args) def test_create_disabled_port_switch_not_exists_spanning(self): @@ -424,8 +424,8 @@ class TestNVPDriverCreatePort(TestNVPDriver): self.assertTrue(connection.lswitch().create.called) self.assertTrue(connection.lswitch_port().create.called) self.assertTrue(connection.lswitch().query.called) - status_args, kwargs = connection.lswitch_port().\ - admin_status_enabled.call_args + status_args, kwargs = ( + connection.lswitch_port().admin_status_enabled.call_args) self.assertTrue(False in status_args) def test_create_port_with_security_groups(self): @@ -651,8 +651,8 @@ class TestNVPDriverDeleteSecurityGroup(TestNVPDriver): def test_security_group_delete_not_found(self): with self._stubs() as connection: - connection.securityprofile().query().results.return_value = \ - {'result_count': 0, 'results': []} + connection.securityprofile().query().results.return_value = { + 'result_count': 0, 'results': []} with self.assertRaises(sg_ext.SecurityGroupNotFound): self.driver.delete_security_group(self.context, 1) @@ -679,8 +679,8 @@ class TestNVPDriverUpdateSecurityGroup(TestNVPDriver): def test_security_group_update_not_found(self): with self._stubs() as connection: - connection.securityprofile().query().results.return_value = \ - {'result_count': 0, 'results': []} + connection.securityprofile().query().results.return_value = { + 'result_count': 0, 'results': []} with self.assertRaises(sg_ext.SecurityGroupNotFound): self.driver.update_security_group(self.context, 1) @@ -726,8 +726,8 @@ class TestNVPDriverCreateSecurityGroupRule(TestNVPDriver): connection = self._create_connection() connection.securityprofile = self._create_security_profile() connection.securityrule = self._create_security_rule() - connection.lswitch_port().query.return_value = \ - self._create_lport_query(1, [self.profile_id]) + connection.lswitch_port().query.return_value = ( + self._create_lport_query(1, [self.profile_id])) get_connection.return_value = connection yield connection diff --git a/quark/tests/test_optimized_nvp_driver.py b/quark/tests/test_optimized_nvp_driver.py index 9cfc517..39cd994 100644 --- a/quark/tests/test_optimized_nvp_driver.py +++ b/quark/tests/test_optimized_nvp_driver.py @@ -14,6 +14,7 @@ # under the License. import contextlib + import mock import quark.db.models @@ -24,8 +25,8 @@ import quark.tests.test_nvp_driver as test_nvp_driver class TestOptimizedNVPDriver(test_nvp_driver.TestNVPDriver): def setUp(self): if not hasattr(self, 'driver'): - self.driver = quark.drivers.optimized_nvp_driver.\ - OptimizedNVPDriver() + self.driver = ( + quark.drivers.optimized_nvp_driver.OptimizedNVPDriver()) super(TestOptimizedNVPDriver, self).setUp() self.d_pkg = "quark.drivers.optimized_nvp_driver.OptimizedNVPDriver" self.context.session.add = mock.Mock(return_value=None) @@ -97,8 +98,7 @@ class TestOptimizedNVPDriverDeleteNetwork(TestOptimizedNVPDriver): class TestOptimizedNVPDriverDeletePortMultiSwitch(TestOptimizedNVPDriver): '''Need to test if ports on switch = 0 delete switch if it is not the last - switch on the network. - ''' + switch on the network.''' @contextlib.contextmanager def _stubs(self, port_count=2): with contextlib.nested( @@ -136,8 +136,7 @@ class TestOptimizedNVPDriverDeletePortMultiSwitch(TestOptimizedNVPDriver): class TestOptimizedNVPDriverDeletePortSingleSwitch(TestOptimizedNVPDriver): '''Need to test if ports on switch = 0 delete switch unless it is the last - switch on the network. - ''' + switch on the network.''' @contextlib.contextmanager def _stubs(self, port_count=2): with contextlib.nested( @@ -434,7 +433,6 @@ class TestQueryMethods(TestOptimizedNVPDriver): assertions are made, as there's no sense in testing that sqlalchemy does in fact do what it's supposed to do. """ - @contextlib.contextmanager def _stubs(self): old_query = self.context.session.query diff --git a/quark/tests/test_quark_plugin.py b/quark/tests/test_quark_plugin.py index 278b6b2..0cac0b4 100644 --- a/quark/tests/test_quark_plugin.py +++ b/quark/tests/test_quark_plugin.py @@ -19,7 +19,6 @@ from neutron.db import api as db_api from oslo.config import cfg import quark.plugin - from quark.tests import test_base diff --git a/quark/tests/test_unmanaged_driver.py b/quark/tests/test_unmanaged_driver.py index bd520eb..a07426d 100644 --- a/quark/tests/test_unmanaged_driver.py +++ b/quark/tests/test_unmanaged_driver.py @@ -14,8 +14,9 @@ # under the License. import json -from quark.drivers import unmanaged + from quark import network_strategy +from quark.drivers import unmanaged from quark.tests import test_base