x/vmware-nsx
Code Issues Proposed changes

Use oslo_log for logging

Browse Source 
neutron.openstack.common.log replaced with oslo_log.log

Change-Id: Ieaf19ec19aa7d9c75ad2c04c7f80045062977171
This commit is contained in:
Kobi Samoray 2015-03-04 20:06:51 +02:00
parent c6e1736603
commit 8c87875f62
46 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -14,5 +14,6 @@ oslo.concurrency>=0.3.0,!=0.4.0
oslo.config>=1.4.0 # Apache-2.0
oslo.db>=1.1.0 # Apache-2.0
oslo.i18n>=1.0.0 # Apache-2.0
oslo.log>=0.1.0 # Apache-2.0
oslo.serialization>=1.0.0 # Apache-2.0
oslo.utils>=1.1.0 # Apache-2.0

2
vmware_nsx/neutron/plugins/vmware/api_client/base.py
View File

@ -20,9 +20,9 @@ import six
import time
from oslo.config import cfg
from oslo_log import log as logging
from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from vmware_nsx.neutron.plugins.vmware import api_client
LOG = logging.getLogger(__name__)

2
vmware_nsx/neutron/plugins/vmware/api_client/client.py
View File

@ -18,7 +18,7 @@
import httplib
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.api_client import base
from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_client

2
vmware_nsx/neutron/plugins/vmware/api_client/eventlet_client.py
View File

@ -19,9 +19,9 @@ import time
import eventlet
eventlet.monkey_patch()
from oslo_log import log as logging
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from vmware_nsx.neutron.plugins.vmware.api_client import base
from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_request

2
vmware_nsx/neutron/plugins/vmware/api_client/eventlet_request.py
View File

@ -19,9 +19,9 @@ import urllib
import eventlet
from oslo.serialization import jsonutils
from oslo_log import log as logging
from neutron.i18n import _LI, _LW
from neutron.openstack.common import log as logging
from vmware_nsx.neutron.plugins.vmware.api_client import request
LOG = logging.getLogger(__name__)

2
vmware_nsx/neutron/plugins/vmware/api_client/request.py
View File

@ -22,11 +22,11 @@ import time
import eventlet
from oslo.utils import excutils
from oslo_log import log as logging
import six
import six.moves.urllib.parse as urlparse
from neutron.i18n import _LI, _LW
from neutron.openstack.common import log as logging
from vmware_nsx.neutron.plugins.vmware import api_client
LOG = logging.getLogger(__name__)

2
vmware_nsx/neutron/plugins/vmware/api_client/version.py
View File

@ -16,7 +16,7 @@
#
from neutron.i18n import _LW
from neutron.openstack.common import log as logging
from oslo_log import log as logging
LOG = logging.getLogger(__name__)

2
vmware_nsx/neutron/plugins/vmware/common/nsx_utils.py
View File

@ -18,7 +18,7 @@ from neutron.common import exceptions as n_exc
from neutron.extensions import multiprovidernet as mpnet
from neutron.extensions import providernet as pnet
from neutron.i18n import _LW
from neutron.openstack.common import log
from oslo_log import log
from vmware_nsx.neutron.plugins.vmware.api_client import client
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc

3
vmware_nsx/neutron/plugins/vmware/common/securitygroups.py
View File

@ -13,7 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.openstack.common import log
from oslo_log import log
from vmware_nsx.neutron.plugins.vmware.common import nsx_utils
LOG = log.getLogger(__name__)

7
vmware_nsx/neutron/plugins/vmware/common/sync.py
View File

@ -15,9 +15,6 @@
import random
from oslo.serialization import jsonutils
from oslo.utils import timeutils
from neutron.common import constants
from neutron.common import exceptions
from neutron import context
@ -26,8 +23,10 @@ from neutron.db import l3_db
from neutron.db import models_v2
from neutron.extensions import l3
from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import log
from neutron.openstack.common import loopingcall
from oslo.serialization import jsonutils
from oslo.utils import timeutils
from oslo_log import log
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc

2
vmware_nsx/neutron/plugins/vmware/common/utils.py
View File

@ -16,8 +16,8 @@
import hashlib
from neutron.api.v2 import attributes
from neutron.openstack.common import log
from neutron import version
from oslo_log import log
LOG = log.getLogger(__name__)

2
vmware_nsx/neutron/plugins/vmware/dbexts/db.py
View File

