From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Thu, 3 Jan 2013 06:31:49 +0000 (+0800)
Subject: Logging module cleanup
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f78b0f9b054ef4af992613c718df65e4aeb8ebea;p=openstack-build%2Fneutron-build.git

Logging module cleanup

Replaced logging with openstack.common.log
Removed imports where logging is not used

Fixes bug #1095541

Change-Id: I5b03d9697dde3ef3520f67d1d8166f7af7689551
---

diff --git a/HACKING.rst b/HACKING.rst
index ff7d86891..0423c41e1 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -63,7 +63,6 @@ Human Alphabetical Order Examples
 Example::
 
   import httplib
-  import logging
   import random
   import StringIO
   import time
@@ -76,6 +75,7 @@ Example::
   from quantum.api import ports
   from quantum.db import models
   from quantum.extensions import multiport
+  from quantum.openstack.common import log as logging
   import quantum.manager
   from quantum import service
 
diff --git a/quantum/common/test_lib.py b/quantum/common/test_lib.py
index 087fab19b..dee94cfc7 100644
--- a/quantum/common/test_lib.py
+++ b/quantum/common/test_lib.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack, LLC
+# Copyright (c) 2010 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,6 @@
 #    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 #    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import logging
 import sys
 import unittest
 
@@ -259,13 +258,6 @@ class QuantumTestRunner(core.TextTestRunner):
 
 
 def run_tests(c=None):
-    logger = logging.getLogger()
-    hdlr = logging.StreamHandler()
-    formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
-    hdlr.setFormatter(formatter)
-    logger.addHandler(hdlr)
-    logger.setLevel(logging.DEBUG)
-
     # NOTE(bgh): I'm not entirely sure why but nose gets confused here when
     # calling run_tests from a plugin directory run_tests.py (instead of the
     # main run_tests.py).  It will call run_tests with no arguments and the
diff --git a/quantum/debug/commands.py b/quantum/debug/commands.py
index b80b986a3..4a641ce60 100644
--- a/quantum/debug/commands.py
+++ b/quantum/debug/commands.py
@@ -1,5 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
+
 # Copyright 2012,  Nachi Ueno,  NTT MCL,  Inc.
 # All Rights Reserved.
 #
@@ -15,14 +15,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 from cliff import lister
-
 from quantumclient.common import utils
 from quantumclient.quantum.v2_0.port import _format_fixed_ips
 from quantumclient.quantum.v2_0 import QuantumCommand
 
+from quantum.openstack.common import log as logging
+
 
 class ProbeCommand(QuantumCommand):
     log = logging.getLogger(__name__ + '.ProbeCommand')
diff --git a/quantum/debug/debug_agent.py b/quantum/debug/debug_agent.py
index 92dc452f9..ac96e8e5e 100644
--- a/quantum/debug/debug_agent.py
+++ b/quantum/debug/debug_agent.py
@@ -1,5 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
+
 # Copyright 2012,  Nachi Ueno,  NTT MCL,  Inc.
 # All Rights Reserved.
 #
@@ -17,7 +17,6 @@
 
 import datetime
 import errno
-import logging
 import os
 import shlex
 import socket
@@ -32,9 +31,11 @@ from quantum.agent.linux import ip_lib
 from quantum.agent.linux import utils
 from quantum.openstack.common import cfg
 from quantum.openstack.common import importutils
+from quantum.openstack.common import log as logging
 from quantumclient.v2_0 import client
 
-LOG = logging.getLogger('test-agent')
+
+LOG = logging.getLogger(__name__)
 
 DEVICE_OWNER_PROBE = 'network:probe'
 
diff --git a/quantum/extensions/credential.py b/quantum/extensions/credential.py
index 24caa6c34..3bcf0d7cc 100644
--- a/quantum/extensions/credential.py
+++ b/quantum/extensions/credential.py
@@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
-# Copyright 2011 Cisco Systems, Inc.  All rights reserved.
+
+# Copyright 2011 Cisco Systems, Inc.
+# All rights reserved.
 #
 #    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
@@ -16,8 +17,6 @@
 #
 # @author: Ying Liu, Cisco Systems, Inc.
 
-import logging
-
 from webob import exc
 
 from quantum.api import api_common as common
@@ -29,9 +28,6 @@ from quantum.plugins.cisco.common import cisco_faults as faults
 from quantum import wsgi
 
 
-LOG = logging.getLogger('quantum.api.credentials')
-
-
 class Credential(object):
     """extension class Credential"""
     def __init__(self):
diff --git a/quantum/extensions/multiport.py b/quantum/extensions/multiport.py
index 5f632eabc..eb7489fd1 100644
--- a/quantum/extensions/multiport.py
+++ b/quantum/extensions/multiport.py
@@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
-# Copyright 2011 Cisco Systems, Inc.  All rights reserved.
+
+# Copyright 2011 Cisco Systems, Inc.
+# All rights reserved.
 #
 #    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
@@ -16,8 +17,6 @@
 #
 # @author: Ying Liu, Cisco Systems, Inc.
 
-import logging
-
 from webob import exc
 
 from quantum.api import api_common as common
