Cleaned up log usage.

 * Used __name__ where appropriate for log instantiation.
 * Removed unnecessary logging in tests.

Change-Id: I270eb627cd1d330f37707aaf7886a9cacd251031

diff --git a/quantum/api/api_common.py b/quantum/api/api_common.py
index 6c70010ac01002f9b4dc71ed7d21bff45fd14695..244f50f4ecebc97b14e3e5d93e8766217e4720f6 100644 (file)
--- a/quantum/api/api_common.py
+++ b/quantum/api/api_common.py
@@ -23,9 +23,11 @@ from quantum import wsgi
 from quantum.api import faults
 
 
+LOG = logging.getLogger(__name__)
+
+
 XML_NS_V10 = 'http://openstack.org/quantum/api/v1.0'
 XML_NS_V11 = 'http://openstack.org/quantum/api/v1.1'
-LOG = logging.getLogger('quantum.api.api_common')
 
 
 class OperationalStatus:

diff --git a/quantum/api/attachments.py b/quantum/api/attachments.py
index be41a80f598ac9035a12a4d8e9851f593d3876db..59ce2489666aa3b53bde4a3dcc12abe23e173e07 100644 (file)
--- a/quantum/api/attachments.py
+++ b/quantum/api/attachments.py
@@ -20,7 +20,7 @@ from quantum.api.views import attachments as attachments_view
 from quantum.common import exceptions as exception
 
 
-LOG = logging.getLogger('quantum.api.ports')
+LOG = logging.getLogger(__name__)
 
 
 def create_resource(plugin, version):

diff --git a/quantum/api/networks.py b/quantum/api/networks.py
index 2a5dc4f946e7aa50472888722e03924b8146ec4a..148dceca315fb9cabcc1d067313da238ffe533da 100644 (file)
--- a/quantum/api/networks.py
+++ b/quantum/api/networks.py
@@ -24,7 +24,7 @@ from quantum.api.views import networks as networks_view
 from quantum.common import exceptions as exception
 
 
-LOG = logging.getLogger('quantum.api.networks')
+LOG = logging.getLogger(__name__)
 
 
 def create_resource(plugin, version):

diff --git a/quantum/api/ports.py b/quantum/api/ports.py
index b3b28d53c9dd3740d9cd14807edcff96da9a1cba..317780f695e366f355b29f7f12fcfa86a340f98e 100644 (file)
--- a/quantum/api/ports.py
+++ b/quantum/api/ports.py
@@ -21,7 +21,7 @@ from quantum.api.views import ports as ports_view
 from quantum.common import exceptions as exception
 
 
-LOG = logging.getLogger('quantum.api.ports')
+LOG = logging.getLogger(__name__)
 
 
 def create_resource(plugin, version):

diff --git a/quantum/api/versions.py b/quantum/api/versions.py
index 63f6e02036a501ddcdaa63a1494ca3e66490b19e..0e9c3392774283f5f8327234e27369ce9b375c4d 100644 (file)
--- a/quantum/api/versions.py
+++ b/quantum/api/versions.py
@@ -21,7 +21,8 @@ import webob.dec
 from quantum import wsgi
 from quantum.api.views import versions as versions_view
 
-LOG = logging.getLogger('quantum.api.versions')
+
+LOG = logging.getLogger(__name__)
 
 
 class Versions(wsgi.Application):

diff --git a/quantum/api/views/filters.py b/quantum/api/views/filters.py
index e4964f56bf64e23fd64c1099220b20005111fdbe..e2d1449a5b84832cce26ac86e2f4799d8371d479 100644 (file)
--- a/quantum/api/views/filters.py
+++ b/quantum/api/views/filters.py
@@ -19,7 +19,7 @@
 import logging
 
 
-LOG = logging.getLogger('quantum.api.views.filters')
+LOG = logging.getLogger(__name__)
 
 
 def _load_network_ports_details(network, **kwargs):

diff --git a/quantum/common/config.py b/quantum/common/config.py
index 858a7a979976585c02e4f7486da5f18ce1bdff81..a8d50bd283ac67db7aa06c6b7f9e99c14b86920d 100644 (file)
--- a/quantum/common/config.py
+++ b/quantum/common/config.py
@@ -39,7 +39,6 @@ DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s"
 DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
 
 FLAGS = flags.FLAGS
-LOG = logging.getLogger('quantum.wsgi')
 
 
 def parse_options(parser, cli_args=None):

diff --git a/quantum/db/api.py b/quantum/db/api.py
index cf47d8a48c50109f45dd87876901be900ba51a16..17b833477ca857136378ff86cb7e178c41817f4d 100644 (file)
--- a/quantum/db/api.py
+++ b/quantum/db/api.py
@@ -29,10 +29,12 @@ from quantum.common import exceptions as q_exc
 from quantum.db import models
 
 
