From 1840e987d5c8a04dceace515cd8e5603da565cd2 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 7 Jul 2025 15:13:44 +0200 Subject: [PATCH] Trivial: avoid root logger in modules Change-Id: I1eb8c9637c38496b5d4dd6493be43f414f35680c Signed-off-by: Dmitry Tantsur --- ironic_python_agent/extensions/base.py | 2 +- ironic_python_agent/extensions/clean.py | 2 +- ironic_python_agent/extensions/deploy.py | 2 +- ironic_python_agent/extensions/rescue.py | 2 +- ironic_python_agent/extensions/service.py | 2 +- ironic_python_agent/hardware.py | 2 +- ironic_python_agent/hardware_managers/cna.py | 2 +- ironic_python_agent/hardware_managers/container.py | 2 +- ironic_python_agent/hardware_managers/mlnx.py | 2 +- .../hardware_managers/nvidia/nvidia_fw_update.py | 2 +- ironic_python_agent/partition_utils.py | 2 +- ironic_python_agent/tests/unit/test_hardware.py | 10 +++++++--- ironic_python_agent/tls_utils.py | 2 +- 13 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ironic_python_agent/extensions/base.py b/ironic_python_agent/extensions/base.py index a158ee3c5..19544d189 100644 --- a/ironic_python_agent/extensions/base.py +++ b/ironic_python_agent/extensions/base.py @@ -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): diff --git a/ironic_python_agent/extensions/clean.py b/ironic_python_agent/extensions/clean.py index eae1a8508..3a6ec3490 100644 --- a/ironic_python_agent/extensions/clean.py +++ b/ironic_python_agent/extensions/clean.py @@ -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): diff --git a/ironic_python_agent/extensions/deploy.py b/ironic_python_agent/extensions/deploy.py index 45f7d46ab..ff3e6bb54 100644 --- a/ironic_python_agent/extensions/deploy.py +++ b/ironic_python_agent/extensions/deploy.py @@ -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): diff --git a/ironic_python_agent/extensions/rescue.py b/ironic_python_agent/extensions/rescue.py index 40704123e..0d9fd1a25 100644 --- a/ironic_python_agent/extensions/rescue.py +++ b/ironic_python_agent/extensions/rescue.py @@ -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' diff --git a/ironic_python_agent/extensions/service.py b/ironic_python_agent/extensions/service.py index 30b854f71..c2dd8aa8f 100644 --- a/ironic_python_agent/extensions/service.py +++ b/ironic_python_agent/extensions/service.py @@ -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): diff --git a/ironic_python_agent/hardware.py b/ironic_python_agent/hardware.py index 965c0fabf..3549eddfb 100644 --- a/ironic_python_agent/hardware.py +++ b/ironic_python_agent/hardware.py @@ -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 diff --git a/ironic_python_agent/hardware_managers/cna.py b/ironic_python_agent/hardware_managers/cna.py index a4021c10f..635c0631a 100644 --- a/ironic_python_agent/hardware_managers/cna.py +++ b/ironic_python_agent/hardware_managers/cna.py @@ -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 diff --git a/ironic_python_agent/hardware_managers/container.py b/ironic_python_agent/hardware_managers/container.py index 5f304f709..5e922a503 100644 --- a/ironic_python_agent/hardware_managers/container.py +++ b/ironic_python_agent/hardware_managers/container.py @@ -20,7 +20,7 @@ from functools import partial import yaml CONF = cfg.CONF -LOG = log.getLogger() +LOG = log.getLogger(__name__) class ContainerHardwareManager(hardware.HardwareManager): diff --git a/ironic_python_agent/hardware_managers/mlnx.py b/ironic_python_agent/hardware_managers/mlnx.py index 5d98b7da3..eca6856e1 100644 --- a/ironic_python_agent/hardware_managers/mlnx.py +++ b/ironic_python_agent/hardware_managers/mlnx.py @@ -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 diff --git a/ironic_python_agent/hardware_managers/nvidia/nvidia_fw_update.py b/ironic_python_agent/hardware_managers/nvidia/nvidia_fw_update.py index 8b667e928..d3711c3c0 100644 --- a/ironic_python_agent/hardware_managers/nvidia/nvidia_fw_update.py +++ b/ironic_python_agent/hardware_managers/nvidia/nvidia_fw_update.py @@ -40,7 +40,7 @@ ARRAY_PARAM_VALUE_REGEX = r'Array\[(?P\d+)' \ r'\.\.(?P\d+)\]' PSID_REGEX = r'PSID:\s*\t*(?P\w+)' NETWORK_DEVICE_REGEX = r'02\d\d' -LOG = log.getLogger() +LOG = log.getLogger(__name__) """ Example of Nvidia NIC Firmware images list: diff --git a/ironic_python_agent/partition_utils.py b/ironic_python_agent/partition_utils.py index 9a11f8e0f..d59887fed 100644 --- a/ironic_python_agent/partition_utils.py +++ b/ironic_python_agent/partition_utils.py @@ -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 diff --git a/ironic_python_agent/tests/unit/test_hardware.py b/ironic_python_agent/tests/unit/test_hardware.py index 6cb38bf6a..295084574 100644 --- a/ironic_python_agent/tests/unit/test_hardware.py +++ b/ironic_python_agent/tests/unit/test_hardware.py @@ -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) diff --git a/ironic_python_agent/tls_utils.py b/ironic_python_agent/tls_utils.py index 11a5e6640..580c4d16b 100644 --- a/ironic_python_agent/tls_utils.py +++ b/ironic_python_agent/tls_utils.py @@ -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