x/vmware-nsx
Code Issues Proposed changes

Cleaned up log usage.

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

Change-Id: I270eb627cd1d330f37707aaf7886a9cacd251031
This commit is contained in:
Maru Newby 2012-05-04 21:38:29 -07:00
parent c3e7d4a7c0
commit 2097ce1cf3
17 changed files with 16 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quantum/api/api_common.py
View File

@ -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:

2
quantum/api/attachments.py
View File

@ -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):

2
quantum/api/networks.py
View File

@ -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):

2
quantum/api/ports.py
View File

@ -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):

3
quantum/api/versions.py
View File

@ -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):

2
quantum/api/views/filters.py
View File

@ -19,7 +19,7 @@
import logging
LOG = logging.getLogger('quantum.api.views.filters')
LOG = logging.getLogger(__name__)
def _load_network_ports_details(network, **kwargs):

1
quantum/common/config.py
View File

@ -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):

4
quantum/db/api.py
View File

@ -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):

2
quantum/extensions/extensions.py
View File

@ -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):

2
quantum/manager.py
View File

@ -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"

1
quantum/plugins/openvswitch/ovs_quantum_plugin.py
View File

@ -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")

5
quantum/plugins/openvswitch/tests/unit/test_tunnel.py
View File

@ -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'

2
quantum/service.py
View File

@ -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):

33
quantum/tests/unit/test_api.py
View File

@ -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):

5
quantum/tests/unit/test_database.py
View File

@ -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"""

4
quantum/tests/unit/test_extensions.py
View File

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

2
quantum/wsgi.py
View File

@ -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):