+LOG = logging.getLogger(__name__)
+
+
 _ENGINE = None
 _MAKER = None
 BASE = models.BASE
-LOG = logging.getLogger('quantum.db.api')
 
 
 class MySQLPingListener(object):

diff --git a/quantum/extensions/extensions.py b/quantum/extensions/extensions.py
index 91cf9a66f7e485a0898c13fcba445de6ba6d1b47..6457ef95b40e8efb440c87809531d1e0c14bc9d0 100644 (file)
--- a/quantum/extensions/extensions.py
+++ b/quantum/extensions/extensions.py
@@ -32,7 +32,7 @@ from quantum.manager import QuantumManager
 from quantum import wsgi
 
 
-LOG = logging.getLogger('quantum.extensions.extensions')
+LOG = logging.getLogger('quantum.api.extensions')
 
 
 class PluginInterface(object):

diff --git a/quantum/manager.py b/quantum/manager.py
index 938e1ce6e07bb73119faba6621deb767fc254691..b6324866825dbc171dde8021c3bcac25c72d480f 100644 (file)
--- a/quantum/manager.py
+++ b/quantum/manager.py
@@ -32,7 +32,7 @@ from quantum.common.exceptions import ClassNotFound
 from quantum.quantum_plugin_base import QuantumPluginBase
 
 
-LOG = logging.getLogger('quantum.manager')
+LOG = logging.getLogger(__name__)
 
 
 CONFIG_FILE = "plugins.ini"

diff --git a/quantum/plugins/openvswitch/ovs_quantum_plugin.py b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
index 09012749bd6244efd5c51d395a865c437990b37b..6bb9f81732c0fec71be0b1f2c5a5d13c5764a5c0 100644 (file)
--- a/quantum/plugins/openvswitch/ovs_quantum_plugin.py
+++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
@@ -32,7 +32,6 @@ from quantum.plugins.openvswitch import ovs_db
 from quantum.quantum_plugin_base import QuantumPluginBase
 
 
-logging.basicConfig(level=logging.WARN)
 LOG = logging.getLogger("ovs_quantum_plugin")
 
 

diff --git a/quantum/plugins/openvswitch/tests/unit/test_tunnel.py b/quantum/plugins/openvswitch/tests/unit/test_tunnel.py
index 7d00434cac8dbf9b8d885e27fa4a651c8c3909e4..061f7c02dfa799e560a1f595d9398d1f421796e9 100644 (file)
--- a/quantum/plugins/openvswitch/tests/unit/test_tunnel.py
+++ b/quantum/plugins/openvswitch/tests/unit/test_tunnel.py
@@ -16,7 +16,6 @@
 #
 # @author: Dave Lapsley, Nicira Networks, Inc.
 
-import logging
 import os
 import unittest
 
@@ -25,10 +24,6 @@ import mox
 from quantum.plugins.openvswitch.agent import ovs_quantum_agent
 
 
-LOG = logging.getLogger("quantum.plugins.openvswitch.tests.unit.test_tunnel")
-LOG.setLevel(logging.INFO)
-
-
 LOCAL_DIR = os.path.dirname(__file__)
 REMOTE_IP_FILE = LOCAL_DIR + '/remote-ip-file.txt'
 

diff --git a/quantum/service.py b/quantum/service.py
index 31204fb871c3d5991141e994123c0d4722c68452..455b7f077fe77411740463c093c096009a8ea913 100644 (file)
--- a/quantum/service.py
+++ b/quantum/service.py
@@ -22,7 +22,7 @@ from quantum.common import exceptions as exception
 from quantum import wsgi
 
 
-LOG = logging.getLogger('quantum.service')
+LOG = logging.getLogger(__name__)
 
 
 class WsgiService(object):

diff --git a/quantum/tests/unit/test_api.py b/quantum/tests/unit/test_api.py
index eafeaa43af6d8e1d874aec751a043b91e2b66854..792418d096076c65d4ee685e548ea6e8983af1eb 100644 (file)
--- a/quantum/tests/unit/test_api.py
+++ b/quantum/tests/unit/test_api.py
@@ -17,7 +17,6 @@
 #    @author: Salvatore Orlando, Citrix Systems
 
 import json
-import logging
 import unittest
 
 from lxml import etree
@@ -32,9 +31,6 @@ import quantum.tests.unit._test_api as test_api
 import quantum.tests.unit.testlib_api as testlib
 
 
-LOG = logging.getLogger('quantum.tests.test_api')
-
-
 class APITestV10(test_api.BaseAPIOperationsTest):
 
     def assert_network(self, **kwargs):
@@ -185,7 +181,6 @@ class APIFiltersTest(test_api.AbstractAPITest):
         self.port22_id = self._create_port(self.net2_id, "ACTIVE", self.fmt)
 
     def test_network_name_filter(self):