@@ -28,9 +27,6 @@ from quantum.plugins.cisco.common import cisco_faults as faults
 from quantum import wsgi
 
 
-LOG = logging.getLogger('quantum.api.multiports')
-
-
 class Multiport(object):
     """extension class multiport"""
     def __init__(self):
diff --git a/quantum/extensions/qos.py b/quantum/extensions/qos.py
index 179eaa4a9..f1bd5b2b7 100644
--- a/quantum/extensions/qos.py
+++ b/quantum/extensions/qos.py
@@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
-# Copyright 2011 Cisco Systems, Inc.  All rights reserved.
+
+# Copyright 2011 Cisco Systems, Inc.
+# All rights reserved.
 #
 #    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
@@ -16,8 +17,6 @@
 #
 # @author: Ying Liu, Cisco Systems, Inc.
 
-import logging
-
 from webob import exc
 
 from quantum.api import api_common as common
@@ -29,9 +28,6 @@ from quantum.plugins.cisco.common import cisco_faults as faults
 from quantum import wsgi
 
 
-LOG = logging.getLogger('quantum.api.qoss')
-
-
 class Qos(object):
     """Qos extension file"""
     def __init__(self):
diff --git a/quantum/plugins/metaplugin/meta_quantum_plugin.py b/quantum/plugins/metaplugin/meta_quantum_plugin.py
index 27029962f..5f722083a 100644
--- a/quantum/plugins/metaplugin/meta_quantum_plugin.py
+++ b/quantum/plugins/metaplugin/meta_quantum_plugin.py
@@ -1,5 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
+
 # Copyright 2012, Nachi Ueno, NTT MCL, Inc.
 # All Rights Reserved.
 #
@@ -15,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 from quantum.api.v2 import attributes
 from quantum.common import exceptions as exc
 from quantum.common.utils import find_config_file
@@ -27,13 +25,15 @@ from quantum.db import models_v2
 from quantum.extensions.flavor import (FLAVOR_NETWORK, FLAVOR_ROUTER)
 from quantum.openstack.common import cfg
 from quantum.openstack.common import importutils
+from quantum.openstack.common import log as logging
 from quantum.plugins.metaplugin.common import config
 from quantum.plugins.metaplugin import meta_db_v2
 from quantum.plugins.metaplugin.meta_models_v2 import (NetworkFlavor,
                                                        RouterFlavor)
 from quantum import policy
 
-LOG = logging.getLogger("metaplugin")
+
+LOG = logging.getLogger(__name__)
 
 
 # Metaplugin  Exceptions
diff --git a/quantum/plugins/metaplugin/proxy_quantum_plugin.py b/quantum/plugins/metaplugin/proxy_quantum_plugin.py
index 9164fbc36..2ffb50047 100644
--- a/quantum/plugins/metaplugin/proxy_quantum_plugin.py
+++ b/quantum/plugins/metaplugin/proxy_quantum_plugin.py
@@ -1,5 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
+
 # Copyright 2012, Nachi Ueno, NTT MCL, Inc.
 # All Rights Reserved.
 #
@@ -15,13 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 from quantum.db import api as db
 from quantum.db import db_base_plugin_v2
 from quantum.db import l3_db
 from quantum.db import models_v2
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 from quantumclient.common import exceptions
 from quantumclient.v2_0 import client
 
diff --git a/quantum/tests/__init__.py b/quantum/tests/__init__.py
index 9578283b2..671d3c173 100644
--- a/quantum/tests/__init__.py
+++ b/quantum/tests/__init__.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright (c) 2011 OpenStack, LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,6 +14,3 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-
-import logging
-logging.basicConfig()
diff --git a/quantum/tests/unit/_test_rootwrap_exec.py b/quantum/tests/unit/_test_rootwrap_exec.py
index 66fe434d7..16cd6e6e3 100644
--- a/quantum/tests/unit/_test_rootwrap_exec.py
+++ b/quantum/tests/unit/_test_rootwrap_exec.py
@@ -1,4 +1,6 @@
-# Copyright 2012 OpenStack LLC
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2012 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,15 +15,16 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
+import os
 import unittest
+
 import mock
+
 from quantum.agent.linux import utils
-import os
-import logging
+import quantum.openstack.common import log as logging
 
 
-LOG = logging.getLogger('quantum.tests.database_stubs')
+LOG = logging.getLogger(__name__)
 
 
 class RootwrapTestExec(unittest.TestCase):
diff --git a/quantum/tests/unit/database_stubs.py b/quantum/tests/unit/database_stubs.py
index 166824dc9..583f16601 100644
--- a/quantum/tests/unit/database_stubs.py
+++ b/quantum/tests/unit/database_stubs.py
@@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011, Cisco Systems, Inc.
+# All Rights Reserved.
 #
 #    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
@@ -13,18 +14,16 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+#
 # @author: Rohit Agarwalla, Cisco Systems, Inc.
 
-"""
-stubs.py provides interface methods for
-the database test cases
-"""
-import logging
+""" stubs.py provides interface methods for the database test cases """
 
 from quantum.db import api as db
