x/vmware-nsx
Code Issues Proposed changes

Move from Python logging to Openstack logging

Browse Source 
Replacing usage of python standard logging module
with Openstack common logging module. Apart from
the said replacements, this patch also removes
basicConfig() setup from a couple of modules since
its not needed. Also removes unused LOG & imports.

Change-Id: I6a391951e00fb63905b2027270af9f401841d5b9
Closes-Bug: #1350937
This commit is contained in:
Akash Gangil 2014-08-02 02:53:14 -07:00
parent 305dadf75e
commit 4c230eff0c
17 changed files with 29 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/db/migration/alembic_migrations/heal_script.py
View File

@ -34,6 +34,8 @@ METHODS = {}
def heal(): def heal():
# This is needed else the heal script will start spewing
# a lot of pointless warning messages from alembic.
LOG.setLevel(logging.INFO) LOG.setLevel(logging.INFO)
if context.is_offline_mode(): if context.is_offline_mode():
return return

4
neutron/plugins/cisco/common/cisco_credentials_v2.py
View File

@ -14,16 +14,12 @@
# #
# @author: Sumit Naiksatam, Cisco Systems, Inc. # @author: Sumit Naiksatam, Cisco Systems, Inc.
import logging as LOG
from neutron.plugins.cisco.common import cisco_constants as const from neutron.plugins.cisco.common import cisco_constants as const
from neutron.plugins.cisco.common import cisco_exceptions as cexc from neutron.plugins.cisco.common import cisco_exceptions as cexc
from neutron.plugins.cisco.common import config from neutron.plugins.cisco.common import config
from neutron.plugins.cisco.db import network_db_v2 as cdb from neutron.plugins.cisco.db import network_db_v2 as cdb
LOG.basicConfig(level=LOG.WARN)
LOG.getLogger(const.LOGGER_COMPONENT_NAME)
class Store(object): class Store(object):
"""Credential Store.""" """Credential Store."""

2
neutron/plugins/cisco/models/virt_phy_sw_v2.py
View File

@ -18,7 +18,6 @@
# #
import inspect import inspect
import logging
import sys import sys
from neutron.api.v2 import attributes from neutron.api.v2 import attributes
@ -27,6 +26,7 @@ from neutron.extensions import portbindings
from neutron.extensions import providernet as provider from neutron.extensions import providernet as provider
from neutron import neutron_plugin_base_v2 from neutron import neutron_plugin_base_v2
from neutron.openstack.common import importutils from neutron.openstack.common import importutils
from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_constants as const from neutron.plugins.cisco.common import cisco_constants as const
from neutron.plugins.cisco.common import cisco_credentials_v2 as cred from neutron.plugins.cisco.common import cisco_credentials_v2 as cred
from neutron.plugins.cisco.common import cisco_exceptions as cexc from neutron.plugins.cisco.common import cisco_exceptions as cexc

2
neutron/plugins/cisco/network_plugin.py
View File

@ -14,7 +14,6 @@
# #
# @author: Sumit Naiksatam, Cisco Systems, Inc. # @author: Sumit Naiksatam, Cisco Systems, Inc.
import logging
import webob.exc as wexc import webob.exc as wexc
@ -22,6 +21,7 @@ from neutron.api import extensions as neutron_extensions
from neutron.api.v2 import base from neutron.api.v2 import base
from neutron.db import db_base_plugin_v2 from neutron.db import db_base_plugin_v2
from neutron.openstack.common import importutils from neutron.openstack.common import importutils
from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_exceptions as cexc from neutron.plugins.cisco.common import cisco_exceptions as cexc
from neutron.plugins.cisco.common import config from neutron.plugins.cisco.common import config
from neutron.plugins.cisco.db import network_db_v2 as cdb from neutron.plugins.cisco.db import network_db_v2 as cdb

2
neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py
View File

@ -19,11 +19,11 @@
Implements a Nexus-OS NETCONF over SSHv2 API Client Implements a Nexus-OS NETCONF over SSHv2 API Client
""" """
import logging
from ncclient import manager from ncclient import manager
from neutron.openstack.common import excutils from neutron.openstack.common import excutils
from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_constants as const from neutron.plugins.cisco.common import cisco_constants as const
from neutron.plugins.cisco.common import cisco_credentials_v2 as cred from neutron.plugins.cisco.common import cisco_credentials_v2 as cred
from neutron.plugins.cisco.common import cisco_exceptions as cexc from neutron.plugins.cisco.common import cisco_exceptions as cexc

2
neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py
View File

