Fixed problems from oslo_log upgrade

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

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
 
 

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

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
 

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

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'

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"

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"

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'

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'

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
 

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

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_

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

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

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

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

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

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 = [

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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