+from quantum.openstack.common import log as logging
 
 
-LOG = logging.getLogger('quantum.tests.database_stubs')
+LOG = logging.getLogger(__name__)
 
 
 class QuantumDB(object):
diff --git a/quantum/tests/unit/test_api_v2.py b/quantum/tests/unit/test_api_v2.py
index 9717b1d06..5389434b5 100644
--- a/quantum/tests/unit/test_api_v2.py
+++ b/quantum/tests/unit/test_api_v2.py
@@ -1,20 +1,20 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2012 OpenStack LLC.
+# Copyright (c) 2012 OpenStack, LLC.
 # All Rights Reserved.
 #
-#  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
+#    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
+#         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 spec
+#    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.
 
-import logging
 import os
 import unittest
 
@@ -35,8 +35,6 @@ from quantum.openstack.common.notifier import api as notifer_api
 from quantum.openstack.common import uuidutils
 
 
-LOG = logging.getLogger(__name__)
-
 ROOTDIR = os.path.dirname(os.path.dirname(__file__))
 ETCDIR = os.path.join(ROOTDIR, 'etc')
 EXTDIR = os.path.join(ROOTDIR, 'unit/extensions')
diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py
index f93ef151c..08a0bc92f 100644
--- a/quantum/tests/unit/test_db_plugin.py
+++ b/quantum/tests/unit/test_db_plugin.py
@@ -1,25 +1,27 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright (c) 2012 OpenStack, LLC.
+# All Rights Reserved.
 #
-# 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
+#    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
+#         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.
+#    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.
 
 import contextlib
 import copy
 import datetime
-import logging
-import mock
 import os
 import random
+
+import mock
 import unittest2
 import webob.exc
 
@@ -43,8 +45,6 @@ from quantum.tests.unit.testlib_api import create_request
 from quantum.wsgi import Serializer, JSONDeserializer
 
 
-LOG = logging.getLogger(__name__)
-
 DB_PLUGIN_KLASS = 'quantum.db.db_base_plugin_v2.QuantumDbPluginV2'
 ROOTDIR = os.path.dirname(os.path.dirname(__file__))
 ETCDIR = os.path.join(ROOTDIR, 'etc')
diff --git a/quantum/tests/unit/test_extensions.py b/quantum/tests/unit/test_extensions.py
index ffabca041..9feddd799 100644
--- a/quantum/tests/unit/test_extensions.py
+++ b/quantum/tests/unit/test_extensions.py
@@ -1,5 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2011 OpenStack LLC.
+
+# Copyright (c) 2011 OpenStack, LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,7 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
 import os
 import unittest
 
@@ -33,6 +33,7 @@ from quantum.common import config
 from quantum.common import exceptions
 from quantum.db.db_base_plugin_v2 import QuantumDbPluginV2
 from quantum.openstack.common import jsonutils
+from quantum.openstack.common import log as logging
 from quantum.plugins.common import constants
 from quantum.tests.unit import BaseTest
 from quantum.tests.unit.extension_stubs import (
@@ -45,7 +46,7 @@ import quantum.tests.unit.extensions
 from quantum import wsgi
 
 
-LOG = logging.getLogger('quantum.tests.test_extensions')
+LOG = logging.getLogger(__name__)
 
 ROOTDIR = os.path.dirname(os.path.dirname(__file__))
 ETCDIR = os.path.join(ROOTDIR, 'etc')
diff --git a/quantum/tests/unit/test_l3_plugin.py b/quantum/tests/unit/test_l3_plugin.py
index 2d138b21f..c6af3e410 100644
--- a/quantum/tests/unit/test_l3_plugin.py
+++ b/quantum/tests/unit/test_l3_plugin.py
@@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2012 Nicira Networks, Inc.  All rights reserved.
+# Copyright 2012 Nicira Networks, Inc.
+# All rights reserved.
 #
 #    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
@@ -20,7 +21,6 @@
 import contextlib
 import copy
 import itertools
-import logging
 import unittest2 as unittest
 
 import mock
@@ -41,6 +41,7 @@ from quantum.db import models_v2
 from quantum.extensions import l3
 from quantum import manager
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 from quantum.openstack.common import uuidutils
 from quantum.tests.unit import test_api_v2
 from quantum.tests.unit import test_db_plugin
diff --git a/quantum/tests/unit/test_quantum_manager.py b/quantum/tests/unit/test_quantum_manager.py
index a07f69469..e638e1bf3 100644
--- a/quantum/tests/unit/test_quantum_manager.py
+++ b/quantum/tests/unit/test_quantum_manager.py
@@ -1,19 +1,20 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright (c) 2012 OpenStack, LLC.
+# All Rights Reserved.
 #
-# 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
+#    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
+#         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.
+#    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.
 
-import logging
 import types
 import unittest2
 
@@ -21,6 +22,7 @@ from quantum.common import config
 from quantum.common.test_lib import test_config
 from quantum.manager import QuantumManager
 from quantum.openstack.common import cfg
+from quantum.openstack.common import log as logging
 from quantum.plugins.common import constants
 from quantum.plugins.services.dummy.dummy_plugin import QuantumDummyPlugin