-        LOG.debug("test_network_name_filter - START")
         flt = "name=test-1"
         network_data = self._do_filtered_network_list_request(flt)
         # Check network count: should return 1
@@ -197,10 +192,7 @@ class APIFiltersTest(test_api.AbstractAPITest):
         # Check network count: should return 0
         self.assertEqual(len(network_data['networks']), 0)
 
-        LOG.debug("test_network_name_filter - END")
-
     def test_network_op_status_filter(self):
-        LOG.debug("test_network_op_status_filter - START")
         # First filter for networks in default status
         flt = "op-status=%s" % self.net_op_status
         network_data = self._do_filtered_network_list_request(flt)
@@ -212,19 +204,15 @@ class APIFiltersTest(test_api.AbstractAPITest):
         network_data = self._do_filtered_network_list_request(flt)
         # Check network count: should return 0
         self.assertEqual(len(network_data['networks']), 0)
-        LOG.debug("test_network_op_status_filter - END")
 
     def test_network_port_op_status_filter(self):
-        LOG.debug("test_network_port_op_status_filter - START")
         # First filter for networks with ports in default op status
         flt = "port-op-status=%s" % self.port_op_status
         network_data = self._do_filtered_network_list_request(flt)
         # Check network count: should return 2
         self.assertEqual(len(network_data['networks']), 2)
-        LOG.debug("test_network_port_op_status_filter - END")
 
     def test_network_port_state_filter(self):
-        LOG.debug("test_network_port_state_filter - START")
         # First filter for networks with ports 'ACTIVE'
         flt = "port-state=ACTIVE"
         network_data = self._do_filtered_network_list_request(flt)
@@ -236,10 +224,8 @@ class APIFiltersTest(test_api.AbstractAPITest):
         network_data = self._do_filtered_network_list_request(flt)
         # Check network count: should return 1
         self.assertEqual(len(network_data['networks']), 1)
-        LOG.debug("test_network_port_state_filter - END")
 
     def test_network_has_attachment_filter(self):
-        LOG.debug("test_network_has_attachment_filter - START")
         # First filter for networks with ports 'ACTIVE'
         flt = "has-attachment=True"
         network_data = self._do_filtered_network_list_request(flt)
@@ -251,11 +237,8 @@ class APIFiltersTest(test_api.AbstractAPITest):
         network_data = self._do_filtered_network_list_request(flt)
         # Check network count: should return 1
         self.assertEqual(len(network_data['networks']), 1)
-        LOG.debug("test_network_has_attachment_filter - END")
 
     def test_network_port_filter(self):
-        LOG.debug("test_network_port_filter - START")
-
         flt = "port=%s" % self.port11_id
         network_data = self._do_filtered_network_list_request(flt)
         # Check network count: should return 1
@@ -267,11 +250,8 @@ class APIFiltersTest(test_api.AbstractAPITest):
         # Check network count: should return 1
         self.assertEqual(len(network_data['networks']), 1)
         self.assertEqual(network_data['networks'][0]['id'], self.net2_id)
-        LOG.debug("test_network_port_filter - END")
 
     def test_network_attachment_filter(self):
-        LOG.debug("test_network_attachment_filter - START")
-
         flt = "attachment=test-1-att"
         network_data = self._do_filtered_network_list_request(flt)
         # Check network count: should return 1
@@ -282,10 +262,8 @@ class APIFiltersTest(test_api.AbstractAPITest):
         network_data = self._do_filtered_network_list_request(flt)
         # Check network count: should return 0
         self.assertEqual(len(network_data['networks']), 0)
-        LOG.debug("test_network_attachment_filter - END")
 
     def test_network_multiple_filters(self):
-        LOG.debug("test_network_multiple_filters - START")
         # Add some data for having more fun
         another_net_id = self._create_network(self.fmt, name="test-1")
         # Add 1 ACTIVE port
@@ -296,10 +274,8 @@ class APIFiltersTest(test_api.AbstractAPITest):
         # Check network count: should return 1
         self.assertEqual(len(network_data['networks']), 1)
         self.assertEqual(network_data['networks'][0]['id'], self.net1_id)
-        LOG.debug("test_network_multiple_filters - END")
 
     def test_port_state_filter(self):
-        LOG.debug("test_port_state_filter - START")
         # First filter for 'ACTIVE' ports in 1st network
         flt = "state=ACTIVE"
         port_data = self._do_filtered_port_list_request(flt, self.net1_id)
@@ -310,19 +286,15 @@ class APIFiltersTest(test_api.AbstractAPITest):
         port_data = self._do_filtered_port_list_request(flt, self.net2_id)
         # Check port count: should return 2
         self.assertEqual(len(port_data['ports']), 2)
-        LOG.debug("test_port_state_filter - END")
 
     def test_port_op_status_filter(self):