@ -22,10 +22,10 @@
PlugIn for Nexus OS driver PlugIn for Nexus OS driver
""" """
import logging
from neutron.openstack.common import excutils from neutron.openstack.common import excutils
from neutron.openstack.common import importutils from neutron.openstack.common import importutils
from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_constants as const from neutron.plugins.cisco.common import cisco_constants as const
from neutron.plugins.cisco.common import cisco_exceptions as cisco_exc from neutron.plugins.cisco.common import cisco_exceptions as cisco_exc
from neutron.plugins.cisco.common import config as conf from neutron.plugins.cisco.common import config as conf

5
neutron/plugins/cisco/nexus/cisco_nexus_snippets.py
View File

@ -19,11 +19,6 @@
Nexus-OS XML-based configuration snippets Nexus-OS XML-based configuration snippets
""" """
import logging
LOG = logging.getLogger(__name__)
# The following are standard strings, messages used to communicate with Nexus, # The following are standard strings, messages used to communicate with Nexus,
EXEC_CONF_SNIPPET = """ EXEC_CONF_SNIPPET = """

5
neutron/plugins/ml2/drivers/cisco/nexus/nexus_snippets.py
View File

@ -18,11 +18,6 @@
Cisco Nexus-OS XML-based configuration snippets. Cisco Nexus-OS XML-based configuration snippets.
""" """
import logging
LOG = logging.getLogger(__name__)
# The following are standard strings, messages used to communicate with Nexus. # The following are standard strings, messages used to communicate with Nexus.
EXEC_CONF_SNIPPET = """ EXEC_CONF_SNIPPET = """

