Merge "Trivial: avoid root logger in modules"
This commit is contained in:
@@ -26,7 +26,7 @@ from ironic_python_agent import errors
|
||||
from ironic_python_agent import utils
|
||||
|
||||
|
||||
LOG = log.getLogger()
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
class AgentCommandStatus(object):
|
||||
|
@@ -18,7 +18,7 @@ from ironic_python_agent import errors
|
||||
from ironic_python_agent.extensions import base
|
||||
from ironic_python_agent import hardware
|
||||
|
||||
LOG = log.getLogger()
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
class CleanExtension(base.BaseAgentExtension):
|
||||
|
@@ -16,7 +16,7 @@ from ironic_python_agent import errors
|
||||
from ironic_python_agent.extensions import base
|
||||
from ironic_python_agent import hardware
|
||||
|
||||
LOG = log.getLogger()
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
class DeployExtension(base.BaseAgentExtension):
|
||||
|
@@ -15,7 +15,7 @@ from oslo_utils import secretutils
|
||||
|
||||
from ironic_python_agent.extensions import base
|
||||
|
||||
LOG = log.getLogger()
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
PASSWORD_FILE = '/etc/ipa-rescue-config/ipa-rescue-password'
|
||||
|
||||
|
@@ -18,7 +18,7 @@ from ironic_python_agent import errors
|
||||
from ironic_python_agent.extensions import base
|
||||
from ironic_python_agent import hardware
|
||||
|
||||
LOG = log.getLogger()
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
class ServiceExtension(base.BaseAgentExtension):
|
||||
|
@@ -54,7 +54,7 @@ from ironic_python_agent import tls_utils
|
||||
from ironic_python_agent import utils
|
||||
|
||||
_global_managers = None
|
||||
LOG = log.getLogger()
|
||||
LOG = log.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
|
||||
WARN_BIOSDEVNAME_NOT_FOUND = False
|
||||
|
@@ -21,7 +21,7 @@ from oslo_log import log
|
||||
from ironic_python_agent import hardware
|
||||
from ironic_python_agent import utils
|
||||
|
||||
LOG = log.getLogger()
|
||||
LOG = log.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
|
||||
|
||||
|
@@ -20,7 +20,7 @@ from functools import partial
|
||||
import yaml
|
||||
|
||||
CONF = cfg.CONF
|
||||
LOG = log.getLogger()
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
class ContainerHardwareManager(hardware.HardwareManager):
|
||||
|
@@ -21,7 +21,7 @@ from ironic_python_agent import hardware
|
||||
from ironic_python_agent.hardware_managers.nvidia import nvidia_fw_update
|
||||
from ironic_python_agent import netutils
|
||||
|
||||
LOG = log.getLogger()
|
||||
LOG = log.getLogger(__name__)
|
||||
# Mellanox NIC Vendor ID
|
||||
MLNX_VENDOR_ID = '0x15b3'
|
||||
# Mellanox Prefix to generate InfiniBand CLient-ID
|
||||
|
@@ -40,7 +40,7 @@ ARRAY_PARAM_VALUE_REGEX = r'Array\[(?P<first_index>\d+)' \
|
||||
r'\.\.(?P<last_index>\d+)\]'
|
||||
PSID_REGEX = r'PSID:\s*\t*(?P<psid>\w+)'
|
||||
NETWORK_DEVICE_REGEX = r'02\d\d'
|
||||
LOG = log.getLogger()
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
"""
|
||||
Example of Nvidia NIC Firmware images list:
|
||||
|
@@ -40,7 +40,7 @@ from ironic_python_agent import hardware
|
||||
from ironic_python_agent import utils
|
||||
|
||||
|
||||
LOG = log.getLogger()
|
||||
LOG = log.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
|
||||
MAX_CONFIG_DRIVE_SIZE_MB = 64
|
||||
|
@@ -1049,7 +1049,9 @@ class TestGenericHardwareManager(base.IronicAgentTest):
|
||||
self.assertEqual('x86_64', cpus.architecture)
|
||||
self.assertEqual([], cpus.flags)
|
||||
|
||||
self.assertEqual(["WARNING:root:No CPU flags found"], cm.output)
|
||||
self.assertEqual(
|
||||
["WARNING:ironic_python_agent.hardware:No CPU flags found"],
|
||||
cm.output)
|
||||
|
||||
@mock.patch("builtins.open", new_callable=mock.mock_open)
|
||||
@mock.patch.object(utils, 'execute', autospec=True)
|
||||
@@ -1072,8 +1074,10 @@ class TestGenericHardwareManager(base.IronicAgentTest):
|
||||
|
||||
# Check if the warning was logged
|
||||
self.assertEqual([
|
||||
"WARNING:root:Malformed CPU flags information: I am not a flag",
|
||||
"WARNING:root:No CPU flags found"], cm.output)
|
||||
"WARNING:ironic_python_agent.hardware:"
|
||||
"Malformed CPU flags information: I am not a flag",
|
||||
"WARNING:ironic_python_agent.hardware:No CPU flags found"],
|
||||
cm.output)
|
||||
|
||||
@mock.patch('psutil.virtual_memory', autospec=True)
|
||||
@mock.patch.object(utils, 'execute', autospec=True)
|
||||
|
@@ -28,7 +28,7 @@ from ironic_python_agent import config
|
||||
from ironic_python_agent import netutils
|
||||
|
||||
|
||||
LOG = log.getLogger()
|
||||
LOG = log.getLogger(__name__)
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user