-        LOG.debug("test_port_op_status_filter - START")
         # First filter for 'UP' ports in 1st network
         flt = "op-status=%s" % self.port_op_status
         port_data = self._do_filtered_port_list_request(flt, self.net1_id)
         # Check port count: should return 2
         self.assertEqual(len(port_data['ports']), 2)
-        LOG.debug("test_port_op_status_filter - END")
 
     def test_port_has_attachment_filter(self):
-        LOG.debug("test_port_has_attachment_filter - START")
         # First search for ports with attachments in 1st network
         flt = "has-attachment=True"
         port_data = self._do_filtered_port_list_request(flt, self.net1_id)
@@ -335,10 +307,8 @@ class APIFiltersTest(test_api.AbstractAPITest):
         port_data = self._do_filtered_port_list_request(flt, self.net2_id)
         # Check port count: should return 2
         self.assertEqual(len(port_data['ports']), 2)
-        LOG.debug("test_port_has_attachment_filter - END")
 
     def test_port_attachment_filter(self):
-        LOG.debug("test_port_attachment_filter - START")
         # First search for ports with attachments in 1st network
         flt = "attachment=test-1-att"
         port_data = self._do_filtered_port_list_request(flt, self.net1_id)
@@ -351,10 +321,8 @@ class APIFiltersTest(test_api.AbstractAPITest):
         port_data = self._do_filtered_port_list_request(flt, self.net2_id)
         # Check port count: should return 0
         self.assertEqual(len(port_data['ports']), 0)
-        LOG.debug("test_port_has_attachment_filter - END")
 
     def test_port_multiple_filters(self):
-        LOG.debug("test_port_multiple_filters - START")
         flt = "op-status=%s&state=DOWN" % self.port_op_status
         port_data = self._do_filtered_port_list_request(flt, self.net1_id)
         # Check port count: should return 1
@@ -371,7 +339,6 @@ class APIFiltersTest(test_api.AbstractAPITest):
         port_data = self._do_filtered_port_list_request(flt, self.net2_id)
         # Check port count: should return 2
         self.assertEqual(len(port_data['ports']), 2)
-        LOG.debug("test_port_multiple_filters - END")
 
 
 class APIRootTest(unittest.TestCase):

diff --git a/quantum/tests/unit/test_database.py b/quantum/tests/unit/test_database.py
index 1cc5955757c0eb453fc3415cfbbe9e0a413a2d64..d23ef3bea28f735983798fcf16088503934435ac 100644 (file)
--- a/quantum/tests/unit/test_database.py
+++ b/quantum/tests/unit/test_database.py
@@ -20,16 +20,12 @@ test_database.py is an independent test suite
 that tests the database api method calls
 """
 
-import logging
 import unittest
 
 from quantum.db import api as db
 from quantum.tests.unit import database_stubs as db_stubs
 
 
-LOG = logging.getLogger('quantum.tests.test_database')
-
-
 class QuantumDBTest(unittest.TestCase):
     """Class consisting of Quantum DB unit tests"""
     def setUp(self):
@@ -37,7 +33,6 @@ class QuantumDBTest(unittest.TestCase):
         db.configure_db({'sql_connection': 'sqlite:///:memory:'})
         self.dbtest = db_stubs.QuantumDB()
         self.tenant_id = "t1"
-        LOG.debug("Setup")
 
     def tearDown(self):
         """Tear Down"""

diff --git a/quantum/tests/unit/test_extensions.py b/quantum/tests/unit/test_extensions.py
index 7b4c7e93d88df1f83e38cc9d79e6e965def1a0e1..b660d617dffeab09ed0f7282360387b1af70e44e 100644 (file)
--- a/quantum/tests/unit/test_extensions.py
+++ b/quantum/tests/unit/test_extensions.py
@@ -15,7 +15,6 @@
 #    under the License.
 
 import json
-import logging
 import os
 import sys
 import unittest
@@ -46,9 +45,6 @@ import quantum.tests.unit.extensions
 from quantum import wsgi
 
 
-LOG = logging.getLogger('test_extensions')
-
-
 test_conf_file = config.find_config_file({}, None, "quantum.conf.test")
 extensions_path = ':'.join(quantum.tests.unit.extensions.__path__)
 

diff --git a/quantum/wsgi.py b/quantum/wsgi.py
index 5c4b4565596525e14e72c9618f26a05ee8cc27ad..4028250048cda98b953c2d29de5bc3246f189499 100644 (file)
--- a/quantum/wsgi.py
+++ b/quantum/wsgi.py
@@ -35,7 +35,7 @@ from quantum.common import exceptions as exception
 from quantum.common import utils
 
 
-LOG = logging.getLogger('quantum.common.wsgi')
+LOG = logging.getLogger(__name__)
 
 
 class WritableLogger(object):