11
neutron/plugins/vmware/plugins/base.py
View File

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import logging
import uuid import uuid
from oslo.config import cfg from oslo.config import cfg
@ -51,7 +50,9 @@ from neutron.extensions import portsecurity as psec
from neutron.extensions import providernet as pnet from neutron.extensions import providernet as pnet
from neutron.extensions import securitygroup as ext_sg from neutron.extensions import securitygroup as ext_sg
from neutron.openstack.common import excutils from neutron.openstack.common import excutils
from neutron.openstack.common.gettextutils import _LE
from neutron.openstack.common import lockutils from neutron.openstack.common import lockutils
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as plugin_const from neutron.plugins.common import constants as plugin_const
from neutron.plugins import vmware from neutron.plugins import vmware
from neutron.plugins.vmware.api_client import exception as api_exc from neutron.plugins.vmware.api_client import exception as api_exc
@ -2080,11 +2081,9 @@ class NsxPluginV2(addr_pair_db.AllowedAddressPairsMixin,
def _get_nsx_device_id(self, context, device_id): def _get_nsx_device_id(self, context, device_id):
return self._get_gateway_device(context, device_id)['nsx_id'] return self._get_gateway_device(context, device_id)['nsx_id']
def _rollback_gw_device(self, context, device_id, def _rollback_gw_device(self, context, device_id, gw_data=None,
gw_data=None, new_status=None, new_status=None, is_create=False):
is_create=False, log_level=logging.ERROR): LOG.error(_LE("Rolling back database changes for gateway device %s "
LOG.log(log_level,
_("Rolling back database changes for gateway device %s "
"because of an error in the NSX backend"), device_id) "because of an error in the NSX backend"), device_id)
with context.session.begin(subtransactions=True): with context.session.begin(subtransactions=True):
query = self._model_query( query = self._model_query(

11
neutron/tests/base.py
View File

@ -17,7 +17,7 @@
import contextlib import contextlib
import gc import gc
import logging import logging as std_logging
import os import os
import os.path import os.path
import sys import sys
@ -110,7 +110,6 @@ class BaseTestCase(testtools.TestCase):
def setUp(self): def setUp(self):
super(BaseTestCase, self).setUp() super(BaseTestCase, self).setUp()
# Ensure plugin cleanup is triggered last so that # Ensure plugin cleanup is triggered last so that
# test-specific cleanup has a chance to release references. # test-specific cleanup has a chance to release references.
self.addCleanup(self.cleanup_core_plugin) self.addCleanup(self.cleanup_core_plugin)
@ -120,12 +119,12 @@ class BaseTestCase(testtools.TestCase):
self.addOnException(post_mortem_debug.exception_handler) self.addOnException(post_mortem_debug.exception_handler)
if os.environ.get('OS_DEBUG') in TRUE_STRING: if os.environ.get('OS_DEBUG') in TRUE_STRING:
_level = logging.DEBUG _level = std_logging.DEBUG
else: else:
_level = logging.INFO _level = std_logging.INFO
capture_logs = os.environ.get('OS_LOG_CAPTURE') in TRUE_STRING capture_logs = os.environ.get('OS_LOG_CAPTURE') in TRUE_STRING
if not capture_logs: if not capture_logs:
logging.basicConfig(format=LOG_FORMAT, level=_level) std_logging.basicConfig(format=LOG_FORMAT, level=_level)
self.log_fixture = self.useFixture( self.log_fixture = self.useFixture(
fixtures.FakeLogger( fixtures.FakeLogger(
format=LOG_FORMAT, format=LOG_FORMAT,
@ -138,7 +137,7 @@ class BaseTestCase(testtools.TestCase):
fixtures.FakeLogger( fixtures.FakeLogger(
name='neutron.api.extensions', name='neutron.api.extensions',
format=LOG_FORMAT, format=LOG_FORMAT,
level=logging.ERROR, level=std_logging.ERROR,
nuke_handlers=capture_logs, nuke_handlers=capture_logs,
)) ))

9
neutron/tests/unit/cisco/test_network_plugin.py
View File

@ -16,7 +16,7 @@
import contextlib import contextlib
import copy import copy
import inspect import inspect
import logging import logging as std_logging
import mock import mock
import six import six
@ -33,6 +33,7 @@ from neutron.extensions import portbindings
from neutron.extensions import providernet as provider from neutron.extensions import providernet as provider
from neutron import manager from neutron import manager
from neutron.openstack.common import gettextutils from neutron.openstack.common import gettextutils
from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_constants as const from neutron.plugins.cisco.common import cisco_constants as const
from neutron.plugins.cisco.common import cisco_exceptions as c_exc from neutron.plugins.cisco.common import cisco_exceptions as c_exc
from neutron.plugins.cisco.common import config as cisco_config from neutron.plugins.cisco.common import config as cisco_config
@ -923,7 +924,7 @@ class TestCiscoNetworksV2(CiscoNetworkPluginV2TestCase,
*args, **kwargs) *args, **kwargs)
patched_plugin.side_effect = side_effect patched_plugin.side_effect = side_effect
res = self._create_network_bulk(self.fmt, 2, 'test', True) res = self._create_network_bulk(self.fmt, 2, 'test', True)
LOG.debug("response is %s" % res) LOG.debug('response is %s', res)
# We expect an internal server error as we injected a fault # We expect an internal server error as we injected a fault
self._validate_behavior_on_bulk_failure( self._validate_behavior_on_bulk_failure(
res, res,
@ -1052,10 +1053,10 @@ class TestCiscoRouterInterfacesV2(CiscoNetworkPluginV2TestCase):
def _count_exception_logs(*args, **kwargs): def _count_exception_logs(*args, **kwargs):
self.log_exc_count += 1 self.log_exc_count += 1
mock.patch.object(logging.LoggerAdapter, 'exception', mock.patch.object(std_logging.LoggerAdapter, 'exception',
autospec=True, autospec=True,
side_effect=_count_exception_logs, side_effect=_count_exception_logs,
wraps=logging.LoggerAdapter.exception).start() wraps=std_logging.LoggerAdapter.exception).start()
super(TestCiscoRouterInterfacesV2, self).setUp() super(TestCiscoRouterInterfacesV2, self).setUp()
ext_mgr = extensions.PluginAwareExtensionManager.get_instance() ext_mgr = extensions.PluginAwareExtensionManager.get_instance()
self.ext_api = test_extensions.setup_extensions_middleware(ext_mgr) self.ext_api = test_extensions.setup_extensions_middleware(ext_mgr)

2
neutron/tests/unit/db/firewall/test_db_firewall.py
View File

@ -16,7 +16,6 @@
# @author: Sumit Naiksatam, sumitnaiksatam@gmail.com, Big Switch Networks, Inc. # @author: Sumit Naiksatam, sumitnaiksatam@gmail.com, Big Switch Networks, Inc.
import contextlib import contextlib
import logging
import mock import mock
import webob.exc import webob.exc
@ -35,7 +34,6 @@ from neutron.services.firewall import fwaas_plugin
from neutron.tests.unit import test_db_plugin from neutron.tests.unit import test_db_plugin
LOG = logging.getLogger(__name__)
DB_FW_PLUGIN_KLASS = ( DB_FW_PLUGIN_KLASS = (
"neutron.db.firewall.firewall_db.Firewall_db_mixin" "neutron.db.firewall.firewall_db.Firewall_db_mixin"
) )

3
neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py
View File

@ -14,7 +14,6 @@
# limitations under the License. # limitations under the License.
import contextlib import contextlib
import logging
import mock import mock
from oslo.config import cfg from oslo.config import cfg
@ -40,8 +39,6 @@ from neutron.services import provider_configuration as pconf
from neutron.tests.unit import test_db_plugin from neutron.tests.unit import test_db_plugin
LOG = logging.getLogger(__name__)
DB_CORE_PLUGIN_KLASS = 'neutron.db.db_base_plugin_v2.NeutronDbPluginV2' DB_CORE_PLUGIN_KLASS = 'neutron.db.db_base_plugin_v2.NeutronDbPluginV2'
DB_LB_PLUGIN_KLASS = ( DB_LB_PLUGIN_KLASS = (
"neutron.services.loadbalancer." "neutron.services.loadbalancer."

3
neutron/tests/unit/db/metering/test_db_metering.py
View File

@ -15,7 +15,6 @@
# under the License. # under the License.
import contextlib import contextlib
import logging
import webob.exc import webob.exc
@ -28,8 +27,6 @@ from neutron.plugins.common import constants
from neutron.services.metering import metering_plugin from neutron.services.metering import metering_plugin
from neutron.tests.unit import test_db_plugin from neutron.tests.unit import test_db_plugin
LOG = logging.getLogger(__name__)
DB_METERING_PLUGIN_KLASS = ( DB_METERING_PLUGIN_KLASS = (
"neutron.services.metering." "neutron.services.metering."
"metering_plugin.MeteringPlugin" "metering_plugin.MeteringPlugin"

4
neutron/tests/unit/ml2/test_helpers.py
View File

@ -14,7 +14,7 @@
# under the License. # under the License.
import fixtures import fixtures
import logging import logging as std_logging
import mock import mock
from sqlalchemy.orm import query from sqlalchemy.orm import query
@ -48,7 +48,7 @@ class HelpersTest(base.BaseTestCase):
fixtures.FakeLogger( fixtures.FakeLogger(
name=helpers.__name__, name=helpers.__name__,
format=base.LOG_FORMAT, format=base.LOG_FORMAT,
level=logging.DEBUG level=std_logging.DEBUG
)) ))
def check_raw_segment(self, expected, observed): def check_raw_segment(self, expected, observed):

3
neutron/tests/unit/test_servicetype.py
View File

@ -16,8 +16,6 @@
# @author: Salvatore Orlando, VMware # @author: Salvatore Orlando, VMware
# #
import logging
import mock import mock
from oslo.config import cfg from oslo.config import cfg
import webob.exc as webexc import webob.exc as webexc
@ -39,7 +37,6 @@ from neutron.tests.unit import test_extensions
from neutron.tests.unit import testlib_api from neutron.tests.unit import testlib_api
LOG = logging.getLogger(__name__)
DEFAULT_SERVICE_DEFS = [{'service_class': constants.DUMMY, DEFAULT_SERVICE_DEFS = [{'service_class': constants.DUMMY,
'plugin': dp.DUMMY_PLUGIN_NAME}] 'plugin': dp.DUMMY_PLUGIN_NAME}]

8
neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py
View File

@ -13,7 +13,6 @@
# under the License. # under the License.
import httplib import httplib
import logging
import new import new
import random import random
@ -21,13 +20,14 @@ import eventlet
from eventlet.green import urllib2 from eventlet.green import urllib2
import mock import mock
from neutron.openstack.common.gettextutils import _LI
from neutron.openstack.common import log as logging
from neutron.plugins.vmware.api_client import eventlet_client as client from neutron.plugins.vmware.api_client import eventlet_client as client
from neutron.plugins.vmware.api_client import eventlet_request as request from neutron.plugins.vmware.api_client import eventlet_request as request
from neutron.tests import base from neutron.tests import base
from neutron.tests.unit import vmware from neutron.tests.unit import vmware
logging.basicConfig(level=logging.DEBUG)
LOG = logging.getLogger("test_api_request_eventlet") LOG = logging.getLogger("test_api_request_eventlet")
@ -60,7 +60,7 @@ class ApiRequestEventletTest(base.BaseTestCase):
def test_apirequest_spawn(self): def test_apirequest_spawn(self):
def x(id): def x(id):
eventlet.greenthread.sleep(random.random()) eventlet.greenthread.sleep(random.random())
LOG.info('spawned: %d' % id) LOG.info(_LI('spawned: %d'), id)
for i in range(10): for i in range(10):
request.EventletApiRequest._spawn(x, i) request.EventletApiRequest._spawn(x, i)
@ -72,7 +72,7 @@ class ApiRequestEventletTest(base.BaseTestCase):
a._handle_request = mock.Mock() a._handle_request = mock.Mock()
a.start() a.start()
eventlet.greenthread.sleep(0.1) eventlet.greenthread.sleep(0.1)
logging.info('_handle_request called: %s' % LOG.info(_LI('_handle_request called: %s'),
a._handle_request.called) a._handle_request.called)
request.EventletApiRequest.joinall() request.EventletApiRequest.joinall()