From d5450f926065bd3762c1e71cbff2f72f25ae2d41 Mon Sep 17 00:00:00 2001 From: Justin Hammond Date: Mon, 16 Mar 2015 11:09:25 -0500 Subject: [PATCH] Fixed problems from oslo_log upgrade --- quark/agent/agent.py | 2 +- quark/agent/xapi.py | 2 +- quark/allocation_pool.py | 2 +- quark/api/auth.py | 2 +- quark/api/extensions/diagnostics.py | 2 +- quark/api/extensions/ip_addresses.py | 2 +- quark/api/extensions/ip_availability.py | 2 +- quark/api/extensions/ip_policies.py | 2 +- quark/api/extensions/mac_address_ranges.py | 2 +- quark/api/extensions/routes.py | 2 +- quark/cache/redis_base.py | 2 +- quark/cache/security_groups_client.py | 2 +- quark/db/api.py | 2 +- quark/db/models.py | 2 +- quark/drivers/base.py | 2 +- quark/drivers/nvp_driver.py | 2 +- quark/drivers/optimized_nvp_driver.py | 2 +- quark/drivers/unmanaged.py | 2 +- quark/gunicorn_server.py | 2 +- quark/ip_availability.py | 2 +- quark/ipam.py | 2 +- quark/network_strategy.py | 2 +- quark/plugin.py | 2 +- quark/plugin_modules/ip_addresses.py | 2 +- quark/plugin_modules/ip_policies.py | 2 +- quark/plugin_modules/mac_address_ranges.py | 2 +- quark/plugin_modules/networks.py | 2 +- quark/plugin_modules/ports.py | 2 +- quark/plugin_modules/routes.py | 2 +- quark/plugin_modules/security_groups.py | 2 +- quark/plugin_modules/subnets.py | 2 +- quark/plugin_views.py | 2 +- quark/protocols.py | 2 +- quark/utils.py | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/quark/agent/agent.py b/quark/agent/agent.py index 5bb0063..d3800fd 100644 --- a/quark/agent/agent.py +++ b/quark/agent/agent.py @@ -19,8 +19,8 @@ import time from neutron.common import config from neutron.common import utils as n_utils -from neutron.openstack.common import log as logging from oslo.config import cfg +from oslo_log import log as logging from quark.agent import xapi from quark.cache import security_groups_client as sg_cli diff --git a/quark/agent/xapi.py b/quark/agent/xapi.py index ce9797d..a153e81 100644 --- a/quark/agent/xapi.py +++ b/quark/agent/xapi.py @@ -16,8 +16,8 @@ from collections import namedtuple import contextlib -from neutron.openstack.common import log as logging from oslo.config import cfg +from oslo_log import log as logging import XenAPI diff --git a/quark/allocation_pool.py b/quark/allocation_pool.py index 200ac22..8a57062 100644 --- a/quark/allocation_pool.py +++ b/quark/allocation_pool.py @@ -15,7 +15,7 @@ import netaddr from neutron.common import exceptions -from neutron.openstack.common import log as logging +from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/quark/api/auth.py b/quark/api/auth.py index 3d5152d..e46608f 100644 --- a/quark/api/auth.py +++ b/quark/api/auth.py @@ -14,8 +14,8 @@ # limitations under the License. from neutron import context -from neutron.openstack.common import log as logging from neutron import wsgi +from oslo_log import log as logging import webob.dec import webob.exc diff --git a/quark/api/extensions/diagnostics.py b/quark/api/extensions/diagnostics.py index a219828..edaaec6 100644 --- a/quark/api/extensions/diagnostics.py +++ b/quark/api/extensions/diagnostics.py @@ -18,7 +18,7 @@ import functools from neutron.api import extensions from neutron.common import exceptions from neutron import manager -from neutron.openstack.common import log as logging +from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/quark/api/extensions/ip_addresses.py b/quark/api/extensions/ip_addresses.py index 85a8819..62a6005 100644 --- a/quark/api/extensions/ip_addresses.py +++ b/quark/api/extensions/ip_addresses.py @@ -16,8 +16,8 @@ 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 wsgi +from oslo_log import log as logging import webob RESOURCE_NAME = 'ip_address' diff --git a/quark/api/extensions/ip_availability.py b/quark/api/extensions/ip_availability.py index 0e91d9e..15c8193 100644 --- a/quark/api/extensions/ip_availability.py +++ b/quark/api/extensions/ip_availability.py @@ -16,8 +16,8 @@ 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 wsgi +from oslo_log import log as logging RESOURCE_NAME = "ip_availability" RESOURCE_COLLECTION = "ip_availabilities" diff --git a/quark/api/extensions/ip_policies.py b/quark/api/extensions/ip_policies.py index 72a4dbc..98791b4 100644 --- a/quark/api/extensions/ip_policies.py +++ b/quark/api/extensions/ip_policies.py @@ -15,8 +15,8 @@ from neutron.api import extensions from neutron import manager -from neutron.openstack.common import log as logging from neutron import wsgi +from oslo_log import log as logging RESOURCE_NAME = "ip_policy" RESOURCE_COLLECTION = "ip_policies" diff --git a/quark/api/extensions/mac_address_ranges.py b/quark/api/extensions/mac_address_ranges.py index 382c399..6a771eb 100644 --- a/quark/api/extensions/mac_address_ranges.py +++ b/quark/api/extensions/mac_address_ranges.py @@ -15,8 +15,8 @@ from neutron.api import extensions from neutron import manager -from neutron.openstack.common import log as logging from neutron import wsgi +from oslo_log import log as logging import webob RESOURCE_NAME = 'mac_address_range' diff --git a/quark/api/extensions/routes.py b/quark/api/extensions/routes.py index 9e7dd1e..297c628 100644 --- a/quark/api/extensions/routes.py +++ b/quark/api/extensions/routes.py @@ -16,8 +16,8 @@ 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 wsgi +from oslo_log import log as logging import webob RESOURCE_NAME = 'route' diff --git a/quark/cache/redis_base.py b/quark/cache/redis_base.py index a898a1c..57aee46 100644 --- a/quark/cache/redis_base.py +++ b/quark/cache/redis_base.py @@ -18,8 +18,8 @@ import json import string import netaddr -from neutron.openstack.common import log as logging from oslo.config import cfg +from oslo_log import log as logging import redis import redis.sentinel diff --git a/quark/cache/security_groups_client.py b/quark/cache/security_groups_client.py index 95e9ead..143825d 100644 --- a/quark/cache/security_groups_client.py +++ b/quark/cache/security_groups_client.py @@ -16,7 +16,7 @@ import json import netaddr -from neutron.openstack.common import log as logging +from oslo_log import log as logging from quark.cache import redis_base from quark import exceptions as q_exc diff --git a/quark/db/api.py b/quark/db/api.py index 4d1ca17..eb6ada7 100644 --- a/quark/db/api.py +++ b/quark/db/api.py @@ -18,10 +18,10 @@ import inspect import netaddr from neutron.db.sqlalchemyutils import paginate_query -from neutron.openstack.common import log as logging from neutron.openstack.common import uuidutils from oslo.config import cfg from oslo.utils import timeutils +from oslo_log import log as logging from sqlalchemy import event from sqlalchemy import func as sql_func from sqlalchemy import and_, asc, desc, orm, or_, not_ diff --git a/quark/db/models.py b/quark/db/models.py index 4f0c500..bbf82f2 100644 --- a/quark/db/models.py +++ b/quark/db/models.py @@ -16,8 +16,8 @@ import netaddr import neutron.db.model_base from neutron.db import models_v2 as models -from neutron.openstack.common import log as logging from oslo.utils import timeutils +from oslo_log import log as logging import sqlalchemy as sa from sqlalchemy.ext import associationproxy from sqlalchemy.ext import declarative diff --git a/quark/drivers/base.py b/quark/drivers/base.py index d38a296..c5d75d4 100644 --- a/quark/drivers/base.py +++ b/quark/drivers/base.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # -from neutron.openstack.common import log as logging +from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/quark/drivers/nvp_driver.py b/quark/drivers/nvp_driver.py index 998f870..0438c05 100644 --- a/quark/drivers/nvp_driver.py +++ b/quark/drivers/nvp_driver.py @@ -22,8 +22,8 @@ import random import aiclib from neutron.extensions import securitygroup as sg_ext -from neutron.openstack.common import log as logging from oslo.config import cfg +from oslo_log import log as logging from quark.drivers import base from quark import exceptions diff --git a/quark/drivers/optimized_nvp_driver.py b/quark/drivers/optimized_nvp_driver.py index f1a4674..1f9e3b5 100644 --- a/quark/drivers/optimized_nvp_driver.py +++ b/quark/drivers/optimized_nvp_driver.py @@ -18,7 +18,7 @@ Optimized NVP client for Quark """ import aiclib -from neutron.openstack.common import log as logging +from oslo_log import log as logging from quark.db import models from quark.drivers.nvp_driver import NVPDriver diff --git a/quark/drivers/unmanaged.py b/quark/drivers/unmanaged.py index 65204c6..f081330 100644 --- a/quark/drivers/unmanaged.py +++ b/quark/drivers/unmanaged.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # -from neutron.openstack.common import log as logging +from oslo_log import log as logging from quark.cache import security_groups_client as sg_client from quark import environment as env diff --git a/quark/gunicorn_server.py b/quark/gunicorn_server.py index e5b31f4..bae2761 100644 --- a/quark/gunicorn_server.py +++ b/quark/gunicorn_server.py @@ -5,9 +5,9 @@ from gunicorn.app import base from gunicorn import config as gconfig from neutron.common import config from neutron.common import utils -from neutron.openstack.common import log as logging from neutron import service # noqa For api_workers config value from oslo.config import cfg +from oslo_log import log as logging options = [ diff --git a/quark/ip_availability.py b/quark/ip_availability.py index 0a31189..48868a6 100755 --- a/quark/ip_availability.py +++ b/quark/ip_availability.py @@ -21,9 +21,9 @@ import sys import netaddr from neutron.common import config from neutron.db import api as neutron_db_api -from neutron.openstack.common import log as logging from oslo.config import cfg from oslo.utils import timeutils +from oslo_log import log as logging from sqlalchemy import and_, or_, func from quark.db import models diff --git a/quark/ipam.py b/quark/ipam.py index bc6bf00..d9374df 100644 --- a/quark/ipam.py +++ b/quark/ipam.py @@ -25,11 +25,11 @@ import uuid import netaddr from neutron.common import exceptions from neutron.common import rpc as n_rpc -from neutron.openstack.common import log as logging from oslo.config import cfg from oslo.db import exception as db_exception from oslo.utils import timeutils from oslo_concurrency import lockutils +from oslo_log import log as logging from quark.db import api as db_api from quark.db import ip_types diff --git a/quark/network_strategy.py b/quark/network_strategy.py index 06efd3b..23278ba 100644 --- a/quark/network_strategy.py +++ b/quark/network_strategy.py @@ -16,8 +16,8 @@ import json from neutron.common import exceptions -from neutron.openstack.common import log as logging from oslo.config import cfg +from oslo_log import log as logging LOG = logging.getLogger(__name__) CONF = cfg.CONF diff --git a/quark/plugin.py b/quark/plugin.py index 350678c..aae268d 100644 --- a/quark/plugin.py +++ b/quark/plugin.py @@ -19,9 +19,9 @@ v2 Neutron Plug-in API Quark Implementation 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 oslo_log import log as logging from quark.api import extensions from quark import ip_availability diff --git a/quark/plugin_modules/ip_addresses.py b/quark/plugin_modules/ip_addresses.py index a52c252..c1328a0 100644 --- a/quark/plugin_modules/ip_addresses.py +++ b/quark/plugin_modules/ip_addresses.py @@ -14,8 +14,8 @@ # under the License. from neutron.common import exceptions -from neutron.openstack.common import log as logging from oslo.config import cfg +from oslo_log import log as logging import webob from quark.db import api as db_api diff --git a/quark/plugin_modules/ip_policies.py b/quark/plugin_modules/ip_policies.py index bbef491..b2053be 100644 --- a/quark/plugin_modules/ip_policies.py +++ b/quark/plugin_modules/ip_policies.py @@ -15,8 +15,8 @@ import netaddr from neutron.common import exceptions -from neutron.openstack.common import log as logging from oslo.config import cfg +from oslo_log import log as logging from quark import allocation_pool from quark.db import api as db_api diff --git a/quark/plugin_modules/mac_address_ranges.py b/quark/plugin_modules/mac_address_ranges.py index 8fcdbeb..88c5fb7 100644 --- a/quark/plugin_modules/mac_address_ranges.py +++ b/quark/plugin_modules/mac_address_ranges.py @@ -15,7 +15,7 @@ import netaddr from neutron.common import exceptions -from neutron.openstack.common import log as logging +from oslo_log import log as logging from quark.db import api as db_api from quark import exceptions as quark_exceptions diff --git a/quark/plugin_modules/networks.py b/quark/plugin_modules/networks.py index f75f56f..2aafdb7 100644 --- a/quark/plugin_modules/networks.py +++ b/quark/plugin_modules/networks.py @@ -17,11 +17,11 @@ import netaddr from neutron.common import exceptions from neutron.db import quota_db as qdb from neutron.extensions import providernet as pnet -from neutron.openstack.common import log as logging from neutron.openstack.common import uuidutils from neutron import quota from oslo.config import cfg from oslo.utils import importutils +from oslo_log import log as logging from quark.db import api as db_api from quark.drivers import registry diff --git a/quark/plugin_modules/ports.py b/quark/plugin_modules/ports.py index eba018f..58212b6 100644 --- a/quark/plugin_modules/ports.py +++ b/quark/plugin_modules/ports.py @@ -16,10 +16,10 @@ import netaddr from neutron.common import exceptions from neutron.extensions import securitygroup as sg_ext -from neutron.openstack.common import log as logging from neutron.openstack.common import uuidutils from neutron import quota from oslo.config import cfg +from oslo_log import log as logging from quark.db import api as db_api from quark.drivers import registry diff --git a/quark/plugin_modules/routes.py b/quark/plugin_modules/routes.py index 914c964..69a7cd5 100644 --- a/quark/plugin_modules/routes.py +++ b/quark/plugin_modules/routes.py @@ -15,10 +15,10 @@ import netaddr from neutron.common import exceptions -from neutron.openstack.common import log as logging from neutron import quota from oslo.config import cfg from oslo.utils import importutils +from oslo_log import log as logging from quark import allocation_pool from quark.db import api as db_api diff --git a/quark/plugin_modules/security_groups.py b/quark/plugin_modules/security_groups.py index 8da6000..a565f2b 100644 --- a/quark/plugin_modules/security_groups.py +++ b/quark/plugin_modules/security_groups.py @@ -15,10 +15,10 @@ from neutron.common import exceptions from neutron.extensions import securitygroup as sg_ext -from neutron.openstack.common import log as logging from neutron.openstack.common import uuidutils from neutron import quota from oslo.config import cfg +from oslo_log import log as logging from quark.db import api as db_api from quark import plugin_views as v diff --git a/quark/plugin_modules/subnets.py b/quark/plugin_modules/subnets.py index 1e4d068..3e5f28a 100644 --- a/quark/plugin_modules/subnets.py +++ b/quark/plugin_modules/subnets.py @@ -18,11 +18,11 @@ from neutron.common import config as neutron_cfg from neutron.common import exceptions from neutron.common import rpc as n_rpc from neutron.db import quota_db as qdb -from neutron.openstack.common import log as logging from neutron import quota from oslo.config import cfg from oslo.utils import importutils from oslo.utils import timeutils +from oslo_log import log as logging from quark import allocation_pool from quark.db import api as db_api diff --git a/quark/plugin_views.py b/quark/plugin_views.py index 3c7e89c..b63edf8 100644 --- a/quark/plugin_views.py +++ b/quark/plugin_views.py @@ -18,8 +18,8 @@ View Helpers for Quark Plugin """ import netaddr -from neutron.openstack.common import log as logging from oslo.config import cfg +from oslo_log import log as logging from quark.db import models from quark import network_strategy diff --git a/quark/protocols.py b/quark/protocols.py index 4d33c5d..fc73e94 100644 --- a/quark/protocols.py +++ b/quark/protocols.py @@ -16,8 +16,8 @@ import netaddr from neutron.common import exceptions from neutron.extensions import securitygroup as sg_ext -from neutron.openstack.common import log as logging from oslo.config import cfg +from oslo_log import log as logging from quark import exceptions as q_exc diff --git a/quark/utils.py b/quark/utils.py index d044f2d..0e17b4e 100644 --- a/quark/utils.py +++ b/quark/utils.py @@ -26,7 +26,7 @@ except Exception: pass from neutron.api.v2 import attributes -from neutron.openstack.common import log as logging +from oslo_log import log as logging LOG = logging.getLogger(__name__)