@ -16,10 +16,10 @@
from oslo.db import exception as db_exc
from oslo.utils import excutils
from oslo_log import log as logging
from sqlalchemy.orm import exc
import neutron.db.api as db
from neutron.openstack.common import log as logging
from neutron.plugins.vmware.dbexts import nsx_models
LOG = logging.getLogger(__name__)

2
vmware_nsx/neutron/plugins/vmware/dbexts/lsn_db.py
View File

@ -15,9 +15,9 @@
# under the License.
#
from neutron.openstack.common import log as logging
from neutron.plugins.vmware.dbexts import nsx_models
from oslo.db import exception as d_exc
from oslo_log import log as logging
from sqlalchemy import orm
from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc

2
vmware_nsx/neutron/plugins/vmware/dbexts/maclearning.py
View File

@ -17,9 +17,9 @@ from sqlalchemy.orm import exc
from neutron.api.v2 import attributes
from neutron.db import db_base_plugin_v2
from neutron.openstack.common import log as logging
from neutron.plugins.vmware.dbexts import nsx_models
from neutron.plugins.vmware.extensions import maclearning as mac
from oslo_log import log as logging
LOG = logging.getLogger(__name__)

2
vmware_nsx/neutron/plugins/vmware/dbexts/networkgw_db.py
View File

@ -17,10 +17,10 @@ from sqlalchemy.orm import exc as sa_orm_exc
from neutron.api.v2 import attributes
from neutron.common import exceptions
from neutron.common import utils
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.vmware.dbexts import nsx_models
from neutron.plugins.vmware.extensions import networkgw
from oslo_log import log as logging
LOG = logging.getLogger(__name__)

2
vmware_nsx/neutron/plugins/vmware/dbexts/nsxrouter.py
View File

@ -15,8 +15,8 @@
from neutron.db import db_base_plugin_v2
from neutron.extensions import l3
from neutron.openstack.common import log as logging
from neutron.plugins.vmware.dbexts import nsxv_models
from oslo_log import log as logging
LOG = logging.getLogger(__name__)

2
vmware_nsx/neutron/plugins/vmware/dbexts/nsxv_db.py
View File

@ -16,12 +16,12 @@
from oslo.db import exception as db_exc
from oslo.utils import excutils
from oslo_log import log as logging
from sqlalchemy.orm import exc
from sqlalchemy.sql import expression as expr
import neutron.db.api as db
from neutron.i18n import _, _LE
from neutron.openstack.common import log as logging
from neutron.plugins.vmware.dbexts import nsxv_models
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc

2
vmware_nsx/neutron/plugins/vmware/dbexts/qos_db.py
View File

@ -19,10 +19,10 @@ from neutron.api.v2 import attributes as attr
from neutron.db import db_base_plugin_v2
from neutron.db import models_v2
from neutron.i18n import _LI
from neutron.openstack.common import log
from neutron.openstack.common import uuidutils
from neutron.plugins.vmware.dbexts import nsx_models
from neutron.plugins.vmware.extensions import qos
from oslo_log import log
LOG = log.getLogger(__name__)

2
vmware_nsx/neutron/plugins/vmware/dbexts/vnic_index_db.py
View File

@ -17,9 +17,9 @@ from sqlalchemy.orm import exc
from neutron.api.v2 import attributes as attr
from neutron.db import db_base_plugin_v2
from neutron.openstack.common import log as logging
from neutron.plugins.vmware.dbexts import nsxv_models
from neutron.plugins.vmware.extensions import vnicindex as vnicidx
from oslo_log import log as logging
LOG = logging.getLogger(__name__)

2
vmware_nsx/neutron/plugins/vmware/dhcp_meta/lsnmanager.py
View File

@ -17,10 +17,10 @@
from neutron.common import exceptions as n_exc
from neutron.i18n import _LE, _LW
from neutron.openstack.common import log as logging
from oslo.config import cfg
from oslo.db import exception as db_exc
from oslo.utils import excutils
from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc

2
vmware_nsx/neutron/plugins/vmware/dhcp_meta/migration.py
View File

@ -19,7 +19,7 @@ from neutron.common import constants as const
from neutron.common import exceptions as n_exc
from neutron.extensions import external_net
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import nsx

2
vmware_nsx/neutron/plugins/vmware/dhcp_meta/nsx.py
View File

@ -22,9 +22,9 @@ from neutron.db import db_base_plugin_v2
from neutron.db import l3_db
from neutron.extensions import external_net
from neutron.i18n import _LE, _LI
from neutron.openstack.common import log as logging
from oslo.config import cfg
from oslo.utils import excutils
from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import constants as d_const

2
vmware_nsx/neutron/plugins/vmware/dhcp_meta/rpc.py
View File

@ -24,8 +24,8 @@ from neutron.db import db_base_plugin_v2
from neutron.db import l3_db
from neutron.db import models_v2
from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from oslo.config import cfg
from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import config

2
vmware_nsx/neutron/plugins/vmware/nsx_cluster.py
View File

@ -14,8 +14,8 @@
# under the License.
from neutron.i18n import _LI
from neutron.openstack.common import log as logging
from oslo.config import cfg
from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.common import exceptions

2
vmware_nsx/neutron/plugins/vmware/nsxlib/__init__.py
View File

@ -14,9 +14,9 @@
# under the License.
from neutron.common import exceptions as exception
from neutron.openstack.common import log
from neutron import version
from oslo.serialization import jsonutils
from oslo_log import log
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc

2
vmware_nsx/neutron/plugins/vmware/nsxlib/l2gateway.py
View File

@ -14,8 +14,8 @@
# under the License.
#
from neutron.openstack.common import log
from oslo.serialization import jsonutils
from oslo_log import log
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc

2
vmware_nsx/neutron/plugins/vmware/nsxlib/lsn.py
View File

@ -14,8 +14,8 @@
# under the License.
from neutron.common import exceptions as exception
from neutron.openstack.common import log
from oslo.serialization import jsonutils
from oslo_log import log
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc

2
vmware_nsx/neutron/plugins/vmware/nsxlib/queue.py
View File

@ -15,10 +15,10 @@
from oslo.serialization import jsonutils
from oslo.utils import excutils
from oslo_log import log
from neutron.api.v2 import attributes as attr
from neutron.common import exceptions as exception
from neutron.openstack.common import log
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import utils

2
vmware_nsx/neutron/plugins/vmware/nsxlib/router.py
View File

@ -16,10 +16,10 @@
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo.utils import excutils
from oslo_log import log
from neutron.common import exceptions as exception
from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import log
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc

7
vmware_nsx/neutron/plugins/vmware/nsxlib/secgroup.py
View File

@ -13,13 +13,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.serialization import jsonutils
from oslo.utils import excutils
from neutron.common import constants
from neutron.common import exceptions
from neutron.i18n import _LW
from neutron.openstack.common import log
from oslo.serialization import jsonutils
from oslo.utils import excutils
from oslo_log import log
from vmware_nsx.neutron.plugins.vmware.common import utils
from vmware_nsx.neutron.plugins.vmware import nsxlib

7
vmware_nsx/neutron/plugins/vmware/nsxlib/switch.py
View File

@ -14,13 +14,12 @@
# under the License.
#
from oslo.config import cfg
from oslo.serialization import jsonutils
from neutron.common import constants
from neutron.common import exceptions as exception
from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import log
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_log import log
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc

2
vmware_nsx/neutron/plugins/vmware/plugins/base.py
View File

@ -19,6 +19,7 @@ from oslo.config import cfg
from oslo.db import exception as db_exc
from oslo.utils import excutils
from oslo_concurrency import lockutils
from oslo_log import log as logging
from sqlalchemy import exc as sql_exc
from sqlalchemy.orm import exc as sa_exc
import webob.exc
@ -53,7 +54,6 @@ from neutron.extensions import portsecurity as psec
from neutron.extensions import providernet as pnet
from neutron.extensions import securitygroup as ext_sg
from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as plugin_const
from neutron.plugins.vmware.dbexts import nsx_models
from neutron.plugins.vmware.extensions import maclearning as mac_ext

2
vmware_nsx/neutron/plugins/vmware/plugins/managers.py
View File

@ -16,7 +16,7 @@
from oslo.config import cfg
import stevedore
from neutron.openstack.common import log
from oslo_log import log
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc

2
vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py
View File

@ -19,6 +19,7 @@ import netaddr
from oslo.config import cfg
from oslo.utils import excutils
from oslo_concurrency import lockutils
from oslo_log import log as logging
from sqlalchemy.orm import exc as sa_exc
from neutron.api import extensions as neutron_extensions
@ -46,7 +47,6 @@ from neutron.extensions import portsecurity as psec
from neutron.extensions import providernet as pnet
from neutron.extensions import securitygroup as ext_sg
from neutron.i18n import _LE, _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.vmware.extensions import (
advancedserviceproviders as as_providers)

2
vmware_nsx/neutron/plugins/vmware/plugins/nsx_v_md_proxy.py
View File

@ -26,7 +26,7 @@ from oslo_utils import excutils
from neutron.api.v2 import attributes as attr
from neutron.common import constants
from neutron import context as neutron_context
from neutron.openstack.common import log as logging
from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsxv_exc
from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db

2
vmware_nsx/neutron/plugins/vmware/vshield/edge_appliance_driver.py
View File

@ -19,9 +19,9 @@ import time
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo.utils import excutils
from oslo_log import log as logging
from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants
from vmware_nsx.neutron.plugins.vmware.common import utils
from vmware_nsx.neutron.plugins.vmware.vshield.common import constants

2
vmware_nsx/neutron/plugins/vmware/vshield/edge_utils.py
View File

@ -19,13 +19,13 @@ import time
from oslo.config import cfg
from oslo.utils import excutils
from oslo_concurrency import lockutils
from oslo_log import log as logging
from sqlalchemy.orm import exc as sa_exc
from neutron.common import exceptions as n_exc
from neutron import context as q_context
from neutron.extensions import l3
from neutron.i18n import _LE, _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.common import constants as plugin_const
from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants

3
vmware_nsx/neutron/plugins/vmware/vshield/nsxv_loadbalancer.py
View File

@ -14,7 +14,8 @@
# under the License.
#
from neutron.openstack.common import log as logging
from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.vshield import nsxv_edge_cfg_obj

2
vmware_nsx/neutron/plugins/vmware/vshield/securitygroup_utils.py
View File

@ -15,7 +15,7 @@
import xml.etree.ElementTree as et
from neutron.openstack.common import log as logging
from oslo_log import log as logging
WAIT_INTERVAL = 2000
MAX_ATTEMPTS = 5

4
vmware_nsx/neutron/plugins/vmware/vshield/tasks/tasks.py
View File

@ -18,11 +18,11 @@ import uuid
from eventlet import event
from eventlet import greenthread
from neutron.common import exceptions
from neutron.i18n import _LE, _LI
from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.vshield.tasks import constants
DEFAULT_INTERVAL = 1000

2
vmware_nsx/neutron/plugins/vmware/vshield/vcns.py
View File

@ -16,10 +16,10 @@
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_log import log as logging
import retrying
import xml.etree.ElementTree as et
from neutron.openstack.common import log as logging
from vmware_nsx.neutron.plugins.vmware.vshield.common import exceptions
from vmware_nsx.neutron.plugins.vmware.vshield.common import VcnsApiClient

2
vmware_nsx/neutron/plugins/vmware/vshield/vcns_driver.py
View File

@ -15,8 +15,8 @@
# under the License.
from oslo.config import cfg
from oslo_log import log as logging
from neutron.openstack.common import log as logging
from vmware_nsx.neutron.plugins.vmware.common import config # noqa
from vmware_nsx.neutron.plugins.vmware.vshield import edge_appliance_driver
from vmware_nsx.neutron.plugins.vmware.vshield import edge_firewall_driver

2
vmware_nsx/neutron/tests/unit/vmware/apiclient/fake.py
View File

@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from oslo.serialization import jsonutils
from oslo_log import log as logging
import six.moves.urllib.parse as urlparse
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc

3
vmware_nsx/neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py
View File

@ -18,10 +18,9 @@ import random
import eventlet
from eventlet.green import urllib2
import mock
from neutron.i18n import _LI
from neutron.openstack.common import log as logging
from neutron.tests import base
from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.api_client import (
eventlet_client as client)
from vmware_nsx.neutron.plugins.vmware.api_client import (

2
vmware_nsx/neutron/tests/unit/vmware/test_nsx_plugin.py
View File

@ -20,6 +20,7 @@ import mock
import netaddr
from oslo.config import cfg
from oslo.db import exception as db_exc
from oslo_log import log
from sqlalchemy import exc as sql_exc
import webob.exc
@ -36,7 +37,6 @@ from neutron.extensions import portbindings
from neutron.extensions import providernet as pnet
from neutron.extensions import securitygroup as secgrp
from neutron import manager
from neutron.openstack.common import log
from neutron.openstack.common import uuidutils
from neutron.tests.unit import _test_extension_portbindings as test_bindings
import neutron.tests.unit.test_db_plugin as test_plugin

2
vmware_nsx/neutron/tests/unit/vmware/test_nsx_sync.py
View File

@ -20,13 +20,13 @@ import time
import mock
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_log import log
from neutron.api.v2 import attributes as attr
from neutron.common import constants
from neutron.common import exceptions as n_exc
from neutron import context
from neutron.extensions import l3
from neutron.openstack.common import log
from neutron.tests import base
from neutron.tests.unit import test_api_v2
from neutron.tests.unit